diff options
Diffstat (limited to 'tdelirc')
27 files changed, 91 insertions, 96 deletions
diff --git a/tdelirc/README.profile-creation b/tdelirc/README.profile-creation index 80ec429..b977bd2 100644 --- a/tdelirc/README.profile-creation +++ b/tdelirc/README.profile-creation @@ -50,8 +50,8 @@ service name (found in the .desktop file) as attributes of them: </profile> b) Inside populate with name and author information. If your application is not a -KUniqueApplication, you **must** declare this with an "instances" tag, giving the -attribute "unique" a value of "0" (it defaults to "1", a KUniqueApplication). You +TDEUniqueApplication, you **must** declare this with an "instances" tag, giving the +attribute "unique" a value of "0" (it defaults to "1", a TDEUniqueApplication). You may optionally describe the default behavior TDELirc should take should there be more than one instance of the application, with the attribute "ifmulti" which may take one of "dontsend" (do nothing if >1 instance), "sendtoone" (send call to one diff --git a/tdelirc/irkick/irkick.cpp b/tdelirc/irkick/irkick.cpp index 2d042f0..6255430 100644 --- a/tdelirc/irkick/irkick.cpp +++ b/tdelirc/irkick/irkick.cpp @@ -20,7 +20,7 @@ #if !(TDE_VERSION_MINOR<=1 && TDE_VERSION_RELEASE<=5) #include <tdeactioncollection.h> #endif -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <ksystemtray.h> #include <kiconloader.h> #include <kpassivepopup.h> @@ -44,12 +44,12 @@ void IRKTrayIcon::mousePressEvent(TQMouseEvent *e) { - KSystemTray::mousePressEvent(new TQMouseEvent(TQEvent::MouseButtonPress, e->pos(), e->globalPos(), e->button() == Qt::LeftButton ? Qt::RightButton : e->button(), e->state())); + KSystemTray::mousePressEvent(new TQMouseEvent(TQEvent::MouseButtonPress, e->pos(), e->globalPos(), e->button() == TQt::LeftButton ? TQt::RightButton : e->button(), e->state())); } IRKick::IRKick(const TQCString &obj) : TQObject(), DCOPObject(obj), npApp(TQString()) { - kapp->dcopClient()->setDefaultObject(obj); + tdeApp->dcopClient()->setDefaultObject(obj); theClient = new KLircClient(); theTrayIcon = new IRKTrayIcon(); @@ -60,23 +60,23 @@ IRKick::IRKick(const TQCString &obj) : TQObject(), DCOPObject(obj), npApp(TQStri else { theTrayIcon->setPixmap(SmallIcon("irkickoff")); TQToolTip::add(theTrayIcon, i18n("TDE Lirc Server: No infra-red remote controls found.")); - TQTimer::singleShot(10000, this, TQT_SLOT(checkLirc())); + TQTimer::singleShot(10000, this, TQ_SLOT(checkLirc())); } theFlashOff = new TQTimer(theTrayIcon); - connect(theFlashOff, TQT_SIGNAL(timeout()), TQT_SLOT(flashOff())); + connect(theFlashOff, TQ_SIGNAL(timeout()), TQ_SLOT(flashOff())); theResetCount = 0; slotReloadConfiguration(); - connect(theClient, TQT_SIGNAL(connectionClosed()), this, TQT_SLOT(slotClosed())); - connect(theClient, TQT_SIGNAL(remotesRead()), this, TQT_SLOT(resetModes())); - connect(theClient, TQT_SIGNAL(commandReceived(const TQString &, const TQString &, int)), this, TQT_SLOT(gotMessage(const TQString &, const TQString &, int))); + connect(theClient, TQ_SIGNAL(connectionClosed()), this, TQ_SLOT(slotClosed())); + connect(theClient, TQ_SIGNAL(remotesRead()), this, TQ_SLOT(resetModes())); + connect(theClient, TQ_SIGNAL(commandReceived(const TQString &, const TQString &, int)), this, TQ_SLOT(gotMessage(const TQString &, const TQString &, int))); theTrayIcon->contextMenu()->changeTitle(0, "IRKick"); - theTrayIcon->contextMenu()->insertItem(SmallIcon( "configure" ), i18n("&Configure..."), this, TQT_SLOT(slotConfigure())); + theTrayIcon->contextMenu()->insertItem(SmallIcon( "configure" ), i18n("&Configure..."), this, TQ_SLOT(slotConfigure())); theTrayIcon->contextMenu()->insertSeparator(); 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())); + theTrayIcon->actionCollection()->action("file_quit")->disconnect(TQ_SIGNAL(activated())); + connect(theTrayIcon->actionCollection()->action("file_quit"), TQ_SIGNAL(activated()), TQ_SLOT(doQuit())); theTrayIcon->show(); } @@ -92,7 +92,7 @@ void IRKick::slotClosed() { theTrayIcon->setPixmap(SmallIcon("irkickoff")); KPassivePopup::message("IRKick", i18n("The infrared system has severed its connection. Remote controls are no longer available."), SmallIcon("irkick"), theTrayIcon); - TQTimer::singleShot(1000, this, TQT_SLOT(checkLirc())); + TQTimer::singleShot(1000, this, TQ_SLOT(checkLirc())); } void IRKick::checkLirc() @@ -103,7 +103,7 @@ void IRKick::checkLirc() theTrayIcon->setPixmap(SmallIcon("irkick")); } else - TQTimer::singleShot(10000, this, TQT_SLOT(checkLirc())); + TQTimer::singleShot(10000, this, TQ_SLOT(checkLirc())); } void IRKick::flashOff() @@ -113,14 +113,14 @@ void IRKick::flashOff() void IRKick::doQuit() { - KSimpleConfig theConfig("irkickrc"); + TDESimpleConfig theConfig("irkickrc"); theConfig.setGroup("General"); switch(KMessageBox::questionYesNoCancel(0, i18n("Should the Infrared Remote Control server start automatically when you begin TDE?"), i18n("Automatically Start?"), i18n("Start Automatically"), i18n("Do Not Start"))) { case KMessageBox::No: theConfig.writeEntry("AutoStart", false); break; case KMessageBox::Yes: theConfig.writeEntry("AutoStart", true); break; case KMessageBox::Cancel: return; } - TDEApplication::kApplication()->quit(); + tdeApp->quit(); } void IRKick::resetModes() @@ -143,7 +143,7 @@ void IRKick::resetModes() void IRKick::slotReloadConfiguration() { // load configuration from config file - KSimpleConfig theConfig("irkickrc"); + TDESimpleConfig theConfig("irkickrc"); allActions.loadFromConfig(theConfig); allModes.loadFromConfig(theConfig); if(currentModes.count() && theResetCount) diff --git a/tdelirc/irkick/irkick.h b/tdelirc/irkick/irkick.h index cecc26b..a3b7cc3 100644 --- a/tdelirc/irkick/irkick.h +++ b/tdelirc/irkick/irkick.h @@ -41,7 +41,7 @@ public: class IRKick: public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/tdelirc/irkick/main.cpp b/tdelirc/irkick/main.cpp index 5d5a791..be98cae 100644 --- a/tdelirc/irkick/main.cpp +++ b/tdelirc/irkick/main.cpp @@ -13,11 +13,11 @@ #include <tdeaboutdata.h> #include <tdeglobal.h> #include <kdebug.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include "irkick.h" -extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) +extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) { 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/"); @@ -27,8 +27,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) aboutData->addCredit("Antonio Larrosa Jiménez", I18N_NOOP("Ideas"), "larrosa@kde.org"); TDECmdLineArgs::init( argc, argv, aboutData ); - KUniqueApplication::addCmdLineOptions(); - KUniqueApplication app; + TDEUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication app; TDEGlobal::locale()->insertCatalogue( "tdelirc" ); app.disableSessionManagement(); IRKick *theIRKick = new IRKick("IRKick"); diff --git a/tdelirc/irkick/tdelircclient.cpp b/tdelirc/irkick/tdelircclient.cpp index ee00c88..c70d39a 100644 --- a/tdelirc/irkick/tdelircclient.cpp +++ b/tdelirc/irkick/tdelircclient.cpp @@ -72,8 +72,8 @@ bool KLircClient::connectToLirc() theSocket = new TQSocket; theSocket->setSocket(sock); - connect(theSocket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotRead())); - connect(theSocket, TQT_SIGNAL(connectionClosed()), TQT_SLOT(slotClosed())); + connect(theSocket, TQ_SIGNAL(readyRead()), TQ_SLOT(slotRead())); + connect(theSocket, TQ_SIGNAL(connectionClosed()), TQ_SLOT(slotClosed())); updateRemotes(); return true; } diff --git a/tdelirc/irkick/tdelircclient.h b/tdelirc/irkick/tdelircclient.h index 68c1906..a3da5df 100644 --- a/tdelirc/irkick/tdelircclient.h +++ b/tdelirc/irkick/tdelircclient.h @@ -28,7 +28,7 @@ class TQSocketNotifier; class KLircClient: public TQObject { - Q_OBJECT + TQ_OBJECT private: diff --git a/tdelirc/kcmlirc/addaction.cpp b/tdelirc/kcmlirc/addaction.cpp index 8a87775..0ebf472 100644 --- a/tdelirc/kcmlirc/addaction.cpp +++ b/tdelirc/kcmlirc/addaction.cpp @@ -34,8 +34,8 @@ AddAction::AddAction(TQWidget *parent, const char *name, const Mode &mode): AddActionBase(parent, name), theMode(mode) { - connect(this, TQT_SIGNAL( selected(const TQString &) ), TQT_SLOT( updateForPageChange() )); - connect(this, TQT_SIGNAL( selected(const TQString &) ), TQT_SLOT( slotCorrectPage() )); + connect(this, TQ_SIGNAL( selected(const TQString &) ), TQ_SLOT( updateForPageChange() )); + connect(this, TQ_SIGNAL( selected(const TQString &) ), TQ_SLOT( slotCorrectPage() )); curPage = 0; updateProfiles(); updateButtons(); @@ -143,7 +143,7 @@ void AddAction::updateButtonStates() const TQStringList AddAction::getFunctions(const TQString app, const TQString obj) { TQStringList ret; - DCOPClient *theClient = TDEApplication::kApplication()->dcopClient(); + DCOPClient *theClient = tdeApp->dcopClient(); QCStringList theApps = theClient->remoteFunctions(app.utf8(), obj.utf8()); for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i) if( *i != "QCStringList interfaces()" && @@ -274,7 +274,7 @@ void AddAction::updateParameter() { theValue->raiseWidget(1); theValueCheckBox->setChecked(theArguments[index].toBool()); } - else if(type.find(TQSTRINGLIST_OBJECT_NAME_STRING) != -1) + else if(type.find("TQStringList") != -1) { theValue->raiseWidget(4); TQStringList backup = theArguments[index].toStringList(); // backup needed because calling clear will kill what ever has been saved. @@ -313,7 +313,7 @@ void AddAction::slotParameterChanged() theArguments[index].asDouble() = theValueDoubleNumInput->value(); else if(type.find("bool") != -1) theArguments[index].asBool() = theValueCheckBox->isChecked(); - else if(type.find(TQSTRINGLIST_OBJECT_NAME_STRING) != -1) + else if(type.find("TQStringList") != -1) theArguments[index].asStringList() = theValueEditListBox->items(); else theArguments[index].asString() = theValueLineEdit->text(); @@ -335,7 +335,7 @@ void AddAction::updateObjects() uniqueProgramMap.clear(); nameProgramMap.clear(); - DCOPClient *theClient = TDEApplication::kApplication()->dcopClient(); + DCOPClient *theClient = tdeApp->dcopClient(); QCStringList theApps = theClient->registeredApplications(); for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i) { diff --git a/tdelirc/kcmlirc/addaction.h b/tdelirc/kcmlirc/addaction.h index 3a3f22f..135f89d 100644 --- a/tdelirc/kcmlirc/addaction.h +++ b/tdelirc/kcmlirc/addaction.h @@ -26,7 +26,7 @@ class TQListViewItem; class AddAction : public AddActionBase { - Q_OBJECT + TQ_OBJECT int curPage; diff --git a/tdelirc/kcmlirc/addactionbase.ui b/tdelirc/kcmlirc/addactionbase.ui index 9887a97..dc28b78 100644 --- a/tdelirc/kcmlirc/addactionbase.ui +++ b/tdelirc/kcmlirc/addactionbase.ui @@ -1574,7 +1574,7 @@ <slot>accept()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>updateFunctions()</slot> <slot>updateParameter()</slot> <slot>updateParameters()</slot> @@ -1587,7 +1587,7 @@ <slot>updateForPageChange()</slot> <slot>slotParameterChanged()</slot> <slot>updateOptions()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">keditlistbox.h</include> diff --git a/tdelirc/kcmlirc/editaction.cpp b/tdelirc/kcmlirc/editaction.cpp index 8d8a0cb..1b44eb7 100644 --- a/tdelirc/kcmlirc/editaction.cpp +++ b/tdelirc/kcmlirc/editaction.cpp @@ -315,7 +315,7 @@ void EditAction::updateDCOPApplications() TQStringList names; theDCOPApplications->clear(); - DCOPClient *theClient = TDEApplication::kApplication()->dcopClient(); + DCOPClient *theClient = tdeApp->dcopClient(); QCStringList theApps = theClient->registeredApplications(); for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i) { @@ -337,7 +337,7 @@ void EditAction::updateDCOPApplications() void EditAction::updateDCOPObjects() { theDCOPObjects->clear(); - DCOPClient *theClient = TDEApplication::kApplication()->dcopClient(); + DCOPClient *theClient = tdeApp->dcopClient(); if(theDCOPApplications->currentText().isNull() || theDCOPApplications->currentText().isEmpty()) return; QCStringList theObjects = theClient->remoteObjects(nameProgramMap[theDCOPApplications->currentText()].utf8()); if(!theObjects.size() && theDCOPApplications->currentText() == (*theAction).program()) theDCOPObjects->insertItem((*theAction).object()); diff --git a/tdelirc/kcmlirc/editaction.h b/tdelirc/kcmlirc/editaction.h index 8b19b6a..20b7da1 100644 --- a/tdelirc/kcmlirc/editaction.h +++ b/tdelirc/kcmlirc/editaction.h @@ -25,7 +25,7 @@ class EditAction : public EditActionBase { - Q_OBJECT + TQ_OBJECT IRAIt theAction; TQMap<TQString, TQString> applicationMap, functionMap; diff --git a/tdelirc/kcmlirc/editactionbase.ui b/tdelirc/kcmlirc/editactionbase.ui index e7dd0f7..d82d68b 100644 --- a/tdelirc/kcmlirc/editactionbase.ui +++ b/tdelirc/kcmlirc/editactionbase.ui @@ -1263,7 +1263,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>updateFunctions()</slot> <slot>updateApplications()</slot> <slot>updateDCOPApplications()</slot> @@ -1273,7 +1273,7 @@ <slot>updateArgument(int)</slot> <slot>slotParameterChanged()</slot> <slot>updateOptions()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">keditlistbox.h</include> diff --git a/tdelirc/kcmlirc/editmode.h b/tdelirc/kcmlirc/editmode.h index 5de0836..669e991 100644 --- a/tdelirc/kcmlirc/editmode.h +++ b/tdelirc/kcmlirc/editmode.h @@ -20,7 +20,7 @@ */ class EditMode : public EditModeBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdelirc/kcmlirc/editmodebase.ui b/tdelirc/kcmlirc/editmodebase.ui index e6c36f3..649d886 100644 --- a/tdelirc/kcmlirc/editmodebase.ui +++ b/tdelirc/kcmlirc/editmodebase.ui @@ -289,10 +289,10 @@ <slot>slotClearIcon()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotCheckText(const TQString &)</slot> <slot>slotClearIcon()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kicondialog.h</include> diff --git a/tdelirc/kcmlirc/kcmlirc.cpp b/tdelirc/kcmlirc/kcmlirc.cpp index e1f35e3..c0f4212 100644 --- a/tdelirc/kcmlirc/kcmlirc.cpp +++ b/tdelirc/kcmlirc/kcmlirc.cpp @@ -26,7 +26,7 @@ #include <kicondialog.h> #include <kiconloader.h> #include <kdebug.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kgenericfactory.h> #include <tdelistview.h> #include <tdemessagebox.h> @@ -57,37 +57,37 @@ KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DC setButtons(TDECModule::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; - TDEApplication::kApplication()->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok); + tdeApp->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok); if(!ok) if(KMessageBox::questionYesNo(this, i18n("The Infrared Remote Control software is not currently running. This configuration module will not work properly without it. Would you like to start it now?"), i18n("Software Not Running"), i18n("Start"), i18n("Do Not Start")) == KMessageBox::Yes) { kdDebug() << "S" << TDEApplication::startServiceByDesktopName("irkick") << endl; - KSimpleConfig theConfig("irkickrc"); + TDESimpleConfig theConfig("irkickrc"); theConfig.setGroup("General"); if(theConfig.readBoolEntry("AutoStart", true) == false) if(KMessageBox::questionYesNo(this, i18n("Would you like the infrared remote control software to start automatically when you begin TDE?"), i18n("Automatically Start?"), i18n("Start Automatically"), i18n("Do Not Start")) == KMessageBox::Yes) theConfig.writeEntry("AutoStart", true); } - TDEApplication::kApplication()->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok); + tdeApp->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok); kdDebug() << "OK" << ok << endl; (new TQHBoxLayout(this))->setAutoAdd(true); theKCMLircBase = new KCMLircBase(this); - connect(theKCMLircBase->theModes, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateActions() )); - connect(theKCMLircBase->theModes, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateModesStatus(TQListViewItem *) )); - connect(theKCMLircBase->theActions, TQT_SIGNAL( currentChanged(TQListViewItem *) ), this, TQT_SLOT( updateActionsStatus(TQListViewItem *) )); - connect(theKCMLircBase->theExtensions, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateInformation() )); - connect(theKCMLircBase->theModes, TQT_SIGNAL( itemRenamed(TQListViewItem *) ), this, TQT_SLOT( slotRenamed(TQListViewItem *) )); - connect(theKCMLircBase->theModes, TQT_SIGNAL(dropped(TDEListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(slotDrop(TDEListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*))); - connect((TQObject *)(theKCMLircBase->theAddActions), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddActions() )); - connect((TQObject *)(theKCMLircBase->theAddAction), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddAction() )); - connect((TQObject *)(theKCMLircBase->theEditAction), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditAction() )); - connect((TQObject *)(theKCMLircBase->theActions), TQT_SIGNAL( doubleClicked(TQListViewItem *) ), this, TQT_SLOT( slotEditAction() )); - connect((TQObject *)(theKCMLircBase->theRemoveAction), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveAction() )); - connect((TQObject *)(theKCMLircBase->theAddMode), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddMode() )); - connect((TQObject *)(theKCMLircBase->theEditMode), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditMode() )); - connect((TQObject *)(theKCMLircBase->theRemoveMode), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveMode() )); + connect(theKCMLircBase->theModes, TQ_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQ_SLOT( updateActions() )); + connect(theKCMLircBase->theModes, TQ_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQ_SLOT( updateModesStatus(TQListViewItem *) )); + connect(theKCMLircBase->theActions, TQ_SIGNAL( currentChanged(TQListViewItem *) ), this, TQ_SLOT( updateActionsStatus(TQListViewItem *) )); + connect(theKCMLircBase->theExtensions, TQ_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQ_SLOT( updateInformation() )); + connect(theKCMLircBase->theModes, TQ_SIGNAL( itemRenamed(TQListViewItem *) ), this, TQ_SLOT( slotRenamed(TQListViewItem *) )); + connect(theKCMLircBase->theModes, TQ_SIGNAL(dropped(TDEListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQ_SLOT(slotDrop(TDEListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*))); + connect((TQObject *)(theKCMLircBase->theAddActions), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddActions() )); + connect((TQObject *)(theKCMLircBase->theAddAction), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddAction() )); + connect((TQObject *)(theKCMLircBase->theEditAction), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditAction() )); + connect((TQObject *)(theKCMLircBase->theActions), TQ_SIGNAL( doubleClicked(TQListViewItem *) ), this, TQ_SLOT( slotEditAction() )); + connect((TQObject *)(theKCMLircBase->theRemoveAction), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveAction() )); + connect((TQObject *)(theKCMLircBase->theAddMode), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddMode() )); + connect((TQObject *)(theKCMLircBase->theEditMode), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditMode() )); + connect((TQObject *)(theKCMLircBase->theRemoveMode), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveMode() )); load(); } @@ -163,7 +163,7 @@ void KCMLirc::slotAddAction() Mode m = modeMap[theKCMLircBase->theModes->selectedItem()]; AddAction theDialog(this, 0, m); - connect(this, TQT_SIGNAL(haveButton(const TQString &, const TQString &)), &theDialog, TQT_SLOT(updateButton(const TQString &, const TQString &))); + connect(this, TQ_SIGNAL(haveButton(const TQString &, const TQString &)), &theDialog, TQ_SLOT(updateButton(const TQString &, const TQString &))); // populate the modes list box TQListViewItem *item = theKCMLircBase->theModes->selectedItem(); @@ -498,7 +498,7 @@ void KCMLirc::updateInformation() void KCMLirc::load() { - KSimpleConfig theConfig("irkickrc"); + TDESimpleConfig theConfig("irkickrc"); allActions.loadFromConfig(theConfig); allModes.loadFromConfig(theConfig); allModes.generateNulls(IRKick_stub("irkick", "IRKick").remotes()); @@ -516,7 +516,7 @@ void KCMLirc::defaults() void KCMLirc::save() { - KSimpleConfig theConfig("irkickrc"); + TDESimpleConfig theConfig("irkickrc"); allActions.saveToConfig(theConfig); allModes.saveToConfig(theConfig); @@ -530,9 +530,9 @@ TQString KCMLirc::handbookDocPath() const { int index = theKCMLircBase->tabWidget2->currentPageIndex(); if (index == 0) - return "kcmlirc/usage.html"; + return "kcontrol/kcmlirc/usage.html"; else if (index == 1) - return "kcmlirc/extensions.html"; + return "kcontrol/kcmlirc/extensions.html"; else return TQString::null; } @@ -546,7 +546,7 @@ void KCMLirc::configChanged() // TODO: Take this out when I know how extern "C" { - KDE_EXPORT TDECModule *create_kcmlirc(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_kcmlirc(TQWidget *parent, const char *) { TDEGlobal::locale()->insertCatalogue("kcmlirc"); return new KCMLirc(parent, "KCMLirc"); } diff --git a/tdelirc/kcmlirc/kcmlirc.desktop b/tdelirc/kcmlirc/kcmlirc.desktop index cc5240d..90d2697 100644 --- a/tdelirc/kcmlirc/kcmlirc.desktop +++ b/tdelirc/kcmlirc/kcmlirc.desktop @@ -11,6 +11,6 @@ Terminal=false Type=Application X-TDE-FactoryName=kcmlirc X-TDE-Library=kcmlirc -X-TDE-ModuleType=Library -X-DocPath=kcmlirc/index.html +X-TDE-ParentApp=kcontrol +X-DocPath=kcontrol/kcmlirc/index.html Categories=Qt;TDE;X-TDE-settings-peripherals; diff --git a/tdelirc/kcmlirc/kcmlirc.h b/tdelirc/kcmlirc/kcmlirc.h index c187642..e062534 100644 --- a/tdelirc/kcmlirc/kcmlirc.h +++ b/tdelirc/kcmlirc/kcmlirc.h @@ -30,7 +30,7 @@ class Remote; class KCMLirc: public TDECModule, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/tdelirc/kcmlirc/kcmlircbase.ui b/tdelirc/kcmlirc/kcmlircbase.ui index 3bf02c8..a6e4b4c 100644 --- a/tdelirc/kcmlirc/kcmlircbase.ui +++ b/tdelirc/kcmlirc/kcmlircbase.ui @@ -341,9 +341,6 @@ <property name="text"> <string>Auto-Populate...</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="KPushButton" row="1" column="0"> <property name="name"> @@ -485,14 +482,12 @@ </grid> </widget> <includes> - <include location="local" impldecl="in implementation">kcmlircbase.ui.h</include> <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="local" impldecl="in implementation">kcmlircbase.ui.h</include> </includes> <functions> <function access="private" specifier="non virtual">init()</function> </functions> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> </UI> diff --git a/tdelirc/kcmlirc/kcmlircbase.ui.h b/tdelirc/kcmlirc/kcmlircbase.ui.h index dcf2ec3..f7dc483 100644 --- a/tdelirc/kcmlirc/kcmlircbase.ui.h +++ b/tdelirc/kcmlirc/kcmlircbase.ui.h @@ -23,7 +23,7 @@ void KCMLircBase::init() { delete theModes; modeLayout->removeItem(modeButtonLayout); - theModes = new ModesList(TQT_TQWIDGET(modeLayout->parent()), "theModes"); + theModes = new ModesList(static_cast<TQWidget*>(modeLayout->parent()), "theModes"); theModes->addColumn(i18n("Remote Control")); theModes->addColumn(i18n("Default")); theModes->addColumn(i18n("Icon")); diff --git a/tdelirc/kcmlirc/modeslist.h b/tdelirc/kcmlirc/modeslist.h index d6a4b25..e60ba00 100644 --- a/tdelirc/kcmlirc/modeslist.h +++ b/tdelirc/kcmlirc/modeslist.h @@ -24,7 +24,7 @@ class ModesList : public TDEListView { - Q_OBJECT + TQ_OBJECT public: virtual bool acceptDrag(TQDropEvent *) const; diff --git a/tdelirc/kcmlirc/newmode.ui b/tdelirc/kcmlirc/newmode.ui index 2365dce..483a69b 100644 --- a/tdelirc/kcmlirc/newmode.ui +++ b/tdelirc/kcmlirc/newmode.ui @@ -148,8 +148,8 @@ <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">tdelistview.h</include> </includes> -<Q_SLOTS> +<slots> <slot>slotTextChanged( const TQString & newText )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/tdelirc/profiles/konqueror.profile.xml b/tdelirc/profiles/konqueror.profile.xml index 0fdfdba..464ed52 100644 --- a/tdelirc/profiles/konqueror.profile.xml +++ b/tdelirc/profiles/konqueror.profile.xml @@ -5,10 +5,10 @@ <name>Konqueror</name> <author>Gav Wood</author> <instances uniqueapp="0" ifmulti="sendtotop"/> - <action objid="KonquerorIface" prototype="void createNewWindow(QString)" repeat="0" autostart="0"> + <action objid="KonquerorIface" prototype="void createNewWindow(TQString)" repeat="0" autostart="0"> <name>Create New Window</name> <comment>Creates a new window and loads an arbitrary URL.</comment> - <argument type=TQSTRING_OBJECT_NAME_STRING><comment>The URL to load in the window initially.</comment></argument> + <argument type="TQString"><comment>The URL to load in the window initially.</comment></argument> </action> <action objid="MainApplication-Interface" prototype="void quit()" repeat="0" autostart="0"> <name>Quit</name> diff --git a/tdelirc/profiles/profile.dtd b/tdelirc/profiles/profile.dtd index 070fd14..96c60da 100644 --- a/tdelirc/profiles/profile.dtd +++ b/tdelirc/profiles/profile.dtd @@ -14,7 +14,7 @@ <!ATTLIST profile servicename CDATA #REQUIRED> <!ATTLIST action objid CDATA #REQUIRED> <!ATTLIST action prototype CDATA #REQUIRED> -<!ATTLIST argument type (int|QString|QCString|QStringList|bool|double) #REQUIRED> +<!ATTLIST argument type (int|TQString|QCString|QStringList|bool|double) #REQUIRED> <!ATTLIST range min CDATA #REQUIRED> <!ATTLIST range max CDATA #REQUIRED> <!ATTLIST action class (captions|teletext|fullscreen|scan|finetuneup|finetunedown|recall|enter|number|play|stop|pause|record|previous|next|rewind|forward|eject|mute|volumedown|volumeup|channeldown|channelup|red|yellow|green|blue|on|off) #IMPLIED> diff --git a/tdelirc/profiles/tdelauncher.profile.xml b/tdelirc/profiles/tdelauncher.profile.xml index 57eca31..be55dbd 100644 --- a/tdelirc/profiles/tdelauncher.profile.xml +++ b/tdelirc/profiles/tdelauncher.profile.xml @@ -3,16 +3,16 @@ <profile id="tdelauncher"> <name>TDE Program Launcher</name> <author>Gav Wood</author> - <action objid="default" prototype="void tdeinit_exec(QString, QStringList)" repeat="0" autostart="0"> + <action objid="default" prototype="void tdeinit_exec(TQString, QStringList)" repeat="0" autostart="0"> <name>Execute</name> <comment>Runs a program or script</comment> - <argument type=TQSTRING_OBJECT_NAME_STRING><comment>The executable name and path of the program or script to run</comment></argument> - <argument type=TQSTRINGLIST_OBJECT_NAME_STRING><comment>Parameters for the program or script</comment></argument> + <argument type="TQString"><comment>The executable name and path of the program or script to run</comment></argument> + <argument type="TQStringList"><comment>Parameters for the program or script</comment></argument> </action> - <action objid="default" prototype="void tdeinit_exec_wait(QString, QStringList)" repeat="0" autostart="0"> + <action objid="default" prototype="void tdeinit_exec_wait(TQString, QStringList)" repeat="0" autostart="0"> <name>Execute and Wait</name> <comment>Runs a program or script and waits for it to finish</comment> - <argument type=TQSTRING_OBJECT_NAME_STRING><comment>The executable name and path of the program or script to run</comment></argument> - <argument type=TQSTRINGLIST_OBJECT_NAME_STRING><comment>Parameters for the program or script</comment></argument> + <argument type="TQString"><comment>The executable name and path of the program or script to run</comment></argument> + <argument type="TQStringList"><comment>Parameters for the program or script</comment></argument> </action> </profile> diff --git a/tdelirc/tdelirc/profileserver.cpp b/tdelirc/tdelirc/profileserver.cpp index ba39442..8840693 100644 --- a/tdelirc/tdelirc/profileserver.cpp +++ b/tdelirc/tdelirc/profileserver.cpp @@ -15,7 +15,7 @@ #include <tqxml.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include "profileserver.h" @@ -66,7 +66,7 @@ void Profile::loadFromFile(const TQString &fileName) curPAA = 0; TQFile xmlFile(fileName); - TQXmlInputSource source(TQT_TQIODEVICE(&xmlFile)); + TQXmlInputSource source(&xmlFile); TQXmlSimpleReader reader; reader.setContentHandler(this); reader.parse(source); @@ -124,7 +124,7 @@ bool Profile::startElement(const TQString &, const TQString &, const TQString &n curPAA->setType(attributes.value("type")); } else if(name == "range" && curPAA) - curPAA->setRange(tqMakePair(attributes.value("min").toInt(), attributes.value("max").toInt())); + curPAA->setRange(qMakePair(attributes.value("min").toInt(), attributes.value("max").toInt())); charBuffer = ""; return true; diff --git a/tdelirc/tdelirc/prototype.h b/tdelirc/tdelirc/prototype.h index fa101b7..3c86025 100644 --- a/tdelirc/tdelirc/prototype.h +++ b/tdelirc/tdelirc/prototype.h @@ -30,7 +30,7 @@ class Prototype public: unsigned count() const{ return theTypes.count(); } - const TQPair<TQString, TQString> operator[](int i) const { return tqMakePair(theTypes[i], theNames[i]); } + const TQPair<TQString, TQString> operator[](int i) const { return qMakePair(theTypes[i], theNames[i]); } const TQString &name(int i) const { return theNames[i]; } const TQString &type(int i) const { return theTypes[i]; } const TQString &returnType() const { return theReturn; } diff --git a/tdelirc/tdelirc/remoteserver.cpp b/tdelirc/tdelirc/remoteserver.cpp index dafa67d..13f095c 100644 --- a/tdelirc/tdelirc/remoteserver.cpp +++ b/tdelirc/tdelirc/remoteserver.cpp @@ -15,7 +15,7 @@ #include <tqxml.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include "remoteserver.h" @@ -58,7 +58,7 @@ void Remote::loadFromFile(const TQString &fileName) curRB = 0; TQFile xmlFile(fileName); - TQXmlInputSource source(TQT_TQIODEVICE(&xmlFile)); + TQXmlInputSource source(&xmlFile); TQXmlSimpleReader reader; reader.setContentHandler(this); reader.parse(source); |