From a8b8d830b4ac82a3660b1125b79a7bf45dfc1afc Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 26 Jun 2015 07:21:30 +0200 Subject: [PATCH] Moved some classes. --- CMakeLists.txt | 65 ++++++++++--------- src/core/feedsmodelcategory.cpp | 2 +- src/gui/basetoolbar.cpp | 2 +- src/gui/{ => dialogs}/formabout.cpp | 2 +- src/gui/{ => dialogs}/formabout.h | 0 src/gui/{ => dialogs}/formabout.ui | 0 .../formbackupdatabasesettings.cpp | 2 +- .../formbackupdatabasesettings.h | 0 .../formbackupdatabasesettings.ui | 0 src/gui/{ => dialogs}/formcategorydetails.cpp | 4 +- src/gui/{ => dialogs}/formcategorydetails.h | 0 src/gui/{ => dialogs}/formcategorydetails.ui | 0 src/gui/{ => dialogs}/formdatabasecleanup.cpp | 2 +- src/gui/{ => dialogs}/formdatabasecleanup.h | 0 src/gui/{ => dialogs}/formdatabasecleanup.ui | 0 src/gui/{ => dialogs}/formfeeddetails.cpp | 2 +- src/gui/{ => dialogs}/formfeeddetails.h | 0 src/gui/{ => dialogs}/formfeeddetails.ui | 0 src/gui/{ => dialogs}/formimportexport.cpp | 4 +- src/gui/{ => dialogs}/formimportexport.h | 0 src/gui/{ => dialogs}/formimportexport.ui | 0 src/gui/{ => dialogs}/formmain.cpp | 14 ++-- src/gui/{ => dialogs}/formmain.h | 0 src/gui/{ => dialogs}/formmain.ui | 0 .../formrestoredatabasesettings.cpp | 4 +- .../formrestoredatabasesettings.h | 0 .../formrestoredatabasesettings.ui | 0 src/gui/{ => dialogs}/formsettings.cpp | 4 +- src/gui/{ => dialogs}/formsettings.h | 0 src/gui/{ => dialogs}/formsettings.ui | 0 src/gui/{ => dialogs}/formupdate.cpp | 2 +- src/gui/{ => dialogs}/formupdate.h | 0 src/gui/{ => dialogs}/formupdate.ui | 0 .../discoverfeedsbutton.cpp | 2 +- .../discoverfeedsbutton.h | 0 src/gui/feedmessageviewer.cpp | 6 +- src/gui/feedsview.cpp | 6 +- src/gui/messagestoolbar.cpp | 2 +- src/gui/messagesview.cpp | 2 +- src/gui/statusbar.cpp | 2 +- src/gui/systemtrayicon.cpp | 4 +- src/gui/tabwidget.cpp | 2 +- src/gui/toolbareditor.cpp | 2 +- src/main.cpp | 2 +- src/miscellaneous/application.cpp | 2 +- src/miscellaneous/systemfactory.cpp | 2 +- src/network-web/adblock/adblockdialog.cpp | 2 +- src/network-web/adblock/adblockicon.cpp | 2 +- src/network-web/adblock/adblockmanager.cpp | 2 +- src/network-web/downloadmanager.cpp | 2 +- src/network-web/webbrowser.cpp | 2 +- src/network-web/webbrowser.h | 2 +- src/network-web/webview.cpp | 2 +- 53 files changed, 79 insertions(+), 78 deletions(-) rename src/gui/{ => dialogs}/formabout.cpp (97%) rename src/gui/{ => dialogs}/formabout.h (100%) rename src/gui/{ => dialogs}/formabout.ui (100%) rename src/gui/{ => dialogs}/formbackupdatabasesettings.cpp (98%) rename src/gui/{ => dialogs}/formbackupdatabasesettings.h (100%) rename src/gui/{ => dialogs}/formbackupdatabasesettings.ui (100%) rename src/gui/{ => dialogs}/formcategorydetails.cpp (99%) rename src/gui/{ => dialogs}/formcategorydetails.h (100%) rename src/gui/{ => dialogs}/formcategorydetails.ui (100%) rename src/gui/{ => dialogs}/formdatabasecleanup.cpp (96%) rename src/gui/{ => dialogs}/formdatabasecleanup.h (100%) rename src/gui/{ => dialogs}/formdatabasecleanup.ui (100%) rename src/gui/{ => dialogs}/formfeeddetails.cpp (97%) rename src/gui/{ => dialogs}/formfeeddetails.h (100%) rename src/gui/{ => dialogs}/formfeeddetails.ui (100%) rename src/gui/{ => dialogs}/formimportexport.cpp (99%) rename src/gui/{ => dialogs}/formimportexport.h (100%) rename src/gui/{ => dialogs}/formimportexport.ui (100%) rename src/gui/{ => dialogs}/formmain.cpp (96%) rename src/gui/{ => dialogs}/formmain.h (100%) rename src/gui/{ => dialogs}/formmain.ui (100%) rename src/gui/{ => dialogs}/formrestoredatabasesettings.cpp (96%) rename src/gui/{ => dialogs}/formrestoredatabasesettings.h (100%) rename src/gui/{ => dialogs}/formrestoredatabasesettings.ui (100%) rename src/gui/{ => dialogs}/formsettings.cpp (97%) rename src/gui/{ => dialogs}/formsettings.h (100%) rename src/gui/{ => dialogs}/formsettings.ui (100%) rename src/gui/{ => dialogs}/formupdate.cpp (97%) rename src/gui/{ => dialogs}/formupdate.h (100%) rename src/gui/{ => dialogs}/formupdate.ui (100%) rename src/{network-web => gui}/discoverfeedsbutton.cpp (97%) rename src/{network-web => gui}/discoverfeedsbutton.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c01e2ec78..2947f50a3 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -331,10 +331,17 @@ set(APP_SOURCES src/qtsingleapplication/qtsingleapplication.cpp # GUI sources. - src/gui/formmain.cpp + src/gui/dialogs/formmain.cpp + src/gui/dialogs/formsettings.cpp + src/gui/dialogs/formabout.cpp + src/gui/dialogs/formcategorydetails.cpp + src/gui/dialogs/formfeeddetails.cpp + src/gui/dialogs/formupdate.cpp + src/gui/dialogs/formimportexport.cpp + src/gui/dialogs/formdatabasecleanup.cpp + src/gui/dialogs/formbackupdatabasesettings.cpp + src/gui/dialogs/formrestoredatabasesettings.cpp src/gui/systemtrayicon.cpp - src/gui/formsettings.cpp - src/gui/formabout.cpp src/gui/baselineedit.cpp src/gui/locationlineedit.cpp src/gui/tabwidget.cpp @@ -344,27 +351,21 @@ set(APP_SOURCES src/gui/feedsview.cpp src/gui/messagesview.cpp src/gui/statusbar.cpp - src/gui/formcategorydetails.cpp - src/gui/formfeeddetails.cpp src/gui/plaintoolbutton.cpp src/gui/lineeditwithstatus.cpp src/gui/widgetwithstatus.cpp src/gui/labelwithstatus.cpp src/gui/messagebox.cpp - src/gui/formupdate.cpp src/gui/comboboxwithstatus.cpp src/gui/basetoolbar.cpp src/gui/messagestoolbar.cpp src/gui/feedstoolbar.cpp src/gui/toolbareditor.cpp src/gui/messagessearchlineedit.cpp - src/gui/formimportexport.cpp src/gui/styleditemdelegatewithoutfocus.cpp - src/gui/formbackupdatabasesettings.cpp - src/gui/formrestoredatabasesettings.cpp src/gui/edittableview.cpp src/gui/squeezelabel.cpp - src/gui/formdatabasecleanup.cpp + src/gui/discoverfeedsbutton.cpp # DYNAMIC-SHORTCUTS sources. src/dynamic-shortcuts/shortcutcatcher.cpp @@ -416,7 +417,6 @@ set(APP_SOURCES src/network-web/webview.cpp src/network-web/downloader.cpp src/network-web/downloadmanager.cpp - src/network-web/discoverfeedsbutton.cpp src/network-web/googlesuggest.cpp src/network-web/adblock/adblockaddsubscriptiondialog.cpp @@ -444,10 +444,17 @@ set(APP_HEADERS src/qtsingleapplication/qtsingleapplication.h # GUI headers. - src/gui/formmain.h + src/gui/dialogs/formmain.h + src/gui/dialogs/formsettings.h + src/gui/dialogs/formabout.h + src/gui/dialogs/formcategorydetails.h + src/gui/dialogs/formfeeddetails.h + src/gui/dialogs/formimportexport.h + src/gui/dialogs/formbackupdatabasesettings.h + src/gui/dialogs/formrestoredatabasesettings.h + src/gui/dialogs/formdatabasecleanup.h + src/gui/dialogs/formupdate.h src/gui/systemtrayicon.h - src/gui/formsettings.h - src/gui/formabout.h src/gui/baselineedit.h src/gui/locationlineedit.h src/gui/tabwidget.h @@ -457,26 +464,20 @@ set(APP_HEADERS src/gui/feedsview.h src/gui/messagesview.h src/gui/statusbar.h - src/gui/formcategorydetails.h - src/gui/formfeeddetails.h src/gui/plaintoolbutton.h src/gui/lineeditwithstatus.h src/gui/widgetwithstatus.h src/gui/labelwithstatus.h src/gui/messagebox.h - src/gui/formupdate.h src/gui/comboboxwithstatus.h src/gui/basetoolbar.h src/gui/messagestoolbar.h src/gui/feedstoolbar.h src/gui/toolbareditor.h src/gui/messagessearchlineedit.h - src/gui/formimportexport.h - src/gui/formbackupdatabasesettings.h - src/gui/formrestoredatabasesettings.h src/gui/edittableview.h src/gui/squeezelabel.h - src/gui/formdatabasecleanup.h + src/gui/discoverfeedsbutton.h # DYNAMIC-SHORTCUTS headers. src/dynamic-shortcuts/dynamicshortcutswidget.h @@ -513,7 +514,6 @@ set(APP_HEADERS src/network-web/webview.h src/network-web/downloader.h src/network-web/downloadmanager.h - src/network-web/discoverfeedsbutton.h src/network-web/googlesuggest.h src/network-web/adblock/adblockaddsubscriptiondialog.h @@ -528,17 +528,17 @@ set(APP_HEADERS # APP form files. set(APP_FORMS - src/gui/formupdate.ui - src/gui/formmain.ui - src/gui/formsettings.ui - src/gui/formabout.ui - src/gui/formcategorydetails.ui - src/gui/formfeeddetails.ui + src/gui/dialogs/formupdate.ui + src/gui/dialogs/formmain.ui + src/gui/dialogs/formsettings.ui + src/gui/dialogs/formabout.ui + src/gui/dialogs/formcategorydetails.ui + src/gui/dialogs/formfeeddetails.ui src/gui/toolbareditor.ui - src/gui/formimportexport.ui - src/gui/formbackupdatabasesettings.ui - src/gui/formrestoredatabasesettings.ui - src/gui/formdatabasecleanup.ui + src/gui/dialogs/formimportexport.ui + src/gui/dialogs/formbackupdatabasesettings.ui + src/gui/dialogs/formrestoredatabasesettings.ui + src/gui/dialogs/formdatabasecleanup.ui src/network-web/downloadmanager.ui src/network-web/downloaditem.ui @@ -699,6 +699,7 @@ endif(USE_QT_5) include_directories ( ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/gui + ${CMAKE_SOURCE_DIR}/src/gui/dialogs ${CMAKE_SOURCE_DIR}/src/network-web ${CMAKE_SOURCE_DIR}/src/network-web/adblock ${CMAKE_SOURCE_DIR}/src/dynamic-shortcuts diff --git a/src/core/feedsmodelcategory.cpp b/src/core/feedsmodelcategory.cpp index 06e33ab91..dbb437e30 100755 --- a/src/core/feedsmodelcategory.cpp +++ b/src/core/feedsmodelcategory.cpp @@ -22,7 +22,7 @@ #include "miscellaneous/textfactory.h" #include "miscellaneous/settings.h" #include "miscellaneous/iconfactory.h" -#include "gui/formcategorydetails.h" +#include "gui/dialogs/formcategorydetails.h" #include #include diff --git a/src/gui/basetoolbar.cpp b/src/gui/basetoolbar.cpp index 06a103623..1f3ee0866 100755 --- a/src/gui/basetoolbar.cpp +++ b/src/gui/basetoolbar.cpp @@ -18,7 +18,7 @@ #include "gui/basetoolbar.h" #include "definitions/definitions.h" -#include "gui/formmain.h" +#include "gui/dialogs/formmain.h" #include "miscellaneous/settings.h" #include diff --git a/src/gui/formabout.cpp b/src/gui/dialogs/formabout.cpp similarity index 97% rename from src/gui/formabout.cpp rename to src/gui/dialogs/formabout.cpp index e082584b7..8cce70b07 100755 --- a/src/gui/formabout.cpp +++ b/src/gui/dialogs/formabout.cpp @@ -15,7 +15,7 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "gui/formabout.h" +#include "gui/dialogs/formabout.h" #include "miscellaneous/iconfactory.h" #include "miscellaneous/textfactory.h" diff --git a/src/gui/formabout.h b/src/gui/dialogs/formabout.h similarity index 100% rename from src/gui/formabout.h rename to src/gui/dialogs/formabout.h diff --git a/src/gui/formabout.ui b/src/gui/dialogs/formabout.ui similarity index 100% rename from src/gui/formabout.ui rename to src/gui/dialogs/formabout.ui diff --git a/src/gui/formbackupdatabasesettings.cpp b/src/gui/dialogs/formbackupdatabasesettings.cpp similarity index 98% rename from src/gui/formbackupdatabasesettings.cpp rename to src/gui/dialogs/formbackupdatabasesettings.cpp index f36fedcff..a7386ffad 100755 --- a/src/gui/formbackupdatabasesettings.cpp +++ b/src/gui/dialogs/formbackupdatabasesettings.cpp @@ -15,7 +15,7 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "gui/formbackupdatabasesettings.h" +#include "gui/dialogs/formbackupdatabasesettings.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" diff --git a/src/gui/formbackupdatabasesettings.h b/src/gui/dialogs/formbackupdatabasesettings.h similarity index 100% rename from src/gui/formbackupdatabasesettings.h rename to src/gui/dialogs/formbackupdatabasesettings.h diff --git a/src/gui/formbackupdatabasesettings.ui b/src/gui/dialogs/formbackupdatabasesettings.ui similarity index 100% rename from src/gui/formbackupdatabasesettings.ui rename to src/gui/dialogs/formbackupdatabasesettings.ui diff --git a/src/gui/formcategorydetails.cpp b/src/gui/dialogs/formcategorydetails.cpp similarity index 99% rename from src/gui/formcategorydetails.cpp rename to src/gui/dialogs/formcategorydetails.cpp index 6ef876d5f..3edf511be 100755 --- a/src/gui/formcategorydetails.cpp +++ b/src/gui/dialogs/formcategorydetails.cpp @@ -15,7 +15,7 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "gui/formcategorydetails.h" +#include "gui/dialogs/formcategorydetails.h" #include "definitions/definitions.h" #include "core/feedsmodelrootitem.h" @@ -26,7 +26,7 @@ #include "gui/baselineedit.h" #include "gui/messagebox.h" #include "gui/systemtrayicon.h" -#include "gui/formmain.h" +#include "gui/dialogs/formmain.h" #include #include diff --git a/src/gui/formcategorydetails.h b/src/gui/dialogs/formcategorydetails.h similarity index 100% rename from src/gui/formcategorydetails.h rename to src/gui/dialogs/formcategorydetails.h diff --git a/src/gui/formcategorydetails.ui b/src/gui/dialogs/formcategorydetails.ui similarity index 100% rename from src/gui/formcategorydetails.ui rename to src/gui/dialogs/formcategorydetails.ui diff --git a/src/gui/formdatabasecleanup.cpp b/src/gui/dialogs/formdatabasecleanup.cpp similarity index 96% rename from src/gui/formdatabasecleanup.cpp rename to src/gui/dialogs/formdatabasecleanup.cpp index 0924a3924..198006eac 100755 --- a/src/gui/formdatabasecleanup.cpp +++ b/src/gui/dialogs/formdatabasecleanup.cpp @@ -15,7 +15,7 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "gui/formdatabasecleanup.h" +#include "gui/dialogs/formdatabasecleanup.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" diff --git a/src/gui/formdatabasecleanup.h b/src/gui/dialogs/formdatabasecleanup.h similarity index 100% rename from src/gui/formdatabasecleanup.h rename to src/gui/dialogs/formdatabasecleanup.h diff --git a/src/gui/formdatabasecleanup.ui b/src/gui/dialogs/formdatabasecleanup.ui similarity index 100% rename from src/gui/formdatabasecleanup.ui rename to src/gui/dialogs/formdatabasecleanup.ui diff --git a/src/gui/formfeeddetails.cpp b/src/gui/dialogs/formfeeddetails.cpp similarity index 97% rename from src/gui/formfeeddetails.cpp rename to src/gui/dialogs/formfeeddetails.cpp index 2700dd7d3..3ba5d7fb7 100755 --- a/src/gui/formfeeddetails.cpp +++ b/src/gui/dialogs/formfeeddetails.cpp @@ -15,7 +15,7 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "gui/formfeeddetails.h" +#include "gui/dialogs/formfeeddetails.h" #include "definitions/definitions.h" #include "core/feedsmodel.h" diff --git a/src/gui/formfeeddetails.h b/src/gui/dialogs/formfeeddetails.h similarity index 100% rename from src/gui/formfeeddetails.h rename to src/gui/dialogs/formfeeddetails.h diff --git a/src/gui/formfeeddetails.ui b/src/gui/dialogs/formfeeddetails.ui similarity index 100% rename from src/gui/formfeeddetails.ui rename to src/gui/dialogs/formfeeddetails.ui diff --git a/src/gui/formimportexport.cpp b/src/gui/dialogs/formimportexport.cpp similarity index 99% rename from src/gui/formimportexport.cpp rename to src/gui/dialogs/formimportexport.cpp index cd1647ad7..d56421e75 100755 --- a/src/gui/formimportexport.cpp +++ b/src/gui/dialogs/formimportexport.cpp @@ -15,14 +15,14 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "gui/formimportexport.h" +#include "gui/dialogs/formimportexport.h" #include "core/feedsimportexportmodel.h" #include "core/feedsmodel.h" #include "miscellaneous/application.h" #include "gui/feedmessageviewer.h" -#include "gui/formmain.h" #include "gui/feedsview.h" +#include "gui/dialogs/formmain.h" #include #include diff --git a/src/gui/formimportexport.h b/src/gui/dialogs/formimportexport.h similarity index 100% rename from src/gui/formimportexport.h rename to src/gui/dialogs/formimportexport.h diff --git a/src/gui/formimportexport.ui b/src/gui/dialogs/formimportexport.ui similarity index 100% rename from src/gui/formimportexport.ui rename to src/gui/dialogs/formimportexport.ui diff --git a/src/gui/formmain.cpp b/src/gui/dialogs/formmain.cpp similarity index 96% rename from src/gui/formmain.cpp rename to src/gui/dialogs/formmain.cpp index 6a1a31ff3..d856525d0 100755 --- a/src/gui/formmain.cpp +++ b/src/gui/dialogs/formmain.cpp @@ -15,7 +15,7 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "gui/formmain.h" +#include "gui/dialogs/formmain.h" #include "definitions/definitions.h" #include "miscellaneous/settings.h" @@ -26,19 +26,19 @@ #include "miscellaneous/iconfactory.h" #include "network-web/webfactory.h" #include "network-web/webbrowser.h" -#include "gui/formabout.h" -#include "gui/formsettings.h" #include "gui/feedsview.h" #include "gui/messagebox.h" #include "gui/systemtrayicon.h" #include "gui/tabbar.h" #include "gui/statusbar.h" #include "gui/feedmessageviewer.h" -#include "gui/formupdate.h" #include "gui/plaintoolbutton.h" -#include "gui/formimportexport.h" -#include "gui/formbackupdatabasesettings.h" -#include "gui/formrestoredatabasesettings.h" +#include "gui/dialogs/formabout.h" +#include "gui/dialogs/formsettings.h" +#include "gui/dialogs/formupdate.h" +#include "gui/dialogs/formimportexport.h" +#include "gui/dialogs/formbackupdatabasesettings.h" +#include "gui/dialogs/formrestoredatabasesettings.h" #include #include diff --git a/src/gui/formmain.h b/src/gui/dialogs/formmain.h similarity index 100% rename from src/gui/formmain.h rename to src/gui/dialogs/formmain.h diff --git a/src/gui/formmain.ui b/src/gui/dialogs/formmain.ui similarity index 100% rename from src/gui/formmain.ui rename to src/gui/dialogs/formmain.ui diff --git a/src/gui/formrestoredatabasesettings.cpp b/src/gui/dialogs/formrestoredatabasesettings.cpp similarity index 96% rename from src/gui/formrestoredatabasesettings.cpp rename to src/gui/dialogs/formrestoredatabasesettings.cpp index 1ef771e01..7b2a0cc69 100755 --- a/src/gui/formrestoredatabasesettings.cpp +++ b/src/gui/dialogs/formrestoredatabasesettings.cpp @@ -15,10 +15,10 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "gui/formrestoredatabasesettings.h" +#include "gui/dialogs/formrestoredatabasesettings.h" #include "gui/messagebox.h" -#include "gui/formmain.h" +#include "gui/dialogs/formmain.h" #include "miscellaneous/iconfactory.h" #include "exceptions/applicationexception.h" diff --git a/src/gui/formrestoredatabasesettings.h b/src/gui/dialogs/formrestoredatabasesettings.h similarity index 100% rename from src/gui/formrestoredatabasesettings.h rename to src/gui/dialogs/formrestoredatabasesettings.h diff --git a/src/gui/formrestoredatabasesettings.ui b/src/gui/dialogs/formrestoredatabasesettings.ui similarity index 100% rename from src/gui/formrestoredatabasesettings.ui rename to src/gui/dialogs/formrestoredatabasesettings.ui diff --git a/src/gui/formsettings.cpp b/src/gui/dialogs/formsettings.cpp similarity index 97% rename from src/gui/formsettings.cpp rename to src/gui/dialogs/formsettings.cpp index 568c35c43..25fe344e0 100755 --- a/src/gui/formsettings.cpp +++ b/src/gui/dialogs/formsettings.cpp @@ -15,7 +15,7 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "gui/formsettings.h" +#include "gui/dialogs/formsettings.h" #include "definitions/definitions.h" #include "core/feeddownloader.h" @@ -36,11 +36,11 @@ #include "gui/feedmessageviewer.h" #include "gui/feedsview.h" #include "gui/feedstoolbar.h" -#include "gui/formmain.h" #include "gui/messagebox.h" #include "gui/basetoolbar.h" #include "gui/messagestoolbar.h" #include "gui/messagesview.h" +#include "gui/dialogs/formmain.h" #include "dynamic-shortcuts/dynamicshortcuts.h" #include diff --git a/src/gui/formsettings.h b/src/gui/dialogs/formsettings.h similarity index 100% rename from src/gui/formsettings.h rename to src/gui/dialogs/formsettings.h diff --git a/src/gui/formsettings.ui b/src/gui/dialogs/formsettings.ui similarity index 100% rename from src/gui/formsettings.ui rename to src/gui/dialogs/formsettings.ui diff --git a/src/gui/formupdate.cpp b/src/gui/dialogs/formupdate.cpp similarity index 97% rename from src/gui/formupdate.cpp rename to src/gui/dialogs/formupdate.cpp index 5f78bd831..7ce58bd53 100755 --- a/src/gui/formupdate.cpp +++ b/src/gui/dialogs/formupdate.cpp @@ -15,7 +15,7 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "gui/formupdate.h" +#include "gui/dialogs/formupdate.h" #include "definitions/definitions.h" #include "miscellaneous/systemfactory.h" diff --git a/src/gui/formupdate.h b/src/gui/dialogs/formupdate.h similarity index 100% rename from src/gui/formupdate.h rename to src/gui/dialogs/formupdate.h diff --git a/src/gui/formupdate.ui b/src/gui/dialogs/formupdate.ui similarity index 100% rename from src/gui/formupdate.ui rename to src/gui/dialogs/formupdate.ui diff --git a/src/network-web/discoverfeedsbutton.cpp b/src/gui/discoverfeedsbutton.cpp similarity index 97% rename from src/network-web/discoverfeedsbutton.cpp rename to src/gui/discoverfeedsbutton.cpp index 9d5ec6c12..e6c26b852 100755 --- a/src/network-web/discoverfeedsbutton.cpp +++ b/src/gui/discoverfeedsbutton.cpp @@ -15,7 +15,7 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "network-web/discoverfeedsbutton.h" +#include "gui/discoverfeedsbutton.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" diff --git a/src/network-web/discoverfeedsbutton.h b/src/gui/discoverfeedsbutton.h similarity index 100% rename from src/network-web/discoverfeedsbutton.h rename to src/gui/discoverfeedsbutton.h diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp index 7a54fa18d..cc2af5b72 100755 --- a/src/gui/feedmessageviewer.cpp +++ b/src/gui/feedmessageviewer.cpp @@ -29,16 +29,16 @@ #include "core/feedsselection.h" #include "core/feedsimportexportmodel.h" #include "network-web/webbrowser.h" -#include "gui/formmain.h" #include "gui/messagesview.h" #include "gui/feedsview.h" #include "gui/statusbar.h" #include "gui/systemtrayicon.h" #include "gui/messagebox.h" -#include "gui/formdatabasecleanup.h" #include "gui/messagestoolbar.h" #include "gui/feedstoolbar.h" -#include +#include "gui/dialogs/formdatabasecleanup.h" +#include "gui/dialogs/formmain.h" +#include "exceptions/applicationexception.h" #include #include diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp index 92721ce7f..381676983 100755 --- a/src/gui/feedsview.cpp +++ b/src/gui/feedsview.cpp @@ -27,12 +27,12 @@ #include "core/feedsmodelfeed.h" #include "miscellaneous/systemfactory.h" #include "miscellaneous/mutex.h" -#include "gui/formmain.h" -#include "gui/formcategorydetails.h" -#include "gui/formfeeddetails.h" #include "gui/systemtrayicon.h" #include "gui/messagebox.h" #include "gui/styleditemdelegatewithoutfocus.h" +#include "gui/dialogs/formmain.h" +#include "gui/dialogs/formcategorydetails.h" +#include "gui/dialogs/formfeeddetails.h" #include #include diff --git a/src/gui/messagestoolbar.cpp b/src/gui/messagestoolbar.cpp index 3a9fc58ce..6d511e4ef 100755 --- a/src/gui/messagestoolbar.cpp +++ b/src/gui/messagestoolbar.cpp @@ -19,8 +19,8 @@ #include "definitions/definitions.h" #include "gui/baselineedit.h" -#include "gui/formmain.h" #include "gui/messagessearchlineedit.h" +#include "gui/dialogs/formmain.h" #include "miscellaneous/iconfactory.h" #include "miscellaneous/settings.h" diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp index 42a722619..1eb81e280 100755 --- a/src/gui/messagesview.cpp +++ b/src/gui/messagesview.cpp @@ -22,7 +22,7 @@ #include "miscellaneous/settings.h" #include "network-web/networkfactory.h" #include "network-web/webfactory.h" -#include "gui/formmain.h" +#include "gui/dialogs/formmain.h" #include "gui/messagebox.h" #include "gui/styleditemdelegatewithoutfocus.h" diff --git a/src/gui/statusbar.cpp b/src/gui/statusbar.cpp index 31bbccf76..44c63a373 100755 --- a/src/gui/statusbar.cpp +++ b/src/gui/statusbar.cpp @@ -17,7 +17,7 @@ #include "gui/statusbar.h" -#include "gui/formmain.h" +#include "gui/dialogs/formmain.h" #include "gui/tabwidget.h" #include "gui/plaintoolbutton.h" #include "network-web/adblock/adblockicon.h" diff --git a/src/gui/systemtrayicon.cpp b/src/gui/systemtrayicon.cpp index 36a4c95a7..d71cfc201 100755 --- a/src/gui/systemtrayicon.cpp +++ b/src/gui/systemtrayicon.cpp @@ -20,8 +20,8 @@ #include "definitions/definitions.h" #include "miscellaneous/application.h" #include "miscellaneous/settings.h" -#include "gui/formmain.h" -#include "gui/formsettings.h" +#include "gui/dialogs/formmain.h" +#include "gui/dialogs/formsettings.h" #include #include diff --git a/src/gui/tabwidget.cpp b/src/gui/tabwidget.cpp index 30bbe462a..f850dd92b 100755 --- a/src/gui/tabwidget.cpp +++ b/src/gui/tabwidget.cpp @@ -24,9 +24,9 @@ #include "miscellaneous/iconfactory.h" #include "network-web/webbrowser.h" #include "gui/tabbar.h" -#include "gui/formmain.h" #include "gui/feedmessageviewer.h" #include "gui/plaintoolbutton.h" +#include "gui/dialogs/formmain.h" #include #include diff --git a/src/gui/toolbareditor.cpp b/src/gui/toolbareditor.cpp index 868c06f76..fb7fed257 100755 --- a/src/gui/toolbareditor.cpp +++ b/src/gui/toolbareditor.cpp @@ -18,7 +18,7 @@ #include "gui/toolbareditor.h" #include "gui/basetoolbar.h" -#include "gui/formmain.h" +#include "gui/dialogs/formmain.h" #include diff --git a/src/main.cpp b/src/main.cpp index 5cb306bd4..cbb2a7d3b 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,7 +21,7 @@ #include "miscellaneous/debugging.h" #include "miscellaneous/iconfactory.h" #include "dynamic-shortcuts/dynamicshortcuts.h" -#include "gui/formmain.h" +#include "gui/dialogs/formmain.h" #include "gui/feedmessageviewer.h" #include "gui/feedsview.h" #include "gui/messagebox.h" diff --git a/src/miscellaneous/application.cpp b/src/miscellaneous/application.cpp index 528151473..4f6bcac7d 100755 --- a/src/miscellaneous/application.cpp +++ b/src/miscellaneous/application.cpp @@ -23,8 +23,8 @@ #include "gui/feedsview.h" #include "gui/feedmessageviewer.h" #include "gui/messagebox.h" -#include "gui/formmain.h" #include "gui/statusbar.h" +#include "gui/dialogs/formmain.h" #include "exceptions/applicationexception.h" #include diff --git a/src/miscellaneous/systemfactory.cpp b/src/miscellaneous/systemfactory.cpp index 54fd2a256..13e639667 100755 --- a/src/miscellaneous/systemfactory.cpp +++ b/src/miscellaneous/systemfactory.cpp @@ -18,7 +18,7 @@ #include "miscellaneous/systemfactory.h" #include "network-web/networkfactory.h" -#include "gui/formmain.h" +#include "gui/dialogs/formmain.h" #include "miscellaneous/application.h" #include "miscellaneous/systemfactory.h" diff --git a/src/network-web/adblock/adblockdialog.cpp b/src/network-web/adblock/adblockdialog.cpp index d918ab221..f5920b89d 100755 --- a/src/network-web/adblock/adblockdialog.cpp +++ b/src/network-web/adblock/adblockdialog.cpp @@ -25,7 +25,7 @@ #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" #include "gui/tabwidget.h" -#include "gui/formmain.h" +#include "gui/dialogs/formmain.h" #include #include diff --git a/src/network-web/adblock/adblockicon.cpp b/src/network-web/adblock/adblockicon.cpp index 8f607d1ad..8185b3ae4 100755 --- a/src/network-web/adblock/adblockicon.cpp +++ b/src/network-web/adblock/adblockicon.cpp @@ -25,8 +25,8 @@ #include "network-web/webbrowser.h" #include "miscellaneous/application.h" #include "gui/plaintoolbutton.h" -#include "gui/formmain.h" #include "gui/tabwidget.h" +#include "gui/dialogs/formmain.h" #include #include diff --git a/src/network-web/adblock/adblockmanager.cpp b/src/network-web/adblock/adblockmanager.cpp index 6d87e4a6d..b336d7628 100755 --- a/src/network-web/adblock/adblockmanager.cpp +++ b/src/network-web/adblock/adblockmanager.cpp @@ -28,7 +28,7 @@ #include "miscellaneous/application.h" #include "miscellaneous/settings.h" #include "definitions/definitions.h" -#include "gui/formmain.h" +#include "gui/dialogs/formmain.h" #include #include diff --git a/src/network-web/downloadmanager.cpp b/src/network-web/downloadmanager.cpp index 27089091d..a09df9a17 100755 --- a/src/network-web/downloadmanager.cpp +++ b/src/network-web/downloadmanager.cpp @@ -20,7 +20,7 @@ #include "miscellaneous/autosaver.h" #include "miscellaneous/application.h" #include "miscellaneous/settings.h" -#include "gui/formmain.h" +#include "gui/dialogs/formmain.h" #include "gui/tabwidget.h" #include "gui/messagebox.h" #include "network-web/silentnetworkaccessmanager.h" diff --git a/src/network-web/webbrowser.cpp b/src/network-web/webbrowser.cpp index 08d8f4c98..f97f98f5c 100755 --- a/src/network-web/webbrowser.cpp +++ b/src/network-web/webbrowser.cpp @@ -23,7 +23,7 @@ #include "network-web/webview.h" #include "network-web/networkfactory.h" #include "miscellaneous/skinfactory.h" -#include "gui/formmain.h" +#include "gui/dialogs/formmain.h" #include "gui/tabwidget.h" #include "gui/feedmessageviewer.h" #include "gui/feedsview.h" diff --git a/src/network-web/webbrowser.h b/src/network-web/webbrowser.h index 91a27ac54..6d65dd5e8 100755 --- a/src/network-web/webbrowser.h +++ b/src/network-web/webbrowser.h @@ -23,7 +23,7 @@ #include "core/messagesmodel.h" #include "network-web/webview.h" #include "gui/locationlineedit.h" -#include "network-web/discoverfeedsbutton.h" +#include "gui/discoverfeedsbutton.h" #include #include diff --git a/src/network-web/webview.cpp b/src/network-web/webview.cpp index 7744cf697..d919e66e7 100755 --- a/src/network-web/webview.cpp +++ b/src/network-web/webview.cpp @@ -24,7 +24,7 @@ #include "network-web/webpage.h" #include "network-web/webfactory.h" #include "gui/messagebox.h" -#include "gui/formmain.h" +#include "gui/dialogs/formmain.h" #include #include