diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:17:49 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:17:49 -0600 |
| commit | a9184bb205c837f932e03b2a6cac578582f36ed5 (patch) | |
| tree | 0b69cad530a4c1d0aa8f36ecd50f72f2f589e980 /konq-plugins/adblock | |
| parent | 74a2067d286867e313f736d6733407586b71195e (diff) | |
| download | tdeaddons-a9184bb205c837f932e03b2a6cac578582f36ed5.tar.gz tdeaddons-a9184bb205c837f932e03b2a6cac578582f36ed5.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/adblock')
| -rw-r--r-- | konq-plugins/adblock/adblock.cpp | 2 | ||||
| -rw-r--r-- | konq-plugins/adblock/adblockdialogue.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp index f52fbc0..a62f457 100644 --- a/konq-plugins/adblock/adblock.cpp +++ b/konq-plugins/adblock/adblock.cpp @@ -37,7 +37,7 @@ #include <tdeconfig.h> #include <kmessagebox.h> #include <kstandarddirs.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kcmultidialog.h> #include <klocale.h> #include <dom/html_document.h> diff --git a/konq-plugins/adblock/adblockdialogue.cpp b/konq-plugins/adblock/adblockdialogue.cpp index 48c7090..8198dd3 100644 --- a/konq-plugins/adblock/adblockdialogue.cpp +++ b/konq-plugins/adblock/adblockdialogue.cpp @@ -21,7 +21,7 @@ #include "adblockdialogue.h" #include <kdebug.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <klocale.h> #include <tqcursor.h> |