summaryrefslogtreecommitdiff
path: root/src/adblock/adblocknetworkreply.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-05-14 01:24:35 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-05-14 01:24:55 +0200
commit343a67e61ed6c85fc37a91cffa1926412cb097b7 (patch)
tree52f9e86dffece69c7dfb5bfe54a7a086cdc3f2fe /src/adblock/adblocknetworkreply.cpp
parentMerge commit 'refs/merge-requests/2256' of git://gitorious.org/rekonq/mainlin... (diff)
parentMove adblock rules conf file to appdata, to maintain central config file tiny (diff)
downloadrekonq-343a67e61ed6c85fc37a91cffa1926412cb097b7.tar.xz
Merge branch 'FixBlocks'
WARNING: as we have a new adblock file, adblock will not work until rekonq doesn't update subscriptions. In some test installations, you can force rekonq doing it by removing your $KDEHOME/share/config/rekonqrc file :)
Diffstat (limited to 'src/adblock/adblocknetworkreply.cpp')
-rw-r--r--src/adblock/adblocknetworkreply.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/adblock/adblocknetworkreply.cpp b/src/adblock/adblocknetworkreply.cpp
index 13677daa..24f3a86f 100644
--- a/src/adblock/adblocknetworkreply.cpp
+++ b/src/adblock/adblocknetworkreply.cpp
@@ -75,6 +75,11 @@ AdBlockNetworkReply::AdBlockNetworkReply(const QNetworkRequest &request, const Q
}
+void AdBlockNetworkReply::abort()
+{
+}
+
+
qint64 AdBlockNetworkReply::readData(char *data, qint64 maxSize)
{
Q_UNUSED(data);