diff options
Diffstat (limited to 'kdelirc')
| -rw-r--r-- | kdelirc/irkick/irkick.cpp | 2 | ||||
| -rw-r--r-- | kdelirc/irkick/main.cpp | 2 | ||||
| -rw-r--r-- | kdelirc/kcmlirc/kcmlirc.cpp | 4 | ||||
| -rw-r--r-- | kdelirc/kdelirc/profileserver.cpp | 2 | ||||
| -rw-r--r-- | kdelirc/kdelirc/remoteserver.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/kdelirc/irkick/irkick.cpp b/kdelirc/irkick/irkick.cpp index ddc2205..b90c74b 100644 --- a/kdelirc/irkick/irkick.cpp +++ b/kdelirc/irkick/irkick.cpp @@ -74,7 +74,7 @@ IRKick::IRKick(const TQCString &obj) : TQObject(), DCOPObject(obj), npApp(TQStri theTrayIcon->contextMenu()->changeTitle(0, "IRKick"); theTrayIcon->contextMenu()->insertItem(SmallIcon( "configure" ), i18n("&Configure..."), this, TQT_SLOT(slotConfigure())); theTrayIcon->contextMenu()->insertSeparator(); - theTrayIcon->contextMenu()->insertItem(SmallIcon( "help" ), KStdGuiItem::help().text(), (new KHelpMenu(theTrayIcon, KGlobal::instance()->aboutData()))->menu()); + theTrayIcon->contextMenu()->insertItem(SmallIcon( "help" ), KStdGuiItem::help().text(), (new KHelpMenu(theTrayIcon, TDEGlobal::instance()->aboutData()))->menu()); theTrayIcon->actionCollection()->action("file_quit")->disconnect(TQT_SIGNAL(activated())); connect(theTrayIcon->actionCollection()->action("file_quit"), TQT_SIGNAL(activated()), TQT_SLOT(doQuit())); diff --git a/kdelirc/irkick/main.cpp b/kdelirc/irkick/main.cpp index 43715e9..95ba384 100644 --- a/kdelirc/irkick/main.cpp +++ b/kdelirc/irkick/main.cpp @@ -29,7 +29,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) TDECmdLineArgs::init( argc, argv, aboutData ); KUniqueApplication::addCmdLineOptions(); KUniqueApplication app; - KGlobal::locale()->insertCatalogue( "kdelirc" ); + TDEGlobal::locale()->insertCatalogue( "kdelirc" ); app.disableSessionManagement(); IRKick *theIRKick = new IRKick("IRKick"); diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp index a7dcbae..9df9c6e 100644 --- a/kdelirc/kcmlirc/kcmlirc.cpp +++ b/kdelirc/kcmlirc/kcmlirc.cpp @@ -51,7 +51,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" ); + TDEGlobal::locale()->insertCatalogue( "kcmlirc" ); 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>")); @@ -535,7 +535,7 @@ void KCMLirc::configChanged() extern "C" { KDE_EXPORT KCModule *create_kcmlirc(TQWidget *parent, const char *) - { KGlobal::locale()->insertCatalogue("kcmlirc"); + { TDEGlobal::locale()->insertCatalogue("kcmlirc"); return new KCMLirc(parent, "KCMLirc"); } } diff --git a/kdelirc/kdelirc/profileserver.cpp b/kdelirc/kdelirc/profileserver.cpp index d95c5d5..880b50f 100644 --- a/kdelirc/kdelirc/profileserver.cpp +++ b/kdelirc/kdelirc/profileserver.cpp @@ -34,7 +34,7 @@ ProfileServer::~ProfileServer() void ProfileServer::loadProfiles() { - TQStringList theFiles = KGlobal::dirs()->findAllResources("data", "profiles/*.profile.xml"); + TQStringList theFiles = TDEGlobal::dirs()->findAllResources("data", "profiles/*.profile.xml"); for(TQStringList::iterator i = theFiles.begin(); i != theFiles.end(); ++i) { kdDebug() << "Found data file: " << *i << endl; Profile *p = new Profile(); diff --git a/kdelirc/kdelirc/remoteserver.cpp b/kdelirc/kdelirc/remoteserver.cpp index 04fb290..706bb0d 100644 --- a/kdelirc/kdelirc/remoteserver.cpp +++ b/kdelirc/kdelirc/remoteserver.cpp @@ -34,7 +34,7 @@ RemoteServer::~RemoteServer() void RemoteServer::loadRemotes() { - TQStringList theFiles = KGlobal::dirs()->findAllResources("data", "remotes/*.remote.xml"); + TQStringList theFiles = TDEGlobal::dirs()->findAllResources("data", "remotes/*.remote.xml"); for(TQStringList::iterator i = theFiles.begin(); i != theFiles.end(); ++i) { kdDebug() << "Found data file: " << *i << endl; Remote *p = new Remote(); |