cleanup: Don't use <header.h> for local includes.

TokTok · Nov 21, 2024 · d6053ac · d6053ac
1 parent ff5b9aa
commit d6053ac
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/src/BUILD.bazel b/src/BUILD.bazel
@@ -201,8 +201,8 @@ cc_library(
     }),
     hdrs = glob(["**/*.h"]) + [":version"],
     copts = [
-        "-Iqtox",
-        "-I$(GENDIR)/qtox",
+        "-iquoteqtox",
+        "-iquote$(GENDIR)/qtox",
     ] + select({
         "//tools/config:freebsd": [],
         "//tools/config:linux": ["-fPIC"],
@@ -261,8 +261,8 @@ cc_library(
     name = "main",
     srcs = ["main.cpp"],
     copts = [
-        "-Iqtox",
-        "-I$(GENDIR)/qtox",
+        "-iquoteqtox",
+        "-iquote$(GENDIR)/qtox",
     ] + select({
         "//tools/config:freebsd": [],
         "//tools/config:linux": ["-fPIC"],

diff --git a/src/chatlog/content/filetransferwidget.ui b/src/chatlog/content/filetransferwidget.ui
@@ -443,12 +443,12 @@
   <customwidget>
    <class>CroppingLabel</class>
    <extends>QLabel</extends>
-   <header location="global">src/widget/tool/croppinglabel.h</header>
+   <header>src/widget/tool/croppinglabel.h</header>
   </customwidget>
   <customwidget>
    <class>ImagePreviewButton</class>
    <extends>QPushButton</extends>
-   <header location="global">src/widget/imagepreviewwidget.h</header>
+   <header>src/widget/imagepreviewwidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>

diff --git a/src/core/toxcall.h b/src/core/toxcall.h
@@ -8,7 +8,7 @@
 #include "audio/iaudiocontrol.h"
 #include "audio/iaudiosink.h"
 #include "audio/iaudiosource.h"
-#include <src/core/toxpk.h>
+#include "src/core/toxpk.h"
 #include <tox/toxav.h>
 
 #include <QMap>

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
@@ -1076,12 +1076,12 @@
   <customwidget>
    <class>CroppingLabel</class>
    <extends>QLabel</extends>
-   <header location="global">src/widget/tool/croppinglabel.h</header>
+   <header>src/widget/tool/croppinglabel.h</header>
   </customwidget>
   <customwidget>
    <class>NotificationScrollArea</class>
    <extends>QScrollArea</extends>
-   <header location="global">src/widget/notificationscrollarea.h</header>
+   <header>src/widget/notificationscrollarea.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

diff --git a/src/model/status.cpp b/src/model/status.cpp
@@ -3,7 +3,7 @@
  * Copyright © 2024 The TokTok team.
  */
 
-#include <src/model/status.h>
+#include "status.h"
 
 #include <QDebug>
 #include <QObject>

diff --git a/src/widget/form/profileform.ui b/src/widget/form/profileform.ui
@@ -464,7 +464,7 @@ Profile does not contain your history.</string>
   <customwidget>
    <class>CroppingLabel</class>
    <extends>QLabel</extends>
-   <header location="global">src/widget/tool/croppinglabel.h</header>
+   <header>src/widget/tool/croppinglabel.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>