diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:31 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:31 -0600 |
commit | bd11bce76f195adf4f3806cef8cf2e0737c99ff2 (patch) | |
tree | e3c1714d74f67cc51cd04162cd4afa927dd7f7d4 /kdelirc/irkick | |
parent | 2d7591be424ae10d974d01e0e2f781d19ef07cd6 (diff) | |
download | tdeutils-bd11bce76f195adf4f3806cef8cf2e0737c99ff2.tar.gz tdeutils-bd11bce76f195adf4f3806cef8cf2e0737c99ff2.zip |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kdelirc/irkick')
-rw-r--r-- | kdelirc/irkick/irkick.cpp | 6 | ||||
-rw-r--r-- | kdelirc/irkick/klircclient.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kdelirc/irkick/irkick.cpp b/kdelirc/irkick/irkick.cpp index b90c74b..b595066 100644 --- a/kdelirc/irkick/irkick.cpp +++ b/kdelirc/irkick/irkick.cpp @@ -16,16 +16,16 @@ #include <tdeversion.h> #include <kapplication.h> -#include <kaction.h> +#include <tdeaction.h> #if !(TDE_VERSION_MINOR<=1 && TDE_VERSION_RELEASE<=5) -#include <kactioncollection.h> +#include <tdeactioncollection.h> #endif #include <ksimpleconfig.h> #include <ksystemtray.h> #include <kiconloader.h> #include <kpassivepopup.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdebug.h> #include <klocale.h> #include <kaboutdialog.h> diff --git a/kdelirc/irkick/klircclient.cpp b/kdelirc/irkick/klircclient.cpp index 4d2089f..a9373f9 100644 --- a/kdelirc/irkick/klircclient.cpp +++ b/kdelirc/irkick/klircclient.cpp @@ -31,7 +31,7 @@ #include <kiconloader.h> #include <kpassivepopup.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdebug.h> #include <klocale.h> #include <kaboutdialog.h> |