summaryrefslogtreecommitdiffstats
path: root/kdelirc/irkick
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:23:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:23:08 -0600
commit8856e75c203aa69be210b2fee1095ab9761aca7e (patch)
treed59810016bc093e8dd7f2f886f07c45fa25447a5 /kdelirc/irkick
parented70cd1b539ac2e02319b55183a5be7a28f2d116 (diff)
downloadtdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.tar.gz
tdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kdelirc/irkick')
-rw-r--r--kdelirc/irkick/irkick.h2
-rw-r--r--kdelirc/irkick/main.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/kdelirc/irkick/irkick.h b/kdelirc/irkick/irkick.h
index e99a1c0..f581508 100644
--- a/kdelirc/irkick/irkick.h
+++ b/kdelirc/irkick/irkick.h
@@ -53,7 +53,7 @@ class IRKick: public TQObject, public DCOPObject
Modes allModes;
IRKTrayIcon *theTrayIcon;
- KAboutData *aboutData;
+ TDEAboutData *aboutData;
TQTimer *theFlashOff;
void updateModeIcons();
diff --git a/kdelirc/irkick/main.cpp b/kdelirc/irkick/main.cpp
index 07e947a..43715e9 100644
--- a/kdelirc/irkick/main.cpp
+++ b/kdelirc/irkick/main.cpp
@@ -19,7 +19,7 @@
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
- KAboutData *aboutData = new KAboutData("irkick", I18N_NOOP("IRKick"), VERSION, I18N_NOOP("The TDE Infrared Remote Control Server"), KAboutData::License_GPL, "(c) 2003, Gav Wood", 0, 0, "gav@kde.org");
+ TDEAboutData *aboutData = new TDEAboutData("irkick", I18N_NOOP("IRKick"), VERSION, I18N_NOOP("The TDE Infrared Remote Control Server"), TDEAboutData::License_GPL, "(c) 2003, Gav Wood", 0, 0, "gav@kde.org");
aboutData->addAuthor("Gav Wood", I18N_NOOP("Author"), "gav@kde.org", "http://www.indigoarchive.net/gav/");
aboutData->addCredit("Malte Starostik", I18N_NOOP("Original LIRC interface code"), "malte.starostik@t-online.de");
aboutData->addCredit("Dirk Ziegelmeier", I18N_NOOP("Ideas, concept code"), "dirk@ziegelmeier.net");