Moved scheme handlers into own directory network/schemehandlers

w41l · Aug 23, 2012 · 8d2391d · 8d2391d
1 parent 3cb1477
commit 8d2391d
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/src/lib/lib.pro b/src/lib/lib.pro
@@ -119,7 +119,6 @@ SOURCES += \
     navigation/navigationbar.cpp \
     navigation/reloadstopbutton.cpp \
     preferences/thememanager.cpp \
-    network/qupzillaschemehandler.cpp \
     tools/globalfunctions.cpp \
     other/pagescreen.cpp \
     downloads/downloadfilehelper.cpp \
@@ -177,15 +176,16 @@ SOURCES += \
     other/iconchooser.cpp \
     adblock/adblocktreewidget.cpp \
     adblock/adblockaddsubscriptiondialog.cpp \
-    adblock/adblockschemehandler.cpp \
     tools/emptynetworkreply.cpp \
     3rdparty/processinfo.cpp \
     preferences/pluginsmanager.cpp \
     other/qzsettings.cpp \
     other/useragentmanager.cpp \
     preferences/useragentdialog.cpp \
     session/recoverywidget.cpp \
-    session/restoremanager.cpp
+    session/restoremanager.cpp \
+    network/schemehandlers/qupzillaschemehandler.cpp \
+    network/schemehandlers/adblockschemehandler.cpp \
 
 HEADERS  += \
     webview/tabpreview.h \
@@ -271,7 +271,6 @@ HEADERS  += \
     navigation/navigationbar.h \
     navigation/reloadstopbutton.h \
     preferences/thememanager.h \
-    network/qupzillaschemehandler.h \
     tools/globalfunctions.h \
     other/pagescreen.h \
     downloads/downloadfilehelper.h \
@@ -317,7 +316,6 @@ HEADERS  += \
     other/licenseviewer.h \
     bookmarksimport/bookmarksimporticonfetcher.h \
     other/checkboxdialog.h \
-    network/schemehandler.h \
     tools/plaineditwithlines.h \
     sidebar/sidebarinterface.h \
     tools/focusselectlineedit.h \
@@ -333,15 +331,17 @@ HEADERS  += \
     other/iconchooser.h \
     adblock/adblocktreewidget.h \
     adblock/adblockaddsubscriptiondialog.h \
-    adblock/adblockschemehandler.h \
     tools/emptynetworkreply.h \
     3rdparty/processinfo.h \
     preferences/pluginsmanager.h \
     other/qzsettings.h \
     other/useragentmanager.h \
     preferences/useragentdialog.h \
     session/recoverywidget.h \
-    session/restoremanager.h
+    session/restoremanager.h \
+    network/schemehandlers/schemehandler.h \
+    network/schemehandlers/qupzillaschemehandler.h \
+    network/schemehandlers/adblockschemehandler.h \
 
 FORMS    += \
     preferences/autofillmanager.ui \

diff --git a/src/lib/network/networkmanager.cpp b/src/lib/network/networkmanager.cpp
@@ -23,14 +23,14 @@
 #include "webpage.h"
 #include "pluginproxy.h"
 #include "adblockmanager.h"
-#include "adblockschemehandler.h"
 #include "networkproxyfactory.h"
-#include "qupzillaschemehandler.h"
 #include "certificateinfowidget.h"
 #include "globalfunctions.h"
 #include "acceptlanguage.h"
 #include "cabundleupdater.h"
 #include "settings.h"
+#include "schemehandlers/adblockschemehandler.h"
+#include "schemehandlers/qupzillaschemehandler.h"
 
 #include <QFormLayout>
 #include <QLabel>

diff --git a/src/lib/adblock/adblockschemehandler.cpp → ...k/schemehandlers/adblockschemehandler.cpp b/src/lib/adblock/adblockschemehandler.cpp → ...k/schemehandlers/adblockschemehandler.cpp
diff --git a/src/lib/adblock/adblockschemehandler.h → ...ork/schemehandlers/adblockschemehandler.h b/src/lib/adblock/adblockschemehandler.h → ...ork/schemehandlers/adblockschemehandler.h
diff --git a/src/lib/network/qupzillaschemehandler.cpp → .../schemehandlers/qupzillaschemehandler.cpp b/src/lib/network/qupzillaschemehandler.cpp → .../schemehandlers/qupzillaschemehandler.cpp
diff --git a/src/lib/network/qupzillaschemehandler.h → ...rk/schemehandlers/qupzillaschemehandler.h b/src/lib/network/qupzillaschemehandler.h → ...rk/schemehandlers/qupzillaschemehandler.h
diff --git a/src/lib/network/schemehandler.h → ...ib/network/schemehandlers/schemehandler.h b/src/lib/network/schemehandler.h → ...ib/network/schemehandlers/schemehandler.h