diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:23:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:23:08 -0600 |
| commit | 8856e75c203aa69be210b2fee1095ab9761aca7e (patch) | |
| tree | d59810016bc093e8dd7f2f886f07c45fa25447a5 /kdelirc | |
| parent | ed70cd1b539ac2e02319b55183a5be7a28f2d116 (diff) | |
| download | tdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.tar.gz tdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kdelirc')
| -rw-r--r-- | kdelirc/irkick/irkick.h | 2 | ||||
| -rw-r--r-- | kdelirc/irkick/main.cpp | 2 | ||||
| -rw-r--r-- | kdelirc/kcmlirc/kcmlirc.cpp | 2 |
3 files changed, 3 insertions, 3 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"); diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp index ccd9d2f..a7dcbae 100644 --- a/kdelirc/kcmlirc/kcmlirc.cpp +++ b/kdelirc/kcmlirc/kcmlirc.cpp @@ -52,7 +52,7 @@ K_EXPORT_COMPONENT_FACTORY(kcmlirc, theFactory("kcmlirc")) KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DCOPObject("KCMLirc"), KCModule(parent, name) { KGlobal::locale()->insertCatalogue( "kcmlirc" ); - setAboutData(new KAboutData("kcmlirc", I18N_NOOP("TDE Lirc"), VERSION, I18N_NOOP("The TDE IR Remote Control System"), KAboutData::License_GPL_V2, "Copyright (c)2003 Gav Wood", I18N_NOOP("Use this to configure TDE's infrared remote control system in order to control any TDE application with your infrared remote control."), "http://www.kde.org")); + setAboutData(new TDEAboutData("kcmlirc", I18N_NOOP("TDE Lirc"), VERSION, I18N_NOOP("The TDE IR Remote Control System"), TDEAboutData::License_GPL_V2, "Copyright (c)2003 Gav Wood", I18N_NOOP("Use this to configure TDE's infrared remote control system in order to control any TDE application with your infrared remote control."), "http://www.kde.org")); setButtons(KCModule::Help); setQuickHelp(i18n("<h1>Remote Controls</h1><p>This module allows you to configure bindings between your remote controls and TDE applications. Simply select your remote control and click Add under the Actions/Buttons list. If you want TDE to attempt to automatically assign buttons to a supported application's actions, try clicking the Auto-Populate button.</p><p>To view the recognised applications and remote controls, simply select the <em>Loaded Extensions</em> tab.</p>")); bool ok; |