summaryrefslogtreecommitdiffstats
path: root/tdelirc/kcmlirc
diff options
context:
space:
mode:
Diffstat (limited to 'tdelirc/kcmlirc')
-rw-r--r--tdelirc/kcmlirc/addaction.cpp8
-rw-r--r--tdelirc/kcmlirc/addactionbase.ui4
-rw-r--r--tdelirc/kcmlirc/editaction.cpp4
-rw-r--r--tdelirc/kcmlirc/editactionbase.ui4
-rw-r--r--tdelirc/kcmlirc/editmodebase.ui4
-rw-r--r--tdelirc/kcmlirc/kcmlirc.cpp44
-rw-r--r--tdelirc/kcmlirc/kcmlircbase.ui.h2
-rw-r--r--tdelirc/kcmlirc/newmode.ui4
8 files changed, 37 insertions, 37 deletions
diff --git a/tdelirc/kcmlirc/addaction.cpp b/tdelirc/kcmlirc/addaction.cpp
index b43879b..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()" &&
@@ -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/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/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/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 &amp;)</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 512d10d..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);
@@ -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/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/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 &amp; newText )</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
generated by cgit v1.2.3 (git 2.46.0) at 2025-11-01 19:51:17 +0000