Refactorings....

CMakeLists.txt

@@ -279,8 +279,6 @@ set(APP_SOURCES
   src/gui/shortcutcatcher.cpp
   src/gui/shortcutbutton.cpp
   src/gui/dynamicshortcutswidget.cpp
-  src/gui/webbrowser.cpp
-  src/gui/webview.cpp
   src/gui/baselineedit.cpp
   src/gui/locationlineedit.cpp
   src/gui/tabwidget.cpp
@@ -326,6 +324,8 @@ set(APP_SOURCES
   src/network-web/silentnetworkaccessmanager.cpp
   src/network-web/networkfactory.cpp
   src/network-web/webfactory.cpp
+  src/network-web/webbrowser.cpp
+  src/network-web/webview.cpp
 
   # MAIN sources.
   src/main.cpp
@@ -349,8 +349,6 @@ set(APP_HEADERS
   src/gui/shortcutcatcher.h
   src/gui/shortcutbutton.h
   src/gui/dynamicshortcutswidget.h
-  src/gui/webbrowser.h
-  src/gui/webview.h
   src/gui/baselineedit.h
   src/gui/locationlineedit.h
   src/gui/tabwidget.h
@@ -387,6 +385,8 @@ set(APP_HEADERS
   src/network-web/webbrowsernetworkaccessmanager.h
   src/network-web/silentnetworkaccessmanager.h
   src/network-web/webfactory.h
+  src/network-web/webbrowser.h
+  src/network-web/webview.h
 )
 
 # Add form files.

src/gui/feedmessageviewer.cpp

@@ -23,7 +23,7 @@
 #include "core/feeddownloader.h"
 #include "core/feedsmodelfeed.h"
 #include "core/systemfactory.h"
-#include "gui/webbrowser.h"
+#include "network-web/webbrowser.h"
 #include "gui/formmain.h"
 #include "gui/iconthemefactory.h"
 #include "gui/messagesview.h"

src/gui/formmain.cpp

@@ -22,11 +22,11 @@
 #include "core/systemfactory.h"
 #include "core/databasefactory.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/webbrowser.h"
 #include "gui/iconthemefactory.h"
 #include "gui/systemtrayicon.h"
 #include "gui/tabbar.h"

src/gui/formsettings.cpp

@@ -27,6 +27,7 @@
 #include "network-web/webfactory.h"
 #include "network-web/webbrowsernetworkaccessmanager.h"
 #include "network-web/silentnetworkaccessmanager.h"
+#include "network-web/webbrowser.h"
 #include "core/feedsmodel.h"
 #include "gui/iconthemefactory.h"
 #include "gui/skinfactory.h"
@@ -34,7 +35,6 @@
 #include "gui/feedmessageviewer.h"
 #include "gui/feedsview.h"
 #include "gui/formmain.h"
-#include "gui/webbrowser.h"
 #include "gui/messagebox.h"
 #include "qtsingleapplication/qtsingleapplication.h"
 

src/gui/tabwidget.cpp

@@ -20,9 +20,9 @@
 #include "core/defs.h"
 #include "core/settings.h"
 #include "core/textfactory.h"
+#include "network-web/webbrowser.h"
 #include "gui/tabbar.h"
 #include "gui/iconthemefactory.h"
-#include "gui/webbrowser.h"
 #include "gui/formmain.h"
 #include "gui/feedmessageviewer.h"
 #include "gui/plaintoolbutton.h"

src/network-web/webbrowser.cpp

@@ -15,13 +15,13 @@
 // 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 "gui/webbrowser.h"
+#include "network-web/webbrowser.h"
 
 #include "core/defs.h"
 #include "network-web/webbrowsernetworkaccessmanager.h"
 #include "network-web/webpage.h"
+#include "network-web/webview.h"
 #include "gui/skinfactory.h"
-#include "gui/webview.h"
 #include "gui/formmain.h"
 #include "gui/iconthemefactory.h"
 #include "gui/tabwidget.h"

src/network-web/webbrowser.h

@@ -19,8 +19,8 @@
 #define WEBBROWSER_H
 
 #include "core/messagesmodel.h"
+#include "network-web/webview.h"
 #include "gui/tabcontent.h"
-#include "gui/webview.h"
 #include "gui/locationlineedit.h"
 
 #include <QWidget>

src/network-web/webpage.cpp

@@ -18,7 +18,7 @@
 #include "network-web/webpage.h"
 
 #include "network-web/webbrowsernetworkaccessmanager.h"
-#include "gui/webbrowser.h"
+#include "network-web/webbrowser.h"
 
 #include <QNetworkReply>
 #include <QWebFrame>

src/network-web/webview.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 "gui/webview.h"
+#include "network-web/webview.h"
 
 #include "core/defs.h"
 #include "core/settings.h"