Clean up header inclusion

src/app/application.cpp

@@ -85,11 +85,11 @@
 #include "filelogger.h"
 
 #ifndef DISABLE_GUI
-#include "addnewtorrentdialog.h"
+#include "gui/addnewtorrentdialog.h"
 #include "gui/uithememanager.h"
 #include "gui/utils.h"
-#include "mainwindow.h"
-#include "shutdownconfirmdialog.h"
+#include "gui/mainwindow.h"
+#include "gui/shutdownconfirmdialog.h"
 #endif // DISABLE_GUI
 
 #ifndef DISABLE_WEBUI

src/gui/addnewtorrentdialog.cpp

@@ -51,7 +51,7 @@
 #include "base/utils/misc.h"
 #include "base/utils/string.h"
 #include "autoexpandabledialog.h"
-#include "proplistdelegate.h"
+#include "properties/proplistdelegate.h"
 #include "raisedmessagebox.h"
 #include "torrentcontentfiltermodel.h"
 #include "torrentcontentmodel.h"

src/gui/log/loglistview.cpp

@@ -37,8 +37,8 @@
 #include <QStyle>
 #include <QStyledItemDelegate>
 
+#include "gui/uithememanager.h"
 #include "logmodel.h"
-#include "uithememanager.h"
 
 namespace
 {

src/gui/mainwindow.cpp

@@ -51,7 +51,7 @@
 #endif
 #if (defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)) && defined(QT_DBUS_LIB)
 #include <QDBusConnection>
-#include "notifications.h"
+#include "qtnotify/notifications.h"
 #endif
 
 #include "base/bittorrent/session.h"
@@ -77,16 +77,17 @@
 #include "hidabletabwidget.h"
 #include "lineedit.h"
 #include "optionsdialog.h"
-#include "peerlistwidget.h"
-#include "powermanagement.h"
-#include "propertieswidget.h"
+#include "powermanagement/powermanagement.h"
+#include "properties/peerlistwidget.h"
+#include "properties/propertieswidget.h"
+#include "properties/trackerlistwidget.h"
 #include "rss/rsswidget.h"
 #include "search/searchwidget.h"
 #include "speedlimitdialog.h"
 #include "statsdialog.h"
 #include "statusbar.h"
 #include "torrentcreatordialog.h"
-#include "trackerlistwidget.h"
+
 #include "transferlistfilterswidget.h"
 #include "transferlistmodel.h"
 #include "transferlistwidget.h"

src/gui/powermanagement/powermanagement.pri

@@ -1,5 +1,3 @@
-INCLUDEPATH += $$PWD
-
 HEADERS += $$PWD/powermanagement.h
 SOURCES += $$PWD/powermanagement.cpp
 

src/gui/properties/peerlistwidget.cpp

@@ -52,11 +52,11 @@
 #include "base/net/geoipmanager.h"
 #include "base/net/reverseresolution.h"
 #include "base/preferences.h"
+#include "gui/uithememanager.h"
 #include "peerlistdelegate.h"
 #include "peerlistsortmodel.h"
 #include "peersadditiondialog.h"
 #include "propertieswidget.h"
-#include "uithememanager.h"
 
 struct PeerEndpoint
 {

src/gui/properties/properties.pri

@@ -1,5 +1,3 @@
-INCLUDEPATH += $$PWD
-
 FORMS += \
     $$PWD/peersadditiondialog.ui \
     $$PWD/propertieswidget.ui \

src/gui/properties/propertieswidget.cpp

@@ -51,21 +51,20 @@
 #include "base/utils/fs.h"
 #include "base/utils/misc.h"
 #include "base/utils/string.h"
-#include "autoexpandabledialog.h"
+#include "gui/autoexpandabledialog.h"
+#include "gui/lineedit.h"
+#include "gui/raisedmessagebox.h"
+#include "gui/torrentcontentfiltermodel.h"
+#include "gui/torrentcontentmodel.h"
+#include "gui/uithememanager.h"
+#include "gui/utils.h"
 #include "downloadedpiecesbar.h"
-#include "lineedit.h"
 #include "peerlistwidget.h"
 #include "pieceavailabilitybar.h"
 #include "proplistdelegate.h"
 #include "proptabbar.h"
-#include "raisedmessagebox.h"
 #include "speedwidget.h"
-#include "torrentcontentfiltermodel.h"
-#include "torrentcontentmodel.h"
 #include "trackerlistwidget.h"
-#include "uithememanager.h"
-#include "utils.h"
-
 #include "ui_propertieswidget.h"
 
 #ifdef Q_OS_MACOS

src/gui/properties/propertieswidget.ui

@@ -1111,7 +1111,7 @@
   <customwidget>
    <class>TorrentContentTreeView</class>
    <extends>QTreeView</extends>
-   <header location="global">torrentcontenttreeview.h</header>
+   <header location="global">gui/torrentcontenttreeview.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

src/gui/properties/proptabbar.cpp

@@ -34,7 +34,7 @@
 #include <QSpacerItem>
 
 #include "base/global.h"
-#include "uithememanager.h"
+#include "gui/uithememanager.h"
 
 PropTabBar::PropTabBar(QWidget *parent)
     : QHBoxLayout(parent)

src/gui/properties/trackerlistwidget.cpp

@@ -49,10 +49,10 @@
 #include "base/bittorrent/trackerentry.h"
 #include "base/global.h"
 #include "base/preferences.h"
-#include "autoexpandabledialog.h"
+#include "gui/autoexpandabledialog.h"
+#include "gui/uithememanager.h"
 #include "propertieswidget.h"
 #include "trackersadditiondialog.h"
-#include "uithememanager.h"
 
 #define NB_STICKY_ITEM 3
 

src/gui/properties/trackersadditiondialog.cpp

@@ -36,8 +36,8 @@
 #include "base/bittorrent/trackerentry.h"
 #include "base/global.h"
 #include "base/net/downloadmanager.h"
+#include "gui/uithememanager.h"
 #include "ui_trackersadditiondialog.h"
-#include "uithememanager.h"
 
 TrackersAdditionDialog::TrackersAdditionDialog(QWidget *parent, BitTorrent::TorrentHandle *const torrent)
     : QDialog(parent)

src/gui/qtnotify/qtnotify.pri

@@ -1,5 +1,2 @@
-INCLUDEPATH += $$PWD
-
 HEADERS += $$PWD/notifications.h
-
 SOURCES += $$PWD/notifications.cpp

src/gui/rss/automatedrssdownloader.cpp

@@ -49,10 +49,10 @@
 #include "base/rss/rss_session.h"
 #include "base/utils/fs.h"
 #include "base/utils/string.h"
-#include "autoexpandabledialog.h"
+#include "gui/autoexpandabledialog.h"
+#include "gui/uithememanager.h"
+#include "gui/utils.h"
 #include "ui_automatedrssdownloader.h"
-#include "uithememanager.h"
-#include "utils.h"
 
 const QString EXT_JSON {QStringLiteral(".json")};
 const QString EXT_LEGACY {QStringLiteral(".rssrules")};

src/gui/rss/automatedrssdownloader.ui

@@ -454,7 +454,7 @@ Supports the formats: S01E01, 1x1, 2017.01.01 and 01.01.2017 (Date formats also
   <customwidget>
    <class>FileSystemPathLineEdit</class>
    <extends>QWidget</extends>
-   <header>fspathedit.h</header>
+   <header>gui/fspathedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>

src/gui/rss/feedlistwidget.cpp

@@ -38,7 +38,7 @@
 #include "base/rss/rss_feed.h"
 #include "base/rss/rss_folder.h"
 #include "base/rss/rss_session.h"
-#include "uithememanager.h"
+#include "gui/uithememanager.h"
 
 FeedListWidget::FeedListWidget(QWidget *parent)
     : QTreeWidget(parent)

src/gui/rss/rsswidget.cpp

@@ -47,13 +47,13 @@
 #include "base/rss/rss_feed.h"
 #include "base/rss/rss_folder.h"
 #include "base/rss/rss_session.h"
-#include "addnewtorrentdialog.h"
+#include "gui/addnewtorrentdialog.h"
+#include "gui/autoexpandabledialog.h"
+#include "gui/uithememanager.h"
 #include "articlelistwidget.h"
-#include "autoexpandabledialog.h"
 #include "automatedrssdownloader.h"
 #include "feedlistwidget.h"
 #include "ui_rsswidget.h"
-#include "uithememanager.h"
 
 RSSWidget::RSSWidget(QWidget *parent)
     : QWidget(parent)

src/gui/search/pluginselectdialog.cpp

@@ -42,12 +42,12 @@
 #include "base/global.h"
 #include "base/net/downloadmanager.h"
 #include "base/utils/fs.h"
-#include "autoexpandabledialog.h"
+#include "gui/autoexpandabledialog.h"
+#include "gui/uithememanager.h"
+#include "gui/utils.h"
 #include "pluginsourcedialog.h"
 #include "searchwidget.h"
 #include "ui_pluginselectdialog.h"
-#include "uithememanager.h"
-#include "utils.h"
 
 enum PluginColumns
 {

src/gui/search/pluginsourcedialog.cpp

@@ -28,8 +28,8 @@
 
 #include "pluginsourcedialog.h"
 
+#include "gui/utils.h"
 #include "ui_pluginsourcedialog.h"
-#include "utils.h"
 
 PluginSourceDialog::PluginSourceDialog(QWidget *parent)
     : QDialog(parent)

src/gui/search/searchjobwidget.cpp

@@ -47,13 +47,13 @@
 #include "base/search/searchpluginmanager.h"
 #include "base/settingvalue.h"
 #include "base/utils/misc.h"
-#include "addnewtorrentdialog.h"
-#include "lineedit.h"
+#include "gui/addnewtorrentdialog.h"
+#include "gui/lineedit.h"
+#include "gui/uithememanager.h"
+#include "gui/utils.h"
 #include "searchlistdelegate.h"
 #include "searchsortmodel.h"
 #include "ui_searchjobwidget.h"
-#include "uithememanager.h"
-#include "utils.h"
 
 SearchJobWidget::SearchJobWidget(SearchHandler *searchHandler, QWidget *parent)
     : QWidget(parent)

src/gui/search/searchwidget.cpp

@@ -46,11 +46,11 @@
 #include "base/search/searchhandler.h"
 #include "base/search/searchpluginmanager.h"
 #include "base/utils/foreignapps.h"
-#include "mainwindow.h"
+#include "gui/mainwindow.h"
+#include "gui/uithememanager.h"
 #include "pluginselectdialog.h"
 #include "searchjobwidget.h"
 #include "ui_searchwidget.h"
-#include "uithememanager.h"
 
 #define SEARCHHISTORY_MAXSIZE 50
 #define URL_COLUMN 5

src/gui/search/searchwidget.ui

@@ -141,7 +141,7 @@ Click the "Search plugins..." button at the bottom right of the window
   <customwidget>
    <class>LineEdit</class>
    <extends>QLineEdit</extends>
-   <header>lineedit.h</header>
+   <header>gui/lineedit.h</header>
   </customwidget>
  </customwidgets>
  <resources/>