[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [falkon] src/lib: AdBlock: Move remaining code to adblock subdir
From:       David Rosca <null () kde ! org>
Date:       2018-01-11 19:51:41
Message-ID: E1eZit3-0000XF-6D () code ! kde ! org
[Download RAW message or body]

Git commit 692d55fff77121bf542b4dcdcd075aa1f06787e1 by David Rosca.
Committed on 11/01/2018 at 19:03.
Pushed by drosca into branch 'master'.

AdBlock: Move remaining code to adblock subdir

M  +1    -0    src/lib/adblock/adblockaddsubscriptiondialog.cpp
M  +2    -0    src/lib/adblock/adblockmanager.h
M  +0    -2    src/lib/app/qzcommon.h

https://commits.kde.org/falkon/692d55fff77121bf542b4dcdcd075aa1f06787e1

diff --git a/src/lib/adblock/adblockaddsubscriptiondialog.cpp \
b/src/lib/adblock/adblockaddsubscriptiondialog.cpp index db89ce10..c010b0f9 100644
--- a/src/lib/adblock/adblockaddsubscriptiondialog.cpp
+++ b/src/lib/adblock/adblockaddsubscriptiondialog.cpp
@@ -17,6 +17,7 @@
 * ============================================================ */
 #include "adblockaddsubscriptiondialog.h"
 #include "ui_adblockaddsubscriptiondialog.h"
+#include "adblockmanager.h"
 
 AdBlockAddSubscriptionDialog::AdBlockAddSubscriptionDialog(QWidget* parent)
     : QDialog(parent)
diff --git a/src/lib/adblock/adblockmanager.h b/src/lib/adblock/adblockmanager.h
index b9795645..7f2b17ec 100644
--- a/src/lib/adblock/adblockmanager.h
+++ b/src/lib/adblock/adblockmanager.h
@@ -27,6 +27,8 @@
 
 #include "qzcommon.h"
 
+#define ADBLOCK_EASYLIST_URL \
"https://easylist-downloads.adblockplus.org/easylist.txt" +
 class AdBlockRule;
 class AdBlockDialog;
 class AdBlockMatcher;
diff --git a/src/lib/app/qzcommon.h b/src/lib/app/qzcommon.h
index 11445c54..406c838c 100644
--- a/src/lib/app/qzcommon.h
+++ b/src/lib/app/qzcommon.h
@@ -112,8 +112,6 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Qz::NewTabPositionFlags)
 
 }
 
-#define ADBLOCK_EASYLIST_URL \
                "https://easylist-downloads.adblockplus.org/easylist.txt"
-
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
 #define DEFAULT_THEME_NAME "windows"
 #elif defined(Q_OS_MACOS)


[prev in list] [next in list] [prev in thread] [next in thread]