Move in own directory for the future

messageviewer/src/CMakeLists.txt

@@ -57,10 +57,10 @@ set(_mailwebview_cpp
                        adblock/adblockutil.cpp
                        adblock/adblockaddsubscriptiondialog.cpp
                        adblock/adblocklistwidget.cpp
-                       adblock/adblocksyntaxhighlighter.cpp
-                       adblock/adblockshowlistdialog.cpp
+                       adblock/common/adblocksyntaxhighlighter.cpp
+                       adblock/common/adblockshowlistdialog.cpp
                        adblock/adblockblockableitemsdialog.cpp
-                       adblock/adblockcreatefilterdialog.cpp
+                       adblock/common/adblockcreatefilterdialog.cpp
                        adblock/adblockblockableitemswidget.cpp
                        )
 

messageviewer/src/adblock/adblockblockableitemswidget.cpp

@@ -16,7 +16,7 @@
 */
 
 #include "adblockblockableitemswidget.h"
-#include "adblockcreatefilterdialog.h"
+#include "common/adblockcreatefilterdialog.h"
 #include "settings/messageviewersettings.h"
 #include "adblock/adblockmanager.h"
 #include "PimCommon/CustomTreeView"

messageviewer/src/adblock/adblocksettingwidget.cpp

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

messageviewer/src/adblock/adblockcreatefilterdialog.h → messageviewer/src/adblock/common/adblockcreatefilterdialog.h

@@ -18,7 +18,7 @@
 #ifndef ADBLOCKCREATEFILTERDIALOG_H
 #define ADBLOCKCREATEFILTERDIALOG_H
 
-#include "adblockblockableitemswidget.h"
+#include "adblock/adblockblockableitemswidget.h"
 
 #include <QDialog>
 #include <KConfigGroup>