From 09c7fdee4b9e26cf1fcfd9ee49ebebe09ed4b057 Mon Sep 17 00:00:00 2001 From: drbob Date: Tue, 18 Aug 2020 22:43:45 +1000 Subject: [PATCH] Add proper header path for 'retroshare-gui/' headers This is simplifies the include directories needed for plugins. --- retroshare-gui/src/gui/ChatLobbyWidget.h | 3 ++- retroshare-gui/src/gui/FileTransfer/BannedFilesDialog.h | 2 +- retroshare-gui/src/gui/FileTransfer/FileTransferInfoWidget.h | 3 ++- retroshare-gui/src/gui/FileTransfer/SearchDialog.h | 2 +- retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.h | 2 +- retroshare-gui/src/gui/FileTransfer/TransfersDialog.h | 2 +- retroshare-gui/src/gui/GetStartedDialog.h | 4 ++-- retroshare-gui/src/gui/NetworkDialog.h | 4 +++- retroshare-gui/src/gui/NetworkView.h | 2 +- retroshare-gui/src/gui/NewsFeed.h | 2 +- retroshare-gui/src/gui/PluginsPage.h | 2 +- retroshare-gui/src/gui/RemoteDirModel.cpp | 3 ++- retroshare-gui/src/gui/RsAutoUpdatePage.cpp | 3 ++- retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp | 3 ++- retroshare-gui/src/gui/common/NewFriendList.h | 3 ++- retroshare-gui/src/gui/connect/ConfCertDialog.cpp | 3 ++- retroshare-gui/src/gui/connect/PGPKeyDialog.cpp | 3 ++- retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.h | 3 ++- retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastPage.h | 2 +- retroshare-gui/src/gui/msgs/MessagesDialog.h | 3 ++- retroshare-gui/src/gui/notifyqt.cpp | 2 +- retroshare-gui/src/gui/settings/rsettingswin.h | 3 ++- retroshare-gui/src/gui/statistics/BwCtrlWindow.h | 2 +- retroshare-gui/src/gui/statistics/DhtWindow.h | 3 ++- retroshare-gui/src/gui/statistics/GlobalRouterStatistics.h | 3 ++- retroshare-gui/src/gui/statistics/GxsIdStatistics.h | 3 ++- retroshare-gui/src/gui/statistics/GxsTransportStatistics.h | 3 ++- retroshare-gui/src/gui/statistics/RttStatistics.h | 3 ++- retroshare-gui/src/gui/statistics/TurtleRouterDialog.h | 4 +++- retroshare-gui/src/gui/statistics/TurtleRouterStatistics.h | 4 +++- retroshare-gui/src/retroshare-gui.pro | 4 ++-- 31 files changed, 55 insertions(+), 33 deletions(-) diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.h b/retroshare-gui/src/gui/ChatLobbyWidget.h index 415c28bc2..a9bb01895 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.h +++ b/retroshare-gui/src/gui/ChatLobbyWidget.h @@ -19,9 +19,10 @@ *******************************************************************************/ #pragma once +#include + #include "ui_ChatLobbyWidget.h" -#include "RsAutoUpdatePage.h" #include "chat/ChatLobbyUserNotify.h" #include "gui/gxs/GxsIdChooser.h" diff --git a/retroshare-gui/src/gui/FileTransfer/BannedFilesDialog.h b/retroshare-gui/src/gui/FileTransfer/BannedFilesDialog.h index 28b8e8df1..a65dac238 100644 --- a/retroshare-gui/src/gui/FileTransfer/BannedFilesDialog.h +++ b/retroshare-gui/src/gui/FileTransfer/BannedFilesDialog.h @@ -20,7 +20,7 @@ #pragma once -#include "RsAutoUpdatePage.h" +#include #include "ui_BannedFilesDialog.h" class BannedFilesDialog: public QDialog diff --git a/retroshare-gui/src/gui/FileTransfer/FileTransferInfoWidget.h b/retroshare-gui/src/gui/FileTransfer/FileTransferInfoWidget.h index a82f08dbc..fdf45f2ff 100644 --- a/retroshare-gui/src/gui/FileTransfer/FileTransferInfoWidget.h +++ b/retroshare-gui/src/gui/FileTransfer/FileTransferInfoWidget.h @@ -24,7 +24,8 @@ #include #include #include -#include "RsAutoUpdatePage.h" + +#include #include struct FileChunksInfo ; diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.h b/retroshare-gui/src/gui/FileTransfer/SearchDialog.h index c911b8084..f14bfb642 100644 --- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.h +++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.h @@ -23,7 +23,7 @@ #include #include "ui_SearchDialog.h" -#include "mainpage.h" +#include class AdvancedSearchDialog; class RSTreeWidgetItemCompareRole; diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.h b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.h index 5206e1d06..86164a7f3 100644 --- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.h +++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.h @@ -23,7 +23,7 @@ #include "ui_SharedFilesDialog.h" -#include "RsAutoUpdatePage.h" +#include #include "gui/RetroShareLink.h" #include "util/RsProtectedTimer.h" diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.h b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.h index 9c03e830c..e11f6c232 100644 --- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.h +++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.h @@ -25,7 +25,7 @@ #include #include -#include "RsAutoUpdatePage.h" +#include #include "ui_TransfersDialog.h" diff --git a/retroshare-gui/src/gui/GetStartedDialog.h b/retroshare-gui/src/gui/GetStartedDialog.h index 8705d0290..6d943958a 100644 --- a/retroshare-gui/src/gui/GetStartedDialog.h +++ b/retroshare-gui/src/gui/GetStartedDialog.h @@ -21,9 +21,9 @@ #ifndef _GETTING_STARTED_DIALOG_H #define _GETTING_STARTED_DIALOG_H -//#include +#include + #include "ui_GetStartedDialog.h" -#include "mainpage.h" #include diff --git a/retroshare-gui/src/gui/NetworkDialog.h b/retroshare-gui/src/gui/NetworkDialog.h index 8391ad476..9561c1db3 100644 --- a/retroshare-gui/src/gui/NetworkDialog.h +++ b/retroshare-gui/src/gui/NetworkDialog.h @@ -21,8 +21,10 @@ #ifndef _CONNECTIONSDIALOG_H #define _CONNECTIONSDIALOG_H +#include + #include "ui_NetworkDialog.h" -#include "RsAutoUpdatePage.h" + #include "gui/NetworkDialog/pgpid_item_model.h" #include "gui/NetworkDialog/pgpid_item_proxy.h" diff --git a/retroshare-gui/src/gui/NetworkView.h b/retroshare-gui/src/gui/NetworkView.h index 274ca020b..f6fcfe0b1 100644 --- a/retroshare-gui/src/gui/NetworkView.h +++ b/retroshare-gui/src/gui/NetworkView.h @@ -25,7 +25,7 @@ #include -#include "RsAutoUpdatePage.h" +#include #include "ui_NetworkView.h" diff --git a/retroshare-gui/src/gui/NewsFeed.h b/retroshare-gui/src/gui/NewsFeed.h index 713bcf96c..869d654fd 100644 --- a/retroshare-gui/src/gui/NewsFeed.h +++ b/retroshare-gui/src/gui/NewsFeed.h @@ -21,7 +21,7 @@ #ifndef _NEWS_FEED_DIALOG_H #define _NEWS_FEED_DIALOG_H -#include "mainpage.h" +#include #include "gui/feeds/FeedHolder.h" #include "util/TokenQueue.h" diff --git a/retroshare-gui/src/gui/PluginsPage.h b/retroshare-gui/src/gui/PluginsPage.h index 4832a1ac6..36d4f9c8a 100644 --- a/retroshare-gui/src/gui/PluginsPage.h +++ b/retroshare-gui/src/gui/PluginsPage.h @@ -21,7 +21,7 @@ #ifndef _PLUGINS_PAGE_H_ #define _PLUGINS_PAGE_H_ -#include "mainpage.h" +#include #include #include diff --git a/retroshare-gui/src/gui/RemoteDirModel.cpp b/retroshare-gui/src/gui/RemoteDirModel.cpp index b69929778..f10f0d55e 100644 --- a/retroshare-gui/src/gui/RemoteDirModel.cpp +++ b/retroshare-gui/src/gui/RemoteDirModel.cpp @@ -20,7 +20,8 @@ #include "RemoteDirModel.h" -#include "RsAutoUpdatePage.h" +#include + #include "gui/common/FilesDefs.h" #include "gui/common/GroupDefs.h" #include "gui/common/RsCollection.h" diff --git a/retroshare-gui/src/gui/RsAutoUpdatePage.cpp b/retroshare-gui/src/gui/RsAutoUpdatePage.cpp index 03d231cf0..4c18d294b 100644 --- a/retroshare-gui/src/gui/RsAutoUpdatePage.cpp +++ b/retroshare-gui/src/gui/RsAutoUpdatePage.cpp @@ -19,7 +19,8 @@ *******************************************************************************/ #include -#include "RsAutoUpdatePage.h" + +#include bool RsAutoUpdatePage::_locked = false ; diff --git a/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp index b93c2d438..840a03d47 100644 --- a/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp +++ b/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp @@ -30,7 +30,8 @@ #include #include -#include "RsAutoUpdatePage.h" +#include + #include "PopupDistantChatDialog.h" #define IMAGE_RED_LED ":/icons/bullet_red_128.png" diff --git a/retroshare-gui/src/gui/common/NewFriendList.h b/retroshare-gui/src/gui/common/NewFriendList.h index 2a1955ced..4bdeddd4b 100644 --- a/retroshare-gui/src/gui/common/NewFriendList.h +++ b/retroshare-gui/src/gui/common/NewFriendList.h @@ -25,8 +25,9 @@ #include #include +#include + #include "FriendListModel.h" -#include "RsAutoUpdatePage.h" #include "retroshare/rsstatus.h" namespace Ui { diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp index fc56ebef5..92ab22142 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp @@ -32,6 +32,8 @@ #include #include +#include + #include "gui/help/browser/helpbrowser.h" #include "gui/common/PeerDefs.h" #include "gui/common/StatusDefs.h" @@ -39,7 +41,6 @@ #include "gui/notifyqt.h" #include "gui/common/AvatarDefs.h" #include "gui/MainWindow.h" -#include "mainpage.h" #include "util/DateTime.h" #include "util/misc.h" diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp index d27e779fd..cd9199c31 100644 --- a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp +++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp @@ -32,6 +32,8 @@ #include #include +#include + #include "gui/help/browser/helpbrowser.h" #include "gui/common/PeerDefs.h" #include "gui/common/StatusDefs.h" @@ -39,7 +41,6 @@ #include "gui/notifyqt.h" #include "gui/common/AvatarDefs.h" #include "gui/MainWindow.h" -#include "mainpage.h" #include "util/DateTime.h" #include "util/misc.h" diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.h b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.h index 006f593a4..eaf1d0d34 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.h +++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.h @@ -21,8 +21,9 @@ #ifndef _GXSGROUPFRAMEDIALOG_H #define _GXSGROUPFRAMEDIALOG_H +#include + #include "gui/gxs/RsGxsUpdateBroadcastPage.h" -#include "RsAutoUpdatePage.h" #include "gui/RetroShareLink.h" #include "gui/settings/rsharesettings.h" #include "util/RsUserdata.h" diff --git a/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastPage.h b/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastPage.h index 2e13e0910..2a983bf8d 100644 --- a/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastPage.h +++ b/retroshare-gui/src/gui/gxs/RsGxsUpdateBroadcastPage.h @@ -20,7 +20,7 @@ #pragma once -#include "mainpage.h" +#include #include // This class implement a basic RS functionality which is that widgets displaying info diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.h b/retroshare-gui/src/gui/msgs/MessagesDialog.h index abc80349d..bf0148cf5 100644 --- a/retroshare-gui/src/gui/msgs/MessagesDialog.h +++ b/retroshare-gui/src/gui/msgs/MessagesDialog.h @@ -23,7 +23,8 @@ #include -#include "mainpage.h" +#include + #include "ui_MessagesDialog.h" #define IMAGE_MESSAGES ":/icons/png/message.png" diff --git a/retroshare-gui/src/gui/notifyqt.cpp b/retroshare-gui/src/gui/notifyqt.cpp index e2e933a32..b85a946e1 100644 --- a/retroshare-gui/src/gui/notifyqt.cpp +++ b/retroshare-gui/src/gui/notifyqt.cpp @@ -32,7 +32,7 @@ #include #include -#include "RsAutoUpdatePage.h" +#include #include "MainWindow.h" #include "toaster/OnlineToaster.h" diff --git a/retroshare-gui/src/gui/settings/rsettingswin.h b/retroshare-gui/src/gui/settings/rsettingswin.h index 7a9864fff..2807d6443 100755 --- a/retroshare-gui/src/gui/settings/rsettingswin.h +++ b/retroshare-gui/src/gui/settings/rsettingswin.h @@ -23,8 +23,9 @@ #include #include +#include + #include "ui_settingsw.h" -#include "mainpage.h" class FloatingHelpBrowser; diff --git a/retroshare-gui/src/gui/statistics/BwCtrlWindow.h b/retroshare-gui/src/gui/statistics/BwCtrlWindow.h index d47867d4f..4126eb6bc 100644 --- a/retroshare-gui/src/gui/statistics/BwCtrlWindow.h +++ b/retroshare-gui/src/gui/statistics/BwCtrlWindow.h @@ -24,7 +24,7 @@ #include -#include "RsAutoUpdatePage.h" +#include #include "gui/common/RSGraphWidget.h" #include "ui_BwCtrlWindow.h" diff --git a/retroshare-gui/src/gui/statistics/DhtWindow.h b/retroshare-gui/src/gui/statistics/DhtWindow.h index 8199b5a1d..795a80a36 100644 --- a/retroshare-gui/src/gui/statistics/DhtWindow.h +++ b/retroshare-gui/src/gui/statistics/DhtWindow.h @@ -21,7 +21,8 @@ #ifndef RSDHT_WINDOW_H #define RSDHT_WINDOW_H -#include "RsAutoUpdatePage.h" +#include + #include "ui_DhtWindow.h" class DhtWindow : public RsAutoUpdatePage/*, public Ui::DhtWindow*/ { diff --git a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.h b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.h index c8d132740..c8e49fb4a 100644 --- a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.h +++ b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.h @@ -24,7 +24,8 @@ #include #include -#include "RsAutoUpdatePage.h" +#include + #include "ui_GlobalRouterStatistics.h" class GlobalRouterStatisticsWidget ; diff --git a/retroshare-gui/src/gui/statistics/GxsIdStatistics.h b/retroshare-gui/src/gui/statistics/GxsIdStatistics.h index 9d101aa88..fc0ab93fd 100644 --- a/retroshare-gui/src/gui/statistics/GxsIdStatistics.h +++ b/retroshare-gui/src/gui/statistics/GxsIdStatistics.h @@ -24,7 +24,8 @@ #include #include -#include "RsAutoUpdatePage.h" +#include + #include "Histogram.h" #include "ui_GxsIdStatistics.h" diff --git a/retroshare-gui/src/gui/statistics/GxsTransportStatistics.h b/retroshare-gui/src/gui/statistics/GxsTransportStatistics.h index d23fdaa0f..0b9970c1c 100644 --- a/retroshare-gui/src/gui/statistics/GxsTransportStatistics.h +++ b/retroshare-gui/src/gui/statistics/GxsTransportStatistics.h @@ -27,7 +27,8 @@ #include #include -#include "RsAutoUpdatePage.h" +#include + #include "ui_GxsTransportStatistics.h" #include "gui/gxs/RsGxsUpdateBroadcastPage.h" #include "util/rstime.h" diff --git a/retroshare-gui/src/gui/statistics/RttStatistics.h b/retroshare-gui/src/gui/statistics/RttStatistics.h index 2cefe3bb7..32c8b4f1b 100644 --- a/retroshare-gui/src/gui/statistics/RttStatistics.h +++ b/retroshare-gui/src/gui/statistics/RttStatistics.h @@ -22,8 +22,9 @@ #include #include +#include + #include "ui_RttStatistics.h" -#include "RsAutoUpdatePage.h" #include class RttStatisticsWidget ; diff --git a/retroshare-gui/src/gui/statistics/TurtleRouterDialog.h b/retroshare-gui/src/gui/statistics/TurtleRouterDialog.h index 4fc00b004..94e1ce269 100644 --- a/retroshare-gui/src/gui/statistics/TurtleRouterDialog.h +++ b/retroshare-gui/src/gui/statistics/TurtleRouterDialog.h @@ -22,9 +22,11 @@ #include #include + +#include + #include "ui_TurtleRouterDialog.h" #include "ui_TurtleRouterStatistics.h" -#include "RsAutoUpdatePage.h" class TurtleRouterDialog: public RsAutoUpdatePage, public Ui::TurtleRouterDialogForm diff --git a/retroshare-gui/src/gui/statistics/TurtleRouterStatistics.h b/retroshare-gui/src/gui/statistics/TurtleRouterStatistics.h index f7613de94..7cba37c18 100644 --- a/retroshare-gui/src/gui/statistics/TurtleRouterStatistics.h +++ b/retroshare-gui/src/gui/statistics/TurtleRouterStatistics.h @@ -23,8 +23,10 @@ #include #include #include + +#include + #include "ui_TurtleRouterStatistics.h" -#include "RsAutoUpdatePage.h" class TurtleRouterStatisticsWidget ; diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index fdbc83083..fbb600013 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -25,8 +25,8 @@ CONFIG += console TARGET = retroshare DEFINES += TARGET=\\\"$${TARGET}\\\" -DEPENDPATH *= $${PWD} $${RS_INCLUDE_DIR} retroshare-gui -INCLUDEPATH *= $${PWD} retroshare-gui +DEPENDPATH *= $${PWD} $${RS_INCLUDE_DIR} +INCLUDEPATH *= $${PWD} !include("../../libretroshare/src/use_libretroshare.pri"):error("Including")