From 36a1f43c47cc8890eb3fae4cd5abfb547c6f4f8f Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 26 Mar 2014 12:23:27 +0100 Subject: [PATCH] Refactorings... --- CMakeLists.txt | 29 +++++++++++-------- src/core/feedsmodelfeed.cpp | 2 +- src/core/parsingfactory.cpp | 2 +- src/core/systemfactory.cpp | 2 +- src/gui/formmain.cpp | 2 +- src/gui/formsettings.cpp | 6 ++-- src/gui/formstandardfeeddetails.cpp | 2 +- src/gui/formupdate.cpp | 4 +-- src/gui/messagesview.cpp | 4 +-- src/gui/webbrowser.cpp | 4 +-- src/gui/webview.cpp | 2 +- .../basenetworkaccessmanager.cpp | 2 +- .../basenetworkaccessmanager.h | 0 src/{core => network-web}/networkfactory.cpp | 4 +-- src/{core => network-web}/networkfactory.h | 0 .../silentnetworkaccessmanager.cpp | 2 +- .../silentnetworkaccessmanager.h | 2 +- .../webbrowsernetworkaccessmanager.cpp | 2 +- .../webbrowsernetworkaccessmanager.h | 2 +- src/{core => network-web}/webfactory.cpp | 2 +- src/{core => network-web}/webfactory.h | 0 src/{core => network-web}/webpage.cpp | 4 +-- src/{core => network-web}/webpage.h | 0 23 files changed, 42 insertions(+), 37 deletions(-) rename src/{core => network-web}/basenetworkaccessmanager.cpp (96%) rename src/{core => network-web}/basenetworkaccessmanager.h (100%) rename src/{core => network-web}/networkfactory.cpp (98%) rename src/{core => network-web}/networkfactory.h (100%) rename src/{core => network-web}/silentnetworkaccessmanager.cpp (97%) rename src/{core => network-web}/silentnetworkaccessmanager.h (96%) rename src/{core => network-web}/webbrowsernetworkaccessmanager.cpp (94%) rename src/{core => network-web}/webbrowsernetworkaccessmanager.h (94%) rename src/{core => network-web}/webfactory.cpp (95%) rename src/{core => network-web}/webfactory.h (100%) rename src/{core => network-web}/webpage.cpp (94%) rename src/{core => network-web}/webpage.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 182ed27ba..5bf125206 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -307,10 +307,6 @@ set(APP_SOURCES src/core/systemfactory.cpp src/core/localization.cpp src/core/dynamicshortcuts.cpp - src/core/basenetworkaccessmanager.cpp - src/core/webpage.cpp - src/core/webbrowsernetworkaccessmanager.cpp - src/core/silentnetworkaccessmanager.cpp src/core/textfactory.cpp src/core/databasefactory.cpp src/core/messagesmodel.cpp @@ -322,10 +318,16 @@ set(APP_SOURCES src/core/feedsmodelfeed.cpp src/core/parsingfactory.cpp src/core/feeddownloader.cpp - src/core/networkfactory.cpp - src/core/webfactory.cpp - # Basic application sources. + # NETWORK-WEB sources. + src/network-web/basenetworkaccessmanager.cpp + src/network-web/webpage.cpp + src/network-web/webbrowsernetworkaccessmanager.cpp + src/network-web/silentnetworkaccessmanager.cpp + src/network-web/networkfactory.cpp + src/network-web/webfactory.cpp + + # MAIN sources. src/main.cpp ) @@ -371,10 +373,7 @@ set(APP_HEADERS # CORE headers. src/core/settings.h src/core/localization.h - src/core/basenetworkaccessmanager.h - src/core/webbrowsernetworkaccessmanager.h - src/core/silentnetworkaccessmanager.h - src/core/webpage.h + src/network-web/webpage.h src/core/systemfactory.h src/core/databasefactory.h src/core/messagesmodel.h @@ -382,7 +381,12 @@ set(APP_HEADERS src/core/feedsmodel.h src/core/feedsproxymodel.h src/core/feeddownloader.h - src/core/webfactory.h + + # NETWORK-WEB headers. + src/network-web/basenetworkaccessmanager.h + src/network-web/webbrowsernetworkaccessmanager.h + src/network-web/silentnetworkaccessmanager.h + src/network-web/webfactory.h ) # Add form files. @@ -452,6 +456,7 @@ endif(${USE_QT_5}) include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/gui + ${CMAKE_CURRENT_SOURCE_DIR}/src/network-web ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/src ) diff --git a/src/core/feedsmodelfeed.cpp b/src/core/feedsmodelfeed.cpp index eac81a210..f069db200 100755 --- a/src/core/feedsmodelfeed.cpp +++ b/src/core/feedsmodelfeed.cpp @@ -21,8 +21,8 @@ #include "core/settings.h" #include "core/parsingfactory.h" #include "core/databasefactory.h" -#include "core/networkfactory.h" #include "core/textfactory.h" +#include "network-web/networkfactory.h" #include "gui/iconfactory.h" #include "gui/iconthemefactory.h" diff --git a/src/core/parsingfactory.cpp b/src/core/parsingfactory.cpp index 4c5a00172..e1d3df51d 100755 --- a/src/core/parsingfactory.cpp +++ b/src/core/parsingfactory.cpp @@ -17,8 +17,8 @@ #include "core/parsingfactory.h" -#include "core/webfactory.h" #include "core/textfactory.h" +#include "network-web/webfactory.h" #include #include diff --git a/src/core/systemfactory.cpp b/src/core/systemfactory.cpp index 0e2746d6c..b8577730f 100644 --- a/src/core/systemfactory.cpp +++ b/src/core/systemfactory.cpp @@ -18,7 +18,7 @@ #include "core/systemfactory.h" #include "core/defs.h" -#include "core/networkfactory.h" +#include "network-web/networkfactory.h" #if defined(Q_OS_WIN) #include "qtsingleapplication/qtsingleapplication.h" diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp index 615ea8755..1123a19e6 100755 --- a/src/gui/formmain.cpp +++ b/src/gui/formmain.cpp @@ -21,7 +21,7 @@ #include "core/settings.h" #include "core/systemfactory.h" #include "core/databasefactory.h" -#include "core/webfactory.h" +#include "network-web/webfactory.h" #include "gui/formabout.h" #include "gui/formsettings.h" #include "gui/feedsview.h" diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp index 97fbdcbd8..c7a8bd0fc 100755 --- a/src/gui/formsettings.cpp +++ b/src/gui/formsettings.cpp @@ -22,11 +22,11 @@ #include "core/databasefactory.h" #include "core/localization.h" #include "core/systemfactory.h" -#include "core/webfactory.h" #include "core/feeddownloader.h" #include "core/dynamicshortcuts.h" -#include "core/webbrowsernetworkaccessmanager.h" -#include "core/silentnetworkaccessmanager.h" +#include "network-web/webfactory.h" +#include "network-web/webbrowsernetworkaccessmanager.h" +#include "network-web/silentnetworkaccessmanager.h" #include "core/feedsmodel.h" #include "gui/iconthemefactory.h" #include "gui/skinfactory.h" diff --git a/src/gui/formstandardfeeddetails.cpp b/src/gui/formstandardfeeddetails.cpp index 428522772..dcfe6618d 100644 --- a/src/gui/formstandardfeeddetails.cpp +++ b/src/gui/formstandardfeeddetails.cpp @@ -23,7 +23,7 @@ #include "core/feedsmodelrootitem.h" #include "core/feedsmodelcategory.h" #include "core/feedsmodelfeed.h" -#include "core/networkfactory.h" +#include "network-web/networkfactory.h" #include "gui/iconthemefactory.h" #include "gui/baselineedit.h" #include "gui/messagebox.h" diff --git a/src/gui/formupdate.cpp b/src/gui/formupdate.cpp index 65f6184d7..91453226e 100755 --- a/src/gui/formupdate.cpp +++ b/src/gui/formupdate.cpp @@ -19,8 +19,8 @@ #include "core/defs.h" #include "core/systemfactory.h" -#include "core/networkfactory.h" -#include "core/webfactory.h" +#include "network-web/networkfactory.h" +#include "network-web/webfactory.h" #include "gui/iconthemefactory.h" #include "gui/messagebox.h" #include "gui/systemtrayicon.h" diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp index 01bddfa9c..573bff128 100644 --- a/src/gui/messagesview.cpp +++ b/src/gui/messagesview.cpp @@ -20,8 +20,8 @@ #include "core/messagesproxymodel.h" #include "core/messagesmodel.h" #include "core/settings.h" -#include "core/networkfactory.h" -#include "core/webfactory.h" +#include "network-web/networkfactory.h" +#include "network-web/webfactory.h" #include "gui/formmain.h" #include "gui/messagebox.h" diff --git a/src/gui/webbrowser.cpp b/src/gui/webbrowser.cpp index 822c32a8a..200c22f71 100644 --- a/src/gui/webbrowser.cpp +++ b/src/gui/webbrowser.cpp @@ -18,8 +18,8 @@ #include "gui/webbrowser.h" #include "core/defs.h" -#include "core/webbrowsernetworkaccessmanager.h" -#include "core/webpage.h" +#include "network-web/webbrowsernetworkaccessmanager.h" +#include "network-web/webpage.h" #include "gui/skinfactory.h" #include "gui/webview.h" #include "gui/formmain.h" diff --git a/src/gui/webview.cpp b/src/gui/webview.cpp index 956d6aefb..1490bcdf3 100644 --- a/src/gui/webview.cpp +++ b/src/gui/webview.cpp @@ -19,7 +19,7 @@ #include "core/defs.h" #include "core/settings.h" -#include "core/webpage.h" +#include "network-web/webpage.h" #include "gui/skinfactory.h" #include "gui/iconthemefactory.h" diff --git a/src/core/basenetworkaccessmanager.cpp b/src/network-web/basenetworkaccessmanager.cpp similarity index 96% rename from src/core/basenetworkaccessmanager.cpp rename to src/network-web/basenetworkaccessmanager.cpp index 8c96f7e70..196175a42 100644 --- a/src/core/basenetworkaccessmanager.cpp +++ b/src/network-web/basenetworkaccessmanager.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 "core/basenetworkaccessmanager.h" +#include "network-web/basenetworkaccessmanager.h" #include "core/defs.h" #include "core/settings.h" diff --git a/src/core/basenetworkaccessmanager.h b/src/network-web/basenetworkaccessmanager.h similarity index 100% rename from src/core/basenetworkaccessmanager.h rename to src/network-web/basenetworkaccessmanager.h diff --git a/src/core/networkfactory.cpp b/src/network-web/networkfactory.cpp similarity index 98% rename from src/core/networkfactory.cpp rename to src/network-web/networkfactory.cpp index bd89b6752..2737b3ce2 100644 --- a/src/core/networkfactory.cpp +++ b/src/network-web/networkfactory.cpp @@ -15,11 +15,11 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "core/networkfactory.h" +#include "network-web/networkfactory.h" #include "core/defs.h" -#include "core/silentnetworkaccessmanager.h" #include "core/settings.h" +#include "network-web/silentnetworkaccessmanager.h" #include #include diff --git a/src/core/networkfactory.h b/src/network-web/networkfactory.h similarity index 100% rename from src/core/networkfactory.h rename to src/network-web/networkfactory.h diff --git a/src/core/silentnetworkaccessmanager.cpp b/src/network-web/silentnetworkaccessmanager.cpp similarity index 97% rename from src/core/silentnetworkaccessmanager.cpp rename to src/network-web/silentnetworkaccessmanager.cpp index 68647e821..05ea2bd4f 100644 --- a/src/core/silentnetworkaccessmanager.cpp +++ b/src/network-web/silentnetworkaccessmanager.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 "core/silentnetworkaccessmanager.h" +#include "network-web/silentnetworkaccessmanager.h" #include #include diff --git a/src/core/silentnetworkaccessmanager.h b/src/network-web/silentnetworkaccessmanager.h similarity index 96% rename from src/core/silentnetworkaccessmanager.h rename to src/network-web/silentnetworkaccessmanager.h index d3eade0dc..701b59e7a 100644 --- a/src/core/silentnetworkaccessmanager.h +++ b/src/network-web/silentnetworkaccessmanager.h @@ -18,7 +18,7 @@ #ifndef SILENTNETWORKACCESSMANAGER_H #define SILENTNETWORKACCESSMANAGER_H -#include "core/basenetworkaccessmanager.h" +#include "network-web/basenetworkaccessmanager.h" #include diff --git a/src/core/webbrowsernetworkaccessmanager.cpp b/src/network-web/webbrowsernetworkaccessmanager.cpp similarity index 94% rename from src/core/webbrowsernetworkaccessmanager.cpp rename to src/network-web/webbrowsernetworkaccessmanager.cpp index f195975bd..4b2db15ed 100644 --- a/src/core/webbrowsernetworkaccessmanager.cpp +++ b/src/network-web/webbrowsernetworkaccessmanager.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 "core/webbrowsernetworkaccessmanager.h" +#include "network-web/webbrowsernetworkaccessmanager.h" #include #include diff --git a/src/core/webbrowsernetworkaccessmanager.h b/src/network-web/webbrowsernetworkaccessmanager.h similarity index 94% rename from src/core/webbrowsernetworkaccessmanager.h rename to src/network-web/webbrowsernetworkaccessmanager.h index a05c4651b..27aa9cb73 100644 --- a/src/core/webbrowsernetworkaccessmanager.h +++ b/src/network-web/webbrowsernetworkaccessmanager.h @@ -18,7 +18,7 @@ #ifndef WEBBROWSERNETWORKACCESSMANAGER_H #define WEBBROWSERNETWORKACCESSMANAGER_H -#include "core/basenetworkaccessmanager.h" +#include "network-web/basenetworkaccessmanager.h" #include diff --git a/src/core/webfactory.cpp b/src/network-web/webfactory.cpp similarity index 95% rename from src/core/webfactory.cpp rename to src/network-web/webfactory.cpp index d2dbe6057..72f796d64 100644 --- a/src/core/webfactory.cpp +++ b/src/network-web/webfactory.cpp @@ -1,4 +1,4 @@ -#include "core/webfactory.h" +#include "network-web/webfactory.h" #include "core/defs.h" #include "core/settings.h" diff --git a/src/core/webfactory.h b/src/network-web/webfactory.h similarity index 100% rename from src/core/webfactory.h rename to src/network-web/webfactory.h diff --git a/src/core/webpage.cpp b/src/network-web/webpage.cpp similarity index 94% rename from src/core/webpage.cpp rename to src/network-web/webpage.cpp index 77a30bdf0..04255df63 100644 --- a/src/core/webpage.cpp +++ b/src/network-web/webpage.cpp @@ -15,9 +15,9 @@ // You should have received a copy of the GNU General Public License // along with RSS Guard. If not, see . -#include "core/webpage.h" +#include "network-web/webpage.h" -#include "core/webbrowsernetworkaccessmanager.h" +#include "network-web/webbrowsernetworkaccessmanager.h" #include "gui/webbrowser.h" #include diff --git a/src/core/webpage.h b/src/network-web/webpage.h similarity index 100% rename from src/core/webpage.h rename to src/network-web/webpage.h