Refactorings...

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
 )

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"
 

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 <QDomDocument>
 #include <QDomElement>

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"

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"

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"

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"

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"

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"
 

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"

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"
 

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 <http://www.gnu.org/licenses/>.
 
-#include "core/basenetworkaccessmanager.h"
+#include "network-web/basenetworkaccessmanager.h"
 
 #include "core/defs.h"
 #include "core/settings.h"

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 <http://www.gnu.org/licenses/>.
 
-#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 <QEventLoop>
 #include <QTimer>

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 <http://www.gnu.org/licenses/>.
 
-#include "core/silentnetworkaccessmanager.h"
+#include "network-web/silentnetworkaccessmanager.h"
 
 #include <QNetworkReply>
 #include <QAuthenticator>

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 <QPointer>
 

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 <http://www.gnu.org/licenses/>.
 
-#include "core/webbrowsernetworkaccessmanager.h"
+#include "network-web/webbrowsernetworkaccessmanager.h"
 
 #include <QNetworkReply>
 #include <QApplication>

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 <QPointer>
 

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"

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 <http://www.gnu.org/licenses/>.
 
-#include "core/webpage.h"
+#include "network-web/webpage.h"
 
-#include "core/webbrowsernetworkaccessmanager.h"
+#include "network-web/webbrowsernetworkaccessmanager.h"
 #include "gui/webbrowser.h"
 
 #include <QNetworkReply>