Move to own directory

messageviewer/src/CMakeLists.txt

@@ -54,17 +54,19 @@ set(_mailwebview_cpp
                        adblock/adblockrulenullimpl.cpp
                        adblock/adblockruletextmatchimpl.cpp
                        adblock/adblocksettingwidget.cpp
-                       adblock/adblockutil.cpp
-                       adblock/adblockaddsubscriptiondialog.cpp
+                       adblock/adblockblockableitemsdialog.cpp
+                       adblock/adblockblockableitemswidget.cpp
+
+                       adblock/common/adblockutil.cpp
+                       adblock/common/adblockcreatefilterdialog.cpp
+                       adblock/common/adblockaddsubscriptiondialog.cpp
                        adblock/common/adblocklistwidget.cpp
                        adblock/common/adblocksyntaxhighlighter.cpp
                        adblock/common/adblockshowlistdialog.cpp
-                       adblock/adblockblockableitemsdialog.cpp
-                       adblock/common/adblockcreatefilterdialog.cpp
-                       adblock/adblockblockableitemswidget.cpp
                        )
 
-# For the moment we can'r replace mailwebengine
+
+# For the moment we can't replace mailwebengine
 set(libmessageviewer_mailviewer_SRCS
    viewer/webview/mailwebview.cpp
    viewer/webview/webpage.cpp

messageviewer/src/adblock/adblockblockableitemswidget.cpp

@@ -25,7 +25,7 @@
 #include <KTreeWidgetSearchLine>
 #include <QMenu>
 #include <KConfigGroup>
-#include "adblock/adblockutil.h"
+#include "adblock/common/adblockutil.h"
 #include <QUrl>
 #include <KRun>
 

messageviewer/src/adblock/adblockmanager.cpp

@@ -28,7 +28,7 @@
 #include "adblockmanager.h"
 #include "messageviewer_debug.h"
 #include "settings/messageviewersettings.h"
-#include "adblock/adblockutil.h"
+#include "adblock/common/adblockutil.h"
 #include "adblockelementhiding.h"
 #include "adblockhostmatcher.h"
 #include "adblock/adblockrule.h"

messageviewer/src/adblock/adblocksettingwidget.cpp

@@ -29,10 +29,10 @@
 #include "adblocksettingwidget.h"
 #include "messageviewer_debug.h"
 #include "settings/messageviewersettings.h"
-#include "adblockaddsubscriptiondialog.h"
+#include "common/adblockaddsubscriptiondialog.h"
 #include "adblockmanager.h"
 #include "common/adblockshowlistdialog.h"
-#include "adblock/adblockutil.h"
+#include "adblock/common/adblockutil.h"
 #include "PimCommon/ConfigureImmutableWidgetUtils"
 using namespace PimCommon::ConfigureImmutableWidgetUtils;