diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:17:49 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:17:49 -0600 |
commit | a9184bb205c837f932e03b2a6cac578582f36ed5 (patch) | |
tree | 0b69cad530a4c1d0aa8f36ecd50f72f2f589e980 /konq-plugins/akregator | |
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/akregator')
-rw-r--r-- | konq-plugins/akregator/akregatorplugin.cpp | 4 | ||||
-rw-r--r-- | konq-plugins/akregator/konqfeedicon.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp index 72a73d1..372c2e4 100644 --- a/konq-plugins/akregator/akregatorplugin.cpp +++ b/konq-plugins/akregator/akregatorplugin.cpp @@ -27,11 +27,11 @@ #include <kapplication.h> #include <kmimetype.h> #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <kinstance.h> #include <klocale.h> #include <konq_popupmenu.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kgenericfactory.h> #include <kurl.h> #include <tdehtml_part.h> diff --git a/konq-plugins/akregator/konqfeedicon.h b/konq-plugins/akregator/konqfeedicon.h index 3b6b470..4f102b1 100644 --- a/konq-plugins/akregator/konqfeedicon.h +++ b/konq-plugins/akregator/konqfeedicon.h @@ -27,7 +27,7 @@ #include <tqguardedptr.h> #include <tdeparts/plugin.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include "feeddetector.h" #include "pluginbase.h" |