summaryrefslogtreecommitdiffstats
path: root/kdelirc
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-23 01:42:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-23 01:42:07 +0000
commita2277b6bc715464e83882b90c2a058139b8a6b54 (patch)
treeab09b14014f59b4d8e2ddd12226aa0b22e4dfc5d /kdelirc
parentd3f79e04b34bd1f70a458b81b28fc8799498c8dc (diff)
downloadtdeutils-a2277b6bc715464e83882b90c2a058139b8a6b54.tar.gz
tdeutils-a2277b6bc715464e83882b90c2a058139b8a6b54.zip
TQt4 port kdeutils
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1238125 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdelirc')
-rw-r--r--kdelirc/irkick/irkick.cpp16
-rw-r--r--kdelirc/irkick/irkick.h3
-rw-r--r--kdelirc/irkick/klircclient.cpp8
-rw-r--r--kdelirc/irkick/klircclient.h5
-rw-r--r--kdelirc/kcmlirc/addaction.cpp38
-rw-r--r--kdelirc/kcmlirc/addaction.h3
-rw-r--r--kdelirc/kcmlirc/addactionbase.ui164
-rw-r--r--kdelirc/kcmlirc/editaction.cpp8
-rw-r--r--kdelirc/kcmlirc/editaction.h3
-rw-r--r--kdelirc/kcmlirc/editactionbase.ui140
-rw-r--r--kdelirc/kcmlirc/editmode.cpp2
-rw-r--r--kdelirc/kcmlirc/editmode.h3
-rw-r--r--kdelirc/kcmlirc/editmodebase.ui40
-rw-r--r--kdelirc/kcmlirc/kcmlirc.cpp59
-rw-r--r--kdelirc/kcmlirc/kcmlirc.h14
-rw-r--r--kdelirc/kcmlirc/kcmlircbase.ui50
-rw-r--r--kdelirc/kcmlirc/kcmlircbase.ui.h6
-rw-r--r--kdelirc/kcmlirc/modeslist.cpp2
-rw-r--r--kdelirc/kcmlirc/modeslist.h3
-rw-r--r--kdelirc/kcmlirc/newmode.ui28
-rw-r--r--kdelirc/kcmlirc/newmode.ui.h2
-rw-r--r--kdelirc/kcmlirc/selectprofile.ui10
-rw-r--r--kdelirc/kdelirc/iraction.cpp2
-rw-r--r--kdelirc/kdelirc/iraction.h2
-rw-r--r--kdelirc/kdelirc/mode.cpp4
-rw-r--r--kdelirc/kdelirc/mode.h2
-rw-r--r--kdelirc/kdelirc/modes.cpp8
-rw-r--r--kdelirc/kdelirc/profileserver.cpp6
-rw-r--r--kdelirc/kdelirc/profileserver.h20
-rw-r--r--kdelirc/kdelirc/prototype.h2
-rw-r--r--kdelirc/kdelirc/remoteserver.cpp2
-rw-r--r--kdelirc/kdelirc/remoteserver.h2
-rw-r--r--kdelirc/profiles/klauncher.profile.xml8
-rw-r--r--kdelirc/profiles/konqueror.profile.xml2
34 files changed, 338 insertions, 329 deletions
diff --git a/kdelirc/irkick/irkick.cpp b/kdelirc/irkick/irkick.cpp
index fdcfa3a..036974c 100644
--- a/kdelirc/irkick/irkick.cpp
+++ b/kdelirc/irkick/irkick.cpp
@@ -44,10 +44,10 @@
void IRKTrayIcon::mousePressEvent(TQMouseEvent *e)
{
- KSystemTray::mousePressEvent(new TQMouseEvent(TQEvent::MouseButtonPress, e->pos(), e->globalPos(), e->button() == LeftButton ? RightButton : e->button(), e->state()));
+ KSystemTray::mousePressEvent(new TQMouseEvent(TQEvent::MouseButtonPress, e->pos(), e->globalPos(), e->button() == Qt::LeftButton ? Qt::RightButton : e->button(), e->state()));
}
-IRKick::IRKick(const TQCString &obj) : TQObject(), DCOPObject(obj), npApp(TQString::null)
+IRKick::IRKick(const TQCString &obj) : TQObject(), DCOPObject(obj), npApp(TQString())
{
kapp->dcopClient()->setDefaultObject(obj);
theClient = new KLircClient();
@@ -195,7 +195,7 @@ bool IRKick::getPrograms(const IRAction &action, TQStringList &programs)
for(QCStringList::iterator i = buf.begin(); i != buf.end(); ++i)
{
TQString program = TQString::fromUtf8(*i);
- if(program.contains(r))
+ if(program.tqcontains(r))
programs += program;
}
if(programs.size() > 1 && action.ifMulti() == IM_DONTSEND)
@@ -206,7 +206,7 @@ bool IRKick::getPrograms(const IRAction &action, TQStringList &programs)
for(TQValueList<WId>::iterator i = s.fromLast(); i != s.end(); i--)
{ int p = KWin::info(*i).pid;
TQString id = action.program() + "-" + TQString().setNum(p);
- if(programs.contains(id))
+ if(programs.tqcontains(id))
{ programs.clear();
programs += id;
break;
@@ -220,7 +220,7 @@ bool IRKick::getPrograms(const IRAction &action, TQStringList &programs)
for(TQValueList<WId>::iterator i = s.begin(); i != s.end(); ++i)
{ int p = KWin::info(*i).pid;
TQString id = action.program() + "-" + TQString().setNum(p);
- if(programs.contains(id))
+ if(programs.tqcontains(id))
{ programs.clear();
programs += id;
break;
@@ -244,7 +244,7 @@ void IRKick::executeAction(const IRAction &action)
{ TQString sname = ProfileServer::profileServer()->getServiceName(action.program());
if(!sname.isNull())
{
- KPassivePopup::message("IRKick", i18n("Starting <b>%1</b>...").arg(action.application()), SmallIcon("irkick"), theTrayIcon);
+ KPassivePopup::message("IRKick", i18n("Starting <b>%1</b>...").tqarg(action.application()), SmallIcon("irkick"), theTrayIcon);
KApplication::startServiceByDesktopName(sname);
}
}
@@ -282,7 +282,7 @@ void IRKick::gotMessage(const TQString &theRemote, const TQString &theButton, in
if(!npApp.isNull())
{
TQString theApp = npApp;
- npApp = TQString::null;
+ npApp = TQString();
// send notifier by DCOP to npApp/npModule/npMethod(theRemote, theButton);
TQByteArray data; TQDataStream arg(data, IO_WriteOnly);
arg << theRemote << theButton;
@@ -330,7 +330,7 @@ void IRKick::stealNextPress(TQString app, TQString module, TQString method)
void IRKick::dontStealNextPress()
{
- npApp = TQString::null;
+ npApp = TQString();
}
#include "irkick.moc"
diff --git a/kdelirc/irkick/irkick.h b/kdelirc/irkick/irkick.h
index 92c2d9c..d55dcee 100644
--- a/kdelirc/irkick/irkick.h
+++ b/kdelirc/irkick/irkick.h
@@ -36,12 +36,13 @@ public:
KPopupMenu* contextMenu() const { return KSystemTray::contextMenu(); }
KActionCollection* actionCollection() { return KSystemTray::actionCollection(); }
- IRKTrayIcon(TQWidget *parent = 0, const char *name = 0): KSystemTray(parent, name) {}
+ IRKTrayIcon(TQWidget *tqparent = 0, const char *name = 0): KSystemTray(tqparent, name) {}
};
class IRKick: public TQObject, public DCOPObject
{
Q_OBJECT
+// TQ_OBJECT
K_DCOP
TQString npApp, npModule, npMethod;
diff --git a/kdelirc/irkick/klircclient.cpp b/kdelirc/irkick/klircclient.cpp
index 3ce33d6..544eb2a 100644
--- a/kdelirc/irkick/klircclient.cpp
+++ b/kdelirc/irkick/klircclient.cpp
@@ -43,7 +43,7 @@
#include "klircclient.h"
-KLircClient::KLircClient(TQWidget *parent, const char *name) : TQObject(parent, name), theSocket(0), listIsUpToDate(false)
+KLircClient::KLircClient(TQWidget *tqparent, const char *name) : TQObject(tqparent, name), theSocket(0), listIsUpToDate(false)
{
connectToLirc();
}
@@ -177,14 +177,14 @@ void KLircClient::slotRead()
{
// <code> <repeat> <button name> <remote control name>
line.remove(0, 17); // strip code
- int pos = line.find(' ');
+ int pos = line.tqfind(' ');
if (pos < 0) return;
bool ok;
int repeat = line.left(pos).toInt(&ok, 16);
if (!ok) return;
line.remove(0, pos + 1);
- pos = line.find(' ');
+ pos = line.tqfind(' ');
if (pos < 0) return;
TQString btn = line.left(pos);
if(btn.startsWith("'") && btn.endsWith("'"))
@@ -223,7 +223,7 @@ const TQString KLircClient::readLine()
theSocket->waitForMore(500, &timeout);
if (timeout)
{ // something's wrong. there ain't no line comin!
- return TQString::null;
+ return TQString();
}
}
TQString line = theSocket->readLine();
diff --git a/kdelirc/irkick/klircclient.h b/kdelirc/irkick/klircclient.h
index e271b23..24089c8 100644
--- a/kdelirc/irkick/klircclient.h
+++ b/kdelirc/irkick/klircclient.h
@@ -26,9 +26,10 @@ class TQSocketNotifier;
@author Gav Wood
*/
-class KLircClient: public QObject
+class KLircClient: public TQObject
{
Q_OBJECT
+ TQ_OBJECT
private:
struct lirc_config *theConfig;
@@ -107,7 +108,7 @@ public:
*/
bool connectToLirc();
- KLircClient(TQWidget *parent = 0, const char *name = 0);
+ KLircClient(TQWidget *tqparent = 0, const char *name = 0);
~KLircClient();
};
diff --git a/kdelirc/kcmlirc/addaction.cpp b/kdelirc/kcmlirc/addaction.cpp
index f2d6ad3..1d13f19 100644
--- a/kdelirc/kcmlirc/addaction.cpp
+++ b/kdelirc/kcmlirc/addaction.cpp
@@ -32,7 +32,7 @@
#include "profileserver.h"
#include "remoteserver.h"
-AddAction::AddAction(TQWidget *parent, const char *name, const Mode &mode): AddActionBase(parent, name), theMode(mode)
+AddAction::AddAction(TQWidget *tqparent, const char *name, const Mode &mode): AddActionBase(tqparent, name), theMode(mode)
{
connect(this, TQT_SIGNAL( selected(const TQString &) ), TQT_SLOT( updateForPageChange() ));
connect(this, TQT_SIGNAL( selected(const TQString &) ), TQT_SLOT( slotCorrectPage() ));
@@ -92,12 +92,12 @@ void AddAction::updateButton(const TQString &remote, const TQString &button)
{
if(theMode.remote() == remote)
{ // note this isn't the "correct" way of doing it; really i should iterate throughg the items and try to find the item which when put through buttonMap[item] returns the current button name. but i cant be arsed.
- theButtons->setCurrentItem(theButtons->findItem(RemoteServer::remoteServer()->getButtonName(remote, button), 0));
- theButtons->ensureItemVisible(theButtons->findItem(RemoteServer::remoteServer()->getButtonName(remote, button), 0));
+ theButtons->setCurrentItem(theButtons->tqfindItem(RemoteServer::remoteServer()->getButtonName(remote, button), 0));
+ theButtons->ensureItemVisible(theButtons->tqfindItem(RemoteServer::remoteServer()->getButtonName(remote, button), 0));
}
else
KMessageBox::error(this, i18n( "You did not select a mode of that remote control. Please use %1, "
- "or revert back to select a different mode." ).arg( theMode.remoteName() ),
+ "or revert back to select a different mode." ).tqarg( theMode.remoteName() ),
i18n( "Incorrect Remote Control Detected" ));
if(indexOf(currentPage()) == 1)
@@ -149,7 +149,7 @@ const TQStringList AddAction::getFunctions(const TQString app, const TQString ob
if( *i != "QCStringList interfaces()" &&
*i != "QCStringList functions()" &&
*i != "QCStringList objects()" &&
- *i != "QCStringList find(TQCString)" )
+ *i != "QCStringList tqfind(TQCString)" )
ret += TQString::fromUtf8(*i);
return ret;
}
@@ -180,7 +180,7 @@ void AddAction::updateOptions()
else if(theUseDCOP->isChecked())
{
if(!theObjects->selectedItem()) return;
- TQListViewItem* i = theObjects->selectedItem()->parent();
+ TQListViewItem* i = theObjects->selectedItem()->tqparent();
if(!i) return;
isUnique = uniqueProgramMap[i];
TQRegExp r("(.*)-[0-9]+");
@@ -262,19 +262,19 @@ void AddAction::updateParameter()
if(theParameters->currentItem())
{ TQString type = theParameters->currentItem()->text(2);
int index = theParameters->currentItem()->text(3).toInt() - 1;
- if(type.find("int") != -1 || type.find("short") != -1 || type.find("long") != -1)
+ if(type.tqfind("int") != -1 || type.tqfind("short") != -1 || type.tqfind("long") != -1)
{ theValue->raiseWidget(2);
theValueIntNumInput->setValue(theArguments[index].toInt());
}
- else if(type.find("double") != -1 || type.find("float") != -1)
+ else if(type.tqfind("double") != -1 || type.tqfind("float") != -1)
{ theValue->raiseWidget(3);
theValueDoubleNumInput->setValue(theArguments[index].toDouble());
}
- else if(type.find("bool") != -1)
+ else if(type.tqfind("bool") != -1)
{ theValue->raiseWidget(1);
theValueCheckBox->setChecked(theArguments[index].toBool());
}
- else if(type.find("TQStringList") != -1)
+ else if(type.tqfind(TQSTRINGLIST_OBJECT_NAME_STRING) != -1)
{ theValue->raiseWidget(4);
TQStringList backup = theArguments[index].toStringList();
// backup needed because calling clear will kill what ever has been saved.
@@ -307,13 +307,13 @@ void AddAction::slotParameterChanged()
if(!theParameters->currentItem()) return;
int index = theParameters->currentItem()->text(3).toInt() - 1;
TQString type = theParameters->currentItem()->text(2);
- if(type.find("int") != -1 || type.find("short") != -1 || type.find("long") != -1)
+ if(type.tqfind("int") != -1 || type.tqfind("short") != -1 || type.tqfind("long") != -1)
theArguments[index].asInt() = theValueIntNumInput->value();
- else if(type.find("double") != -1 || type.find("float") != -1)
+ else if(type.tqfind("double") != -1 || type.tqfind("float") != -1)
theArguments[index].asDouble() = theValueDoubleNumInput->value();
- else if(type.find("bool") != -1)
+ else if(type.tqfind("bool") != -1)
theArguments[index].asBool() = theValueCheckBox->isChecked();
- else if(type.find("TQStringList") != -1)
+ else if(type.tqfind(TQSTRINGLIST_OBJECT_NAME_STRING) != -1)
theArguments[index].asStringList() = theValueEditListBox->items();
else
theArguments[index].asString() = theValueLineEdit->text();
@@ -339,11 +339,11 @@ void AddAction::updateObjects()
QCStringList theApps = theClient->registeredApplications();
for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i)
{
- if(!TQString(*i).find("anonymous")) continue;
- if(!TQString(*i).find(i18n( "anonymous" ))) continue;
+ if(!TQString(*i).tqfind("anonymous")) continue;
+ if(!TQString(*i).tqfind(i18n( "anonymous" ))) continue;
TQRegExp r("(.*)-[0-9]+");
TQString name = r.exactMatch(TQString(*i)) ? r.cap(1) : *i;
- if(names.contains(name)) continue;
+ if(names.tqcontains(name)) continue;
names += name;
KListViewItem *a = new KListViewItem(theObjects, name);
@@ -361,8 +361,8 @@ void AddAction::updateObjects()
void AddAction::updateFunctions()
{
theFunctions->clear();
- if(theObjects->currentItem() && theObjects->currentItem()->parent())
- { TQStringList functions = getFunctions(nameProgramMap[theObjects->currentItem()->parent()], theObjects->currentItem()->text(0));
+ if(theObjects->currentItem() && theObjects->currentItem()->tqparent())
+ { TQStringList functions = getFunctions(nameProgramMap[theObjects->currentItem()->tqparent()], theObjects->currentItem()->text(0));
for(TQStringList::iterator i = functions.begin(); i != functions.end(); ++i)
{ Prototype p((TQString)(*i));
new KListViewItem(theFunctions, p.name(), p.argumentList(), *i);
diff --git a/kdelirc/kcmlirc/addaction.h b/kdelirc/kcmlirc/addaction.h
index 821c6b5..b95fd17 100644
--- a/kdelirc/kcmlirc/addaction.h
+++ b/kdelirc/kcmlirc/addaction.h
@@ -27,6 +27,7 @@ class TQListViewItem;
class AddAction : public AddActionBase
{
Q_OBJECT
+ TQ_OBJECT
int curPage;
Mode theMode;
@@ -66,7 +67,7 @@ public:
TQMap<TQListViewItem *, bool> uniqueProgramMap;
TQMap<TQListViewItem *, TQString> nameProgramMap;
- AddAction(TQWidget *parent, const char *name, const Mode &mode);
+ AddAction(TQWidget *tqparent, const char *name, const Mode &mode);
~AddAction();
};
diff --git a/kdelirc/kcmlirc/addactionbase.ui b/kdelirc/kcmlirc/addactionbase.ui
index 092463a..e60a89f 100644
--- a/kdelirc/kcmlirc/addactionbase.ui
+++ b/kdelirc/kcmlirc/addactionbase.ui
@@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>AddActionBase</class>
<author>Gav Wood</author>
-<widget class="QWizard">
+<widget class="TQWizard">
<property name="name">
<cstring>AddActionBase</cstring>
</property>
@@ -16,7 +16,7 @@
<property name="caption">
<string>Add Action</string>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -27,7 +27,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QButtonGroup" row="0" column="0">
+ <widget class="TQButtonGroup" row="0" column="0">
<property name="name">
<cstring>buttonGroup1</cstring>
</property>
@@ -52,7 +52,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theUseProfile</cstring>
</property>
@@ -63,9 +63,9 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout14</cstring>
+ <cstring>tqlayout14</cstring>
</property>
<hbox>
<property name="name">
@@ -81,7 +81,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>81</width>
<height>31</height>
@@ -125,7 +125,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>101</width>
<height>31</height>
@@ -144,14 +144,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>311</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theUseDCOP</cstring>
</property>
@@ -169,14 +169,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>321</width>
<height>21</height>
</size>
</property>
</spacer>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theChangeMode</cstring>
</property>
@@ -194,7 +194,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -205,7 +205,7 @@
</widget>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -216,20 +216,20 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>theButtonText</cstring>
</property>
<property name="text">
<string>You are attempting to configure an action for a button on [remote] (in mode [mode]). Press a button on this remote control or select from the list.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout6</cstring>
+ <cstring>tqlayout6</cstring>
</property>
<hbox>
<property name="name">
@@ -245,7 +245,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>110</width>
<height>41</height>
@@ -289,7 +289,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>110</width>
<height>31</height>
@@ -300,7 +300,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -311,7 +311,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QSplitter">
+ <widget class="TQSplitter">
<property name="name">
<cstring>splitter8</cstring>
</property>
@@ -412,9 +412,9 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout13</cstring>
+ <cstring>tqlayout13</cstring>
</property>
<vbox>
<property name="name">
@@ -474,7 +474,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -485,7 +485,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QButtonGroup" row="0" column="0">
+ <widget class="TQButtonGroup" row="0" column="0">
<property name="name">
<cstring>buttonGroup4</cstring>
</property>
@@ -499,7 +499,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theNotJustStart</cstring>
</property>
@@ -510,9 +510,9 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout37</cstring>
+ <cstring>tqlayout37</cstring>
</property>
<hbox>
<property name="name">
@@ -528,7 +528,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -586,7 +586,7 @@
</widget>
</hbox>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theJustStart</cstring>
</property>
@@ -604,7 +604,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>81</height>
@@ -615,7 +615,7 @@
</widget>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -675,17 +675,17 @@
<cstring>theParameters</cstring>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout35</cstring>
+ <cstring>tqlayout35</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout34</cstring>
+ <cstring>tqlayout34</cstring>
</property>
<vbox>
<property name="name">
@@ -701,14 +701,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>111</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>theCurParameter</cstring>
</property>
@@ -739,14 +739,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>146</width>
<height>21</height>
</size>
</property>
</spacer>
- <widget class="QWidgetStack">
+ <widget class="TQWidgetStack">
<property name="name">
<cstring>theValue</cstring>
</property>
@@ -761,7 +761,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -785,7 +785,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>61</height>
@@ -802,7 +802,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -826,14 +826,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>61</height>
</size>
</property>
</spacer>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theValueCheckBox</cstring>
</property>
@@ -846,7 +846,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -870,7 +870,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>61</height>
@@ -884,7 +884,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -908,7 +908,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>51</height>
@@ -922,7 +922,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -957,7 +957,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>147</width>
<height>21</height>
@@ -968,7 +968,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -979,7 +979,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -1006,7 +1006,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theRepeat</cstring>
</property>
@@ -1014,7 +1014,7 @@
<string>This action is &amp;repeatable if the button is held down</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theAutoStart</cstring>
</property>
@@ -1035,14 +1035,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>670</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>theIMTop</cstring>
</property>
@@ -1075,7 +1075,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>theIMLabel</cstring>
</property>
@@ -1085,11 +1085,11 @@
<property name="text">
<string>This application may have multiple instances. In the case of having multiple instances at once when this action should be executed, choose a course of action:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>theIMGroup</cstring>
</property>
@@ -1112,7 +1112,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theDontSend</cstring>
</property>
@@ -1126,7 +1126,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theSendToTop</cstring>
</property>
@@ -1137,7 +1137,7 @@
<string>Send the action to the instance hi&amp;ghest in the window stacking order</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theSendToBottom</cstring>
</property>
@@ -1148,7 +1148,7 @@
<string>Send the action to the instance &amp;lowest in window stacking order</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theSendToAll</cstring>
</property>
@@ -1171,7 +1171,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>170</height>
@@ -1180,7 +1180,7 @@
</spacer>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -1191,7 +1191,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QButtonGroup" row="0" column="0">
+ <widget class="TQButtonGroup" row="0" column="0">
<property name="name">
<cstring>buttonGroup3</cstring>
</property>
@@ -1208,7 +1208,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theSwitchMode</cstring>
</property>
@@ -1216,9 +1216,9 @@
<string>&amp;Switch to mode:</string>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout13</cstring>
+ <cstring>tqlayout13</cstring>
</property>
<hbox>
<property name="name">
@@ -1234,7 +1234,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>131</width>
<height>31</height>
@@ -1278,7 +1278,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>131</width>
<height>31</height>
@@ -1287,7 +1287,7 @@
</spacer>
</hbox>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theExitMode</cstring>
</property>
@@ -1308,14 +1308,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>551</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
@@ -1337,7 +1337,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theDoBefore</cstring>
</property>
@@ -1348,7 +1348,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theDoAfter</cstring>
</property>
@@ -1366,7 +1366,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>30</height>
@@ -1574,7 +1574,7 @@
<slot>accept()</slot>
</connection>
</connections>
-<slots>
+<Q_SLOTS>
<slot>updateFunctions()</slot>
<slot>updateParameter()</slot>
<slot>updateParameters()</slot>
@@ -1587,8 +1587,8 @@
<slot>updateForPageChange()</slot>
<slot>slotParameterChanged()</slot>
<slot>updateOptions()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>klistview.h</includehint>
diff --git a/kdelirc/kcmlirc/editaction.cpp b/kdelirc/kcmlirc/editaction.cpp
index 594e4a2..a48ece9 100644
--- a/kdelirc/kcmlirc/editaction.cpp
+++ b/kdelirc/kcmlirc/editaction.cpp
@@ -35,7 +35,7 @@
#include "editaction.h"
#include "addaction.h"
-EditAction::EditAction(IRAIt action, TQWidget *parent, const char *name) : EditActionBase(parent, name)
+EditAction::EditAction(IRAIt action, TQWidget *tqparent, const char *name) : EditActionBase(tqparent, name)
{
theAction = action;
@@ -175,7 +175,7 @@ void EditAction::updateArguments()
}
theArguments->setEnabled(p.count());
for(unsigned i = 0; i < p.count(); i++)
- { theArguments->insertItem(TQString().setNum(i + 1) + ": " + (p.name(i).isEmpty() ? p.type(i) : p.name(i) + " (" + p.type(i) + ")"));
+ { theArguments->insertItem(TQString(TQString().setNum(i + 1) + ": " + (p.name(i).isEmpty() ? p.type(i) : p.name(i) + " (" + p.type(i) + ")")));
arguments[i].cast(TQVariant::nameToType(p.type(i).utf8()));
}
if(p.count()) updateArgument(0); else updateArgument(-1);
@@ -319,10 +319,10 @@ void EditAction::updateDCOPApplications()
QCStringList theApps = theClient->registeredApplications();
for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i)
{
- if(!TQString(*i).find("anonymous")) continue;
+ if(!TQString(*i).tqfind("anonymous")) continue;
TQRegExp r("(.*)-[0-9]+");
TQString name = r.exactMatch(TQString(*i)) ? r.cap(1) : *i;
- if(names.contains(name)) continue;
+ if(names.tqcontains(name)) continue;
names += name;
theDCOPApplications->insertItem(name);
diff --git a/kdelirc/kcmlirc/editaction.h b/kdelirc/kcmlirc/editaction.h
index 7efa7ca..b3d3939 100644
--- a/kdelirc/kcmlirc/editaction.h
+++ b/kdelirc/kcmlirc/editaction.h
@@ -26,6 +26,7 @@
class EditAction : public EditActionBase
{
Q_OBJECT
+ TQ_OBJECT
IRAIt theAction;
TQMap<TQString, TQString> applicationMap, functionMap;
TQMap<TQString, TQString> nameProgramMap;
@@ -48,7 +49,7 @@ public:
virtual void updateDCOPObjects();
virtual void updateDCOPFunctions();
- EditAction(IRAIt action, TQWidget *parent = 0, const char *name = 0);
+ EditAction(IRAIt action, TQWidget *tqparent = 0, const char *name = 0);
~EditAction();
};
diff --git a/kdelirc/kcmlirc/editactionbase.ui b/kdelirc/kcmlirc/editactionbase.ui
index 02e238c..df4576f 100644
--- a/kdelirc/kcmlirc/editactionbase.ui
+++ b/kdelirc/kcmlirc/editactionbase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>EditActionBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>EditActionBase</cstring>
</property>
@@ -22,11 +22,11 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QTabWidget">
+ <widget class="TQTabWidget">
<property name="name">
<cstring>tabWidget3</cstring>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -37,7 +37,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>buttonGroup3</cstring>
</property>
@@ -54,15 +54,15 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout40</cstring>
+ <cstring>tqlayout40</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QComboBox" row="2" column="3">
+ <widget class="TQComboBox" row="2" column="3">
<property name="name">
<cstring>theDCOPApplications</cstring>
</property>
@@ -78,7 +78,7 @@
</sizepolicy>
</property>
</widget>
- <widget class="QLabel" row="3" column="1" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="3" column="1" rowspan="1" colspan="2">
<property name="name">
<cstring>textLabel4_3</cstring>
</property>
@@ -92,7 +92,7 @@
<cstring>theDCOPObjects</cstring>
</property>
</widget>
- <widget class="QButtonGroup" row="1" column="1" rowspan="1" colspan="3">
+ <widget class="TQButtonGroup" row="1" column="1" rowspan="1" colspan="3">
<property name="name">
<cstring>buttonGroup5</cstring>
</property>
@@ -109,7 +109,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QRadioButton" row="0" column="0">
+ <widget class="TQRadioButton" row="0" column="0">
<property name="name">
<cstring>theNotJustStart</cstring>
</property>
@@ -128,7 +128,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QComboBox" row="0" column="1">
+ <widget class="TQComboBox" row="0" column="1">
<property name="name">
<cstring>theFunctions</cstring>
</property>
@@ -141,7 +141,7 @@
</sizepolicy>
</property>
</widget>
- <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="3">
+ <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>theJustStart</cstring>
</property>
@@ -151,7 +151,7 @@
</widget>
</grid>
</widget>
- <widget class="QLabel" row="4" column="1" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="4" column="1" rowspan="1" colspan="2">
<property name="name">
<cstring>textLabel4_2</cstring>
</property>
@@ -165,7 +165,7 @@
<cstring>theDCOPFunctions</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="1">
+ <widget class="TQLabel" row="0" column="1">
<property name="name">
<cstring>textLabel5</cstring>
</property>
@@ -176,7 +176,7 @@
<cstring>theApplications</cstring>
</property>
</widget>
- <widget class="QComboBox" row="0" column="2" rowspan="1" colspan="2">
+ <widget class="TQComboBox" row="0" column="2" rowspan="1" colspan="2">
<property name="name">
<cstring>theApplications</cstring>
</property>
@@ -189,7 +189,7 @@
</sizepolicy>
</property>
</widget>
- <widget class="QComboBox" row="4" column="3">
+ <widget class="TQComboBox" row="4" column="3">
<property name="name">
<cstring>theDCOPFunctions</cstring>
</property>
@@ -197,7 +197,7 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QRadioButton" row="0" column="0">
+ <widget class="TQRadioButton" row="0" column="0">
<property name="name">
<cstring>theUseProfile</cstring>
</property>
@@ -208,7 +208,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLabel" row="2" column="1" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="2" column="1" rowspan="1" colspan="2">
<property name="name">
<cstring>textLabel5_2</cstring>
</property>
@@ -222,7 +222,7 @@
<cstring>theDCOPApplications</cstring>
</property>
</widget>
- <widget class="QRadioButton" row="2" column="0">
+ <widget class="TQRadioButton" row="2" column="0">
<property name="name">
<cstring>theUseDCOP</cstring>
</property>
@@ -230,7 +230,7 @@
<string>Use &amp;DCOP:</string>
</property>
</widget>
- <widget class="QComboBox" row="3" column="3">
+ <widget class="TQComboBox" row="3" column="3">
<property name="name">
<cstring>theDCOPObjects</cstring>
</property>
@@ -240,15 +240,15 @@
</widget>
</grid>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout36</cstring>
+ <cstring>tqlayout36</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QWidgetStack" row="0" column="2" rowspan="2" colspan="1">
+ <widget class="TQWidgetStack" row="0" column="2" rowspan="2" colspan="1">
<property name="name">
<cstring>theValue</cstring>
</property>
@@ -263,7 +263,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -295,7 +295,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>91</height>
@@ -304,7 +304,7 @@
</spacer>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -318,7 +318,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theValueCheckBox</cstring>
</property>
@@ -339,7 +339,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>101</height>
@@ -348,7 +348,7 @@
</spacer>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -377,7 +377,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>101</height>
@@ -386,7 +386,7 @@
</spacer>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -415,7 +415,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>101</height>
@@ -424,7 +424,7 @@
</spacer>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>page</cstring>
</property>
@@ -467,14 +467,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>111</height>
</size>
</property>
</spacer>
- <widget class="QComboBox" row="0" column="1">
+ <widget class="TQComboBox" row="0" column="1">
<property name="name">
<cstring>theArguments</cstring>
</property>
@@ -486,7 +486,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>106</width>
<height>0</height>
@@ -503,14 +503,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>101</height>
</size>
</property>
</spacer>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel8</cstring>
</property>
@@ -533,22 +533,22 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>481</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout17</cstring>
+ <cstring>tqlayout17</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theChangeMode</cstring>
</property>
@@ -556,7 +556,7 @@
<string>Change &amp;mode to:</string>
</property>
</widget>
- <widget class="QComboBox">
+ <widget class="TQComboBox">
<property name="name">
<cstring>theModes</cstring>
</property>
@@ -584,7 +584,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>30</height>
@@ -595,7 +595,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -606,7 +606,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@@ -628,7 +628,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theRepeat</cstring>
</property>
@@ -636,7 +636,7 @@
<string>&amp;Action repeats if button is held down</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theAutoStart</cstring>
</property>
@@ -654,14 +654,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>491</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
@@ -683,7 +683,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theDoBefore</cstring>
</property>
@@ -697,7 +697,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theDoAfter</cstring>
</property>
@@ -718,14 +718,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>670</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>theIMTop</cstring>
</property>
@@ -758,7 +758,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>theIMLabel</cstring>
</property>
@@ -768,11 +768,11 @@
<property name="text">
<string>This application may have multiple instances. In the case of having multiple instances at once when this action should be executed, choose a course of action:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>theIMGroup</cstring>
</property>
@@ -795,7 +795,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theDontSend</cstring>
</property>
@@ -809,7 +809,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theSendToTop</cstring>
</property>
@@ -820,7 +820,7 @@
<string>Send the action to the instance hi&amp;ghest in window stacking order</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theSendToBottom</cstring>
</property>
@@ -831,7 +831,7 @@
<string>Send the action to the instance &amp;lowest in window stacking order</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>theSendToAll</cstring>
</property>
@@ -854,7 +854,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>150</height>
@@ -864,7 +864,7 @@
</vbox>
</widget>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout1</cstring>
</property>
@@ -878,7 +878,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>buttonHelp</cstring>
</property>
@@ -902,14 +902,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>buttonOk</cstring>
</property>
@@ -923,7 +923,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>buttonCancel</cstring>
</property>
@@ -1263,7 +1263,7 @@
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
-<slots>
+<Q_SLOTS>
<slot>updateFunctions()</slot>
<slot>updateApplications()</slot>
<slot>updateDCOPApplications()</slot>
@@ -1273,8 +1273,8 @@
<slot>updateArgument(int)</slot>
<slot>slotParameterChanged()</slot>
<slot>updateOptions()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>knuminput.h</includehint>
diff --git a/kdelirc/kcmlirc/editmode.cpp b/kdelirc/kcmlirc/editmode.cpp
index aad27da..6092e96 100644
--- a/kdelirc/kcmlirc/editmode.cpp
+++ b/kdelirc/kcmlirc/editmode.cpp
@@ -16,7 +16,7 @@
#include "editmode.h"
-EditMode::EditMode(TQWidget *parent, const char *name, bool modal, WFlags fl) : EditModeBase(parent, name, modal, fl)
+EditMode::EditMode(TQWidget *tqparent, const char *name, bool modal, WFlags fl) : EditModeBase(tqparent, name, modal, fl)
{
theIcon->setIconType(KIcon::Panel, KIcon::Any);
}
diff --git a/kdelirc/kcmlirc/editmode.h b/kdelirc/kcmlirc/editmode.h
index df3c888..8ea0c45 100644
--- a/kdelirc/kcmlirc/editmode.h
+++ b/kdelirc/kcmlirc/editmode.h
@@ -21,12 +21,13 @@
class EditMode : public EditModeBase
{
Q_OBJECT
+ TQ_OBJECT
public:
void slotCheckText(const TQString &newText);
void slotClearIcon();
- EditMode(TQWidget *parent = 0, const char *name = 0, bool modal = false, WFlags fl = 0);
+ EditMode(TQWidget *tqparent = 0, const char *name = 0, bool modal = false, WFlags fl = 0);
~EditMode();
};
diff --git a/kdelirc/kcmlirc/editmodebase.ui b/kdelirc/kcmlirc/editmodebase.ui
index dd26940..a0f4b27 100644
--- a/kdelirc/kcmlirc/editmodebase.ui
+++ b/kdelirc/kcmlirc/editmodebase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>EditModeBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>EditModeBase</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -41,15 +41,15 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout25</cstring>
+ <cstring>tqlayout25</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel4</cstring>
</property>
@@ -60,9 +60,9 @@
<cstring>theIcon</cstring>
</property>
</widget>
- <widget class="QLayoutWidget" row="1" column="1">
+ <widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>layout24</cstring>
+ <cstring>tqlayout24</cstring>
</property>
<hbox>
<property name="name">
@@ -78,7 +78,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>110</width>
<height>21</height>
@@ -114,7 +114,7 @@
</widget>
</hbox>
</widget>
- <widget class="QLineEdit" row="0" column="1">
+ <widget class="TQLineEdit" row="0" column="1">
<property name="name">
<cstring>theName</cstring>
</property>
@@ -122,7 +122,7 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel5</cstring>
</property>
@@ -145,14 +145,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>410</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -174,7 +174,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>theDefault</cstring>
</property>
@@ -192,7 +192,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>90</height>
@@ -213,9 +213,9 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout15</cstring>
+ <cstring>tqlayout15</cstring>
</property>
<hbox>
<property name="name">
@@ -231,7 +231,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>231</width>
<height>20</height>
@@ -289,11 +289,11 @@
<slot>slotClearIcon()</slot>
</connection>
</connections>
-<slots>
+<Q_SLOTS>
<slot>slotCheckText(const QString &amp;)</slot>
<slot>slotClearIcon()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kicondialog.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp
index b248127..2fc7313 100644
--- a/kdelirc/kcmlirc/kcmlirc.cpp
+++ b/kdelirc/kcmlirc/kcmlirc.cpp
@@ -49,7 +49,7 @@
typedef KGenericFactory<KCMLirc, TQWidget> theFactory;
K_EXPORT_COMPONENT_FACTORY(kcmlirc, theFactory("kcmlirc"))
-KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DCOPObject("KCMLirc"), KCModule(parent, name)
+KCMLirc::KCMLirc(TQWidget *tqparent, const char *name, TQStringList /*args*/) : DCOPObject("KCMLirc"), KCModule(tqparent, name)
{
KGlobal::locale()->insertCatalogue( "kcmlirc" );
setAboutData(new KAboutData("kcmlirc", I18N_NOOP("KDE Lirc"), VERSION, I18N_NOOP("The KDE IR Remote Control System"), KAboutData::License_GPL_V2, "Copyright (c)2003 Gav Wood", I18N_NOOP("Use this to configure KDE's infrared remote control system in order to control any KDE application with your infrared remote control."), "http://www.kde.org"));
@@ -74,8 +74,8 @@ KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DC
(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->theModes, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateModestqStatus(TQListViewItem *) ));
+ connect(theKCMLircBase->theActions, TQT_SIGNAL( currentChanged(TQListViewItem *) ), this, TQT_SLOT( updateActionstqStatus(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(KListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(slotDrop(KListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*)));
@@ -94,17 +94,17 @@ KCMLirc::~KCMLirc()
{
}
-void KCMLirc::updateModesStatus(TQListViewItem *item)
+void KCMLirc::updateModestqStatus(TQListViewItem *item)
{
- theKCMLircBase->theModes->setItemsRenameable(item && item->parent());
+ theKCMLircBase->theModes->setItemsRenameable(item && item->tqparent());
theKCMLircBase->theAddActions->setEnabled(ProfileServer::profileServer()->profiles().count() && theKCMLircBase->theModes->selectedItem() && RemoteServer::remoteServer()->remotes()[modeMap[theKCMLircBase->theModes->selectedItem()].remote()]);
theKCMLircBase->theAddAction->setEnabled(item);
theKCMLircBase->theAddMode->setEnabled(item);
- theKCMLircBase->theRemoveMode->setEnabled(item && item->parent());
+ theKCMLircBase->theRemoveMode->setEnabled(item && item->tqparent());
theKCMLircBase->theEditMode->setEnabled(item);
}
-void KCMLirc::updateActionsStatus(TQListViewItem *item)
+void KCMLirc::updateActionstqStatus(TQListViewItem *item)
{
theKCMLircBase->theRemoveAction->setEnabled(item);
theKCMLircBase->theEditAction->setEnabled(item);
@@ -114,7 +114,7 @@ void KCMLirc::slotRenamed(TQListViewItem *item)
{
if(!item) return;
- if(item->parent() && item->text(0) != modeMap[item].name())
+ if(item->tqparent() && item->text(0) != modeMap[item].name())
{ allActions.renameMode(modeMap[item], item->text(0));
allModes.rename(modeMap[item], item->text(0));
emit changed(true);
@@ -128,7 +128,7 @@ void KCMLirc::slotEditAction()
EditAction theDialog(actionMap[theKCMLircBase->theActions->currentItem()], this);
TQListViewItem *item = theKCMLircBase->theModes->currentItem();
- if(item->parent()) item = item->parent();
+ if(item->tqparent()) item = item->tqparent();
theDialog.theModes->insertItem(i18n("[Exit current mode]"));
for(item = item->firstChild(); item; item = item->nextSibling())
theDialog.theModes->insertItem(item->text(0));
@@ -166,7 +166,7 @@ void KCMLirc::slotAddAction()
// populate the modes list box
TQListViewItem *item = theKCMLircBase->theModes->selectedItem();
- if(item->parent()) item = item->parent();
+ if(item->tqparent()) item = item->tqparent();
theDialog.theModes->setEnabled(item->firstChild());
theDialog.theSwitchMode->setEnabled(item->firstChild());
for(item = item->firstChild(); item; item = item->nextSibling())
@@ -202,7 +202,7 @@ void KCMLirc::slotAddAction()
a.setRepeat(false);
}
// DCOP?
- else if(theDialog.theUseDCOP->isChecked() && theDialog.theObjects->selectedItem() && theDialog.theObjects->selectedItem()->parent() && theDialog.theFunctions->selectedItem())
+ else if(theDialog.theUseDCOP->isChecked() && theDialog.theObjects->selectedItem() && theDialog.theObjects->selectedItem()->tqparent() && theDialog.theFunctions->selectedItem())
{
a.setProgram(theDialog.program);
a.setObject(theDialog.theObjects->selectedItem()->text(0));
@@ -267,7 +267,8 @@ void KCMLirc::autoPopulate(const Profile &profile, const Remote &remote, const T
Arguments l;
// argument count should be either 0 or 1. undefined if > 1.
if(Prototype(pa->prototype()).argumentCount() == 1)
- { l.append(TQString().setNum(i.current()->parameter().toFloat() * pa->multiplier()));
+ {
+ l.append(TQString(TQString().setNum(i.current()->parameter().toFloat() * pa->multiplier())));
l.back().cast(TQVariant::nameToType(Prototype(pa->prototype()).type(0).utf8()));
}
a.setArguments(l);
@@ -283,7 +284,7 @@ void KCMLirc::slotAddMode()
NewMode theDialog(this, 0);
TQMap<TQListViewItem *, TQString> remoteMap;
TQListViewItem *tr = theKCMLircBase->theModes->selectedItem();
- if(tr) if(tr->parent()) tr = tr->parent();
+ if(tr) if(tr->tqparent()) tr = tr->tqparent();
for(TQListViewItem *i = theKCMLircBase->theModes->firstChild(); i; i = i->nextSibling())
{ KListViewItem *a = new KListViewItem(theDialog.theRemotes, i->text(0));
remoteMap[a] = modeMap[i].remote();
@@ -304,7 +305,7 @@ void KCMLirc::slotEditMode()
EditMode theDialog(this, 0);
Mode &mode = modeMap[theKCMLircBase->theModes->selectedItem()];
- theDialog.theName->setEnabled(theKCMLircBase->theModes->selectedItem()->parent());
+ theDialog.theName->setEnabled(theKCMLircBase->theModes->selectedItem()->tqparent());
theDialog.theName->setText(mode.name().isEmpty() ? mode.remoteName() : mode.name());
if(!mode.iconFile().isNull())
theDialog.theIcon->setIcon(mode.iconFile());
@@ -315,7 +316,7 @@ void KCMLirc::slotEditMode()
if(theDialog.exec() == TQDialog::Accepted)
{ kdDebug() << "Setting icon : " << theDialog.theIcon->icon() << endl;
- mode.setIconFile(theDialog.theIcon->icon().isEmpty() ? TQString::null : theDialog.theIcon->icon());
+ mode.setIconFile(theDialog.theIcon->icon().isEmpty() ? TQString() : theDialog.theIcon->icon());
allModes.updateMode(mode);
if(!mode.name().isEmpty())
{ allActions.renameMode(mode, theDialog.theName->text());
@@ -330,9 +331,9 @@ void KCMLirc::slotEditMode()
void KCMLirc::slotRemoveMode()
{
if(!theKCMLircBase->theModes->selectedItem()) return;
- if(!theKCMLircBase->theModes->selectedItem()->parent()) return;
+ if(!theKCMLircBase->theModes->selectedItem()->tqparent()) return;
- if(KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to remove %1 and all its actions?").arg(theKCMLircBase->theModes->selectedItem()->text(0)), i18n("Erase Actions?")) == KMessageBox::Continue)
+ if(KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to remove %1 and all its actions?").tqarg(theKCMLircBase->theModes->selectedItem()->text(0)), i18n("Erase Actions?")) == KMessageBox::Continue)
{
allModes.erase(modeMap[theKCMLircBase->theModes->selectedItem()]);
updateModes();
@@ -373,10 +374,10 @@ void KCMLirc::updateActions()
theKCMLircBase->theActions->clear();
actionMap.clear();
- if(!theKCMLircBase->theModes->selectedItem()) { updateActionsStatus(0); return; }
+ if(!theKCMLircBase->theModes->selectedItem()) { updateActionstqStatus(0); return; }
Mode m = modeMap[theKCMLircBase->theModes->selectedItem()];
- theKCMLircBase->theModeLabel->setText(m.remoteName() + ": " + (m.name().isEmpty() ? i18n("Actions <i>always</i> available") : i18n("Actions available only in mode <b>%1</b>").arg(m.name())));
+ theKCMLircBase->theModeLabel->setText(m.remoteName() + ": " + (m.name().isEmpty() ? i18n("Actions <i>always</i> available") : i18n("Actions available only in mode <b>%1</b>").tqarg(m.name())));
IRAItList l = allActions.findByMode(m);
for(IRAItList::iterator i = l.begin(); i != l.end(); ++i)
{ TQListViewItem *b = new KListViewItem(theKCMLircBase->theActions, (**i).buttonName(), (**i).application(), (**i).function(), (**i).arguments().toString(), (**i).notes());
@@ -386,7 +387,7 @@ void KCMLirc::updateActions()
if(theKCMLircBase->theActions->currentItem())
theKCMLircBase->theActions->currentItem()->setSelected(true);
- updateActionsStatus(theKCMLircBase->theActions->currentItem());
+ updateActionstqStatus(theKCMLircBase->theActions->currentItem());
}
void KCMLirc::gotButton(TQString remote, TQString button)
@@ -428,7 +429,7 @@ void KCMLirc::updateModes()
}
if(theKCMLircBase->theModes->currentItem())
theKCMLircBase->theModes->currentItem()->setSelected(true);
- updateModesStatus(theKCMLircBase->theModes->currentItem());
+ updateModestqStatus(theKCMLircBase->theModes->currentItem());
updateActions();
}
@@ -464,15 +465,15 @@ void KCMLirc::updateInformation()
if(!theKCMLircBase->theExtensions->selectedItem()) return;
- if(!theKCMLircBase->theExtensions->selectedItem()->parent())
+ if(!theKCMLircBase->theExtensions->selectedItem()->tqparent())
{
- theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").arg(theKCMLircBase->theExtensions->selectedItem()->text(0)));
+ theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").tqarg(theKCMLircBase->theExtensions->selectedItem()->text(0)));
if(theKCMLircBase->theExtensions->selectedItem()->text(0) == i18n("Applications"))
new TQListViewItem(theKCMLircBase->theInformation, i18n("Number of Applications"), TQString().setNum(theKCMLircBase->theExtensions->selectedItem()->childCount()));
else if(theKCMLircBase->theExtensions->selectedItem()->text(0) == i18n("Remote Controls"))
new TQListViewItem(theKCMLircBase->theInformation, i18n("Number of Remote Controls"), TQString().setNum(theKCMLircBase->theExtensions->selectedItem()->childCount()));
}
- else if(theKCMLircBase->theExtensions->selectedItem()->parent()->text(0) == i18n("Applications"))
+ else if(theKCMLircBase->theExtensions->selectedItem()->tqparent()->text(0) == i18n("Applications"))
{
ProfileServer *theServer = ProfileServer::profileServer();
const Profile *p = theServer->profiles()[profileMap[theKCMLircBase->theExtensions->selectedItem()]];
@@ -480,9 +481,9 @@ void KCMLirc::updateInformation()
new TQListViewItem(theKCMLircBase->theInformation, i18n("Extension Author"), p->author());
new TQListViewItem(theKCMLircBase->theInformation, i18n("Application Identifier"), p->id());
new TQListViewItem(theKCMLircBase->theInformation, i18n("Number of Actions"), TQString().setNum(p->actions().count()));
- theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").arg(p->name()));
+ theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").tqarg(p->name()));
}
- else if(theKCMLircBase->theExtensions->selectedItem()->parent()->text(0) == i18n("Remote Controls"))
+ else if(theKCMLircBase->theExtensions->selectedItem()->tqparent()->text(0) == i18n("Remote Controls"))
{
RemoteServer *theServer = RemoteServer::remoteServer();
const Remote *p = theServer->remotes()[remoteMap[theKCMLircBase->theExtensions->selectedItem()]];
@@ -490,7 +491,7 @@ void KCMLirc::updateInformation()
new TQListViewItem(theKCMLircBase->theInformation, i18n("Extension Author"), p->author());
new TQListViewItem(theKCMLircBase->theInformation, i18n("Remote Control Identifier"), p->id());
new TQListViewItem(theKCMLircBase->theInformation, i18n("Number of Buttons"), TQString().setNum(p->buttons().count()));
- theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").arg(p->name()));
+ theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").tqarg(p->name()));
}
}
@@ -533,9 +534,9 @@ void KCMLirc::configChanged()
// TODO: Take this out when I know how
extern "C"
{
- KDE_EXPORT KCModule *create_kcmlirc(TQWidget *parent, const char *)
+ KDE_EXPORT KCModule *create_kcmlirc(TQWidget *tqparent, const char *)
{ KGlobal::locale()->insertCatalogue("kcmlirc");
- return new KCMLirc(parent, "KCMLirc");
+ return new KCMLirc(tqparent, "KCMLirc");
}
}
diff --git a/kdelirc/kcmlirc/kcmlirc.h b/kdelirc/kcmlirc/kcmlirc.h
index 468302b..4af2347 100644
--- a/kdelirc/kcmlirc/kcmlirc.h
+++ b/kdelirc/kcmlirc/kcmlirc.h
@@ -31,6 +31,7 @@ class Remote;
class KCMLirc: public KCModule, virtual public DCOPObject
{
Q_OBJECT
+// TQ_OBJECT
K_DCOP
private:
@@ -45,8 +46,8 @@ private:
public slots:
void updateActions();
- void updateModesStatus(TQListViewItem *);
- void updateActionsStatus(TQListViewItem *);
+ void updateModestqStatus(TQListViewItem *);
+ void updateActionstqStatus(TQListViewItem *);
void updateModes();
void updateExtensions();
void updateInformation();
@@ -61,10 +62,11 @@ public slots:
void slotRenamed(TQListViewItem *item);
void slotEditMode();
-
-// MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
+// QMOC_SKIP_BEGIN
k_dcop:
-// MOC_SKIP_END
+// QMOC_SKIP_END
+#endif
// now just used as a proxy to AddAction class
virtual void gotButton(TQString remote, TQString button);
signals:
@@ -76,7 +78,7 @@ public:
virtual void defaults();
virtual void configChanged();
- KCMLirc(TQWidget *parent = 0, const char *name = 0, TQStringList args = TQStringList());
+ KCMLirc(TQWidget *tqparent = 0, const char *name = 0, TQStringList args = TQStringList());
~KCMLirc();
};
diff --git a/kdelirc/kcmlirc/kcmlircbase.ui b/kdelirc/kcmlirc/kcmlircbase.ui
index c4b0b81..eca2753 100644
--- a/kdelirc/kcmlirc/kcmlircbase.ui
+++ b/kdelirc/kcmlirc/kcmlircbase.ui
@@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>KCMLircBase</class>
<author>Gav Wood</author>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KCMLircBase</cstring>
</property>
@@ -23,14 +23,14 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QTabWidget" row="0" column="0">
+ <widget class="TQTabWidget" row="0" column="0">
<property name="name">
<cstring>tabWidget2</cstring>
</property>
<property name="margin">
<number>0</number>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -41,7 +41,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>theMainLabel</cstring>
</property>
@@ -74,18 +74,18 @@
<property name="text">
<string>There are currently no remote controls available. You must first set up LIRC correctly; see www.lirc.org for more information.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
- <widget class="QSplitter">
+ <widget class="TQSplitter">
<property name="name">
<cstring>splitter4</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>modeLayout</cstring>
</property>
@@ -96,7 +96,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>theRemotesLabel</cstring>
</property>
@@ -140,7 +140,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>modeButtonLayout</cstring>
</property>
@@ -158,7 +158,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>17</width>
<height>20</height>
@@ -202,9 +202,9 @@
</widget>
</vbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout9</cstring>
+ <cstring>tqlayout9</cstring>
</property>
<vbox>
<property name="name">
@@ -213,7 +213,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>theModeLabel</cstring>
</property>
@@ -298,9 +298,9 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout7</cstring>
+ <cstring>tqlayout7</cstring>
</property>
<hbox>
<property name="name">
@@ -316,16 +316,16 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>240</width>
<height>21</height>
</size>
</property>
</spacer>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout6</cstring>
+ <cstring>tqlayout6</cstring>
</property>
<grid>
<property name="name">
@@ -356,7 +356,7 @@
<string>A&amp;dd...</string>
</property>
</widget>
- <widget class="QPushButton" row="1" column="1">
+ <widget class="TQPushButton" row="1" column="1">
<property name="name">
<cstring>theEditAction</cstring>
</property>
@@ -387,7 +387,7 @@
</widget>
</vbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -398,7 +398,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QSplitter" row="0" column="0">
+ <widget class="TQSplitter" row="0" column="0">
<property name="name">
<cstring>splitter5</cstring>
</property>
@@ -427,9 +427,9 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout9</cstring>
+ <cstring>tqlayout9</cstring>
</property>
<vbox>
<property name="name">
@@ -438,7 +438,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>theInformationLabel</cstring>
</property>
@@ -490,7 +490,7 @@
<functions>
<function access="private" specifier="non virtual">init()</function>
</functions>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/kdelirc/kcmlirc/kcmlircbase.ui.h b/kdelirc/kcmlirc/kcmlircbase.ui.h
index 124ab3f..42faaab 100644
--- a/kdelirc/kcmlirc/kcmlircbase.ui.h
+++ b/kdelirc/kcmlirc/kcmlircbase.ui.h
@@ -12,7 +12,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in
** place of a destructor.
*****************************************************************************/
@@ -23,7 +23,7 @@ void KCMLircBase::init()
{
delete theModes;
modeLayout->removeItem(modeButtonLayout);
- theModes = new ModesList(dynamic_cast<TQWidget *>(modeLayout->parent()), "theModes");
+ theModes = new ModesList(TQT_TQWIDGET(modeLayout->parent()), "theModes");
theModes->addColumn(i18n("Remote Control"));
theModes->addColumn(i18n("Default"));
theModes->addColumn(i18n("Icon"));
@@ -32,6 +32,6 @@ void KCMLircBase::init()
theModes->setItemsRenameable(true);
modeLayout->addWidget(theModes);
modeLayout->addLayout(modeButtonLayout);
- modeLayout->invalidate();
+ modeLayout->tqinvalidate();
modeLayout->activate();
}
diff --git a/kdelirc/kcmlirc/modeslist.cpp b/kdelirc/kcmlirc/modeslist.cpp
index 83678d1..a182129 100644
--- a/kdelirc/kcmlirc/modeslist.cpp
+++ b/kdelirc/kcmlirc/modeslist.cpp
@@ -16,7 +16,7 @@
#include "modeslist.h"
-ModesList::ModesList(TQWidget *parent, const char *name) : KListView(parent, name)
+ModesList::ModesList(TQWidget *tqparent, const char *name) : KListView(tqparent, name)
{
setAcceptDrops(true);
setDropVisualizer(false);
diff --git a/kdelirc/kcmlirc/modeslist.h b/kdelirc/kcmlirc/modeslist.h
index 22e6cc0..5cc77a8 100644
--- a/kdelirc/kcmlirc/modeslist.h
+++ b/kdelirc/kcmlirc/modeslist.h
@@ -25,9 +25,10 @@
class ModesList : public KListView
{
Q_OBJECT
+ TQ_OBJECT
public:
virtual bool acceptDrag(TQDropEvent *) const;
- ModesList(TQWidget *parent = 0, const char *name = 0);
+ ModesList(TQWidget *tqparent = 0, const char *name = 0);
};
#endif
diff --git a/kdelirc/kcmlirc/newmode.ui b/kdelirc/kcmlirc/newmode.ui
index e3da8ef..90e91e8 100644
--- a/kdelirc/kcmlirc/newmode.ui
+++ b/kdelirc/kcmlirc/newmode.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>NewMode</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>NewMode</cstring>
</property>
@@ -38,15 +38,15 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout11</cstring>
+ <cstring>tqlayout11</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel5</cstring>
</property>
@@ -54,7 +54,7 @@
<string>Name:</string>
</property>
</widget>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>theName</cstring>
</property>
@@ -75,9 +75,9 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout12</cstring>
+ <cstring>tqlayout12</cstring>
</property>
<hbox>
<property name="name">
@@ -93,7 +93,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -138,18 +138,18 @@
</connection>
<connection>
<sender>theName</sender>
- <signal>textChanged(const QString&amp;)</signal>
+ <signal>textChanged(const TQString&amp;)</signal>
<receiver>NewMode</receiver>
- <slot>slotTextChanged(const QString&amp;)</slot>
+ <slot>slotTextChanged(const TQString&amp;)</slot>
</connection>
</connections>
<includes>
<include location="local" impldecl="in implementation">newmode.ui.h</include>
</includes>
-<slots>
- <slot>slotTextChanged( const QString &amp; newText )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+<Q_SLOTS>
+ <slot>slotTextChanged( const TQString &amp; newText )</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/kdelirc/kcmlirc/newmode.ui.h b/kdelirc/kcmlirc/newmode.ui.h
index 2bb2f54..29c4166 100644
--- a/kdelirc/kcmlirc/newmode.ui.h
+++ b/kdelirc/kcmlirc/newmode.ui.h
@@ -12,7 +12,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in
** place of a destructor.
*****************************************************************************/
diff --git a/kdelirc/kcmlirc/selectprofile.ui b/kdelirc/kcmlirc/selectprofile.ui
index 2d4ac18..ad6867a 100644
--- a/kdelirc/kcmlirc/selectprofile.ui
+++ b/kdelirc/kcmlirc/selectprofile.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>SelectProfile</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>SelectProfile</cstring>
</property>
@@ -52,9 +52,9 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout47</cstring>
+ <cstring>tqlayout47</cstring>
</property>
<hbox>
<property name="name">
@@ -70,7 +70,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -119,7 +119,7 @@
<slot>reject()</slot>
</connection>
</connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/kdelirc/kdelirc/iraction.cpp b/kdelirc/kdelirc/iraction.cpp
index ad558b5..f774bc4 100644
--- a/kdelirc/kdelirc/iraction.cpp
+++ b/kdelirc/kdelirc/iraction.cpp
@@ -97,7 +97,7 @@ const TQString IRAction::function() const
if(theObject.isEmpty())
return i18n("Exit mode");
else
- return i18n("Switch to %1").arg(theObject);
+ return i18n("Switch to %1").tqarg(theObject);
else
if(theObject.isEmpty())
return i18n("Just start");
diff --git a/kdelirc/kdelirc/iraction.h b/kdelirc/kdelirc/iraction.h
index 8fdd44e..7d70d6c 100644
--- a/kdelirc/kdelirc/iraction.h
+++ b/kdelirc/kdelirc/iraction.h
@@ -82,7 +82,7 @@ public:
void setUnique(const bool a) { theUnique = a; }
IRAction(const TQString &newProgram, const TQString &newObject, const TQString &newMethod, const Arguments &newArguments, const TQString &newRemote, const TQString &newMode, const TQString &newButton, const bool newRepeat, const bool newAutoStart, const bool newDoBefore, const bool newDoAfter, const bool newUnique, const IfMulti newIfMulti);
- IRAction() { theProgram = TQString::null; }
+ IRAction() { theProgram = TQString(); }
};
#endif
diff --git a/kdelirc/kdelirc/mode.cpp b/kdelirc/kdelirc/mode.cpp
index 71deea8..cd0dc4c 100644
--- a/kdelirc/kdelirc/mode.cpp
+++ b/kdelirc/kdelirc/mode.cpp
@@ -16,7 +16,7 @@
#include "modes.h"
#include "mode.h"
-Mode::Mode() : theName(TQString::null)
+Mode::Mode() : theName(TQString())
{
}
@@ -37,7 +37,7 @@ const Mode &Mode::loadFromConfig(KConfig &theConfig, int index)
theName = theConfig.readEntry(Prefix + "Name");
theRemote = theConfig.readEntry(Prefix + "Remote");
theIconFile = theConfig.readEntry(Prefix + "IconFile");
- if(theIconFile.isEmpty()) theIconFile = TQString::null;
+ if(theIconFile.isEmpty()) theIconFile = TQString();
return *this;
}
diff --git a/kdelirc/kdelirc/mode.h b/kdelirc/kdelirc/mode.h
index 9a73fbc..a2fa477 100644
--- a/kdelirc/kdelirc/mode.h
+++ b/kdelirc/kdelirc/mode.h
@@ -43,7 +43,7 @@ public:
bool operator==(const Mode &mode) const { return mode.theName == theName && mode.theRemote == theRemote; }
Mode();
- Mode(const TQString &remote, const TQString &name, const TQString &iconFile = TQString::null);
+ Mode(const TQString &remote, const TQString &name, const TQString &iconFile = TQString());
~Mode();
};
diff --git a/kdelirc/kdelirc/modes.cpp b/kdelirc/kdelirc/modes.cpp
index 5346837..5ecd418 100644
--- a/kdelirc/kdelirc/modes.cpp
+++ b/kdelirc/kdelirc/modes.cpp
@@ -41,8 +41,8 @@ void Modes::loadFromConfig(KConfig &theConfig)
void Modes::generateNulls(const TQStringList &theRemotes)
{
for(TQStringList::const_iterator i = theRemotes.begin(); i != theRemotes.end(); ++i)
- { if(!contains(*i) || !operator[](*i).contains("")) operator[](*i)[""] = Mode(*i, "");
- if(!theDefaults.contains(*i)) theDefaults[*i].isEmpty();
+ { if(!tqcontains(*i) || !operator[](*i).tqcontains("")) operator[](*i)[""] = Mode(*i, "");
+ if(!theDefaults.tqcontains(*i)) theDefaults[*i].isEmpty();
}
}
@@ -59,8 +59,8 @@ const Mode Modes::getDefault(const TQString &remote) const
{
// if(theDefaults[remote] == TQString())
// return Mode(remote, "");
- if(contains(remote))
- if(operator[](remote).contains(theDefaults[remote]))
+ if(tqcontains(remote))
+ if(operator[](remote).tqcontains(theDefaults[remote]))
return operator[](remote)[theDefaults[remote]];
else return Mode(remote, "");
else return Mode(remote, "");
diff --git a/kdelirc/kdelirc/profileserver.cpp b/kdelirc/kdelirc/profileserver.cpp
index 7a72c4d..d95c5d5 100644
--- a/kdelirc/kdelirc/profileserver.cpp
+++ b/kdelirc/kdelirc/profileserver.cpp
@@ -66,7 +66,7 @@ void Profile::loadFromFile(const TQString &fileName)
curPAA = 0;
TQFile xmlFile(fileName);
- TQXmlInputSource source(&xmlFile);
+ TQXmlInputSource source(TQT_TQIODEVICE(&xmlFile));
TQXmlSimpleReader reader;
reader.setContentHandler(this);
reader.parse(source);
@@ -84,7 +84,7 @@ const TQString &ProfileServer::getServiceName(const TQString &appId) const
{
if(theProfiles[appId])
return theProfiles[appId]->serviceName();
- return TQString::null;
+ return TQString();
}
const ProfileAction *ProfileServer::getAction(const TQString &appId, const TQString &objId, const TQString &prototype) const
@@ -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(qMakePair(attributes.value("min").toInt(), attributes.value("max").toInt()));
+ curPAA->setRange(tqMakePair(attributes.value("min").toInt(), attributes.value("max").toInt()));
charBuffer = "";
return true;
diff --git a/kdelirc/kdelirc/profileserver.h b/kdelirc/kdelirc/profileserver.h
index 0228082..f049ad4 100644
--- a/kdelirc/kdelirc/profileserver.h
+++ b/kdelirc/kdelirc/profileserver.h
@@ -26,7 +26,7 @@
enum IfMulti {IM_DONTSEND, IM_SENDTOALL, IM_SENDTOTOP, IM_SENDTOBOTTOM};
-typedef QPair<int,int> Range;
+typedef TQPair<int,int> Range;
class ProfileAction;
class Profile;
@@ -35,8 +35,8 @@ class ProfileActionArgument
{
TQString theComment, theType;
Range theRange;
- TQString theDefault; // should be QVariant?
- const ProfileAction *parent;
+ TQString theDefault; // should be TQVariant?
+ const ProfileAction *tqparent;
friend class Profile;
public:
@@ -49,15 +49,15 @@ public:
const Range &range() const { return theRange; }
void setRange(const Range &a) { theRange = a; }
- const ProfileAction *action() const { return parent; }
- void setAction(const ProfileAction *a) { parent = a; }
+ const ProfileAction *action() const { return tqparent; }
+ void setAction(const ProfileAction *a) { tqparent = a; }
};
class ProfileAction
{
TQString theObjId, thePrototype, theName, theComment, theClass;
float theMultiplier;
- const Profile *parent;
+ const Profile *tqparent;
bool theRepeat, theAutoStart;
TQValueList<ProfileActionArgument> theArguments;
@@ -81,11 +81,11 @@ public:
void setAutoStart(bool a) { theAutoStart = a; }
const TQValueList<ProfileActionArgument> &arguments() const { return theArguments; }
- const Profile *profile() const { return parent; }
- void setProfile(const Profile *a) { parent = a; }
+ const Profile *profile() const { return tqparent; }
+ void setProfile(const Profile *a) { tqparent = a; }
};
-class Profile : public QXmlDefaultHandler
+class Profile : public TQXmlDefaultHandler
{
TQString theId, theName, theAuthor, theServiceName;
IfMulti theIfMulti;
@@ -112,7 +112,7 @@ public:
void setUnique(const bool a) { theUnique = a; }
const IfMulti ifMulti() const { return theIfMulti; }
void setIfMulti(const IfMulti a) { theIfMulti = a; }
- const TQString &serviceName() const { if(theServiceName != TQString::null) return theServiceName; return theName; }
+ const TQString &serviceName() const { if(theServiceName != TQString()) return theServiceName; return theName; }
void setServiceName(const TQString &a) { theServiceName = a; }
const TQDict<ProfileAction> &actions() const { return theActions; }
const ProfileAction *searchClass(const TQString &c) const;
diff --git a/kdelirc/kdelirc/prototype.h b/kdelirc/kdelirc/prototype.h
index 0a963f7..fa101b7 100644
--- a/kdelirc/kdelirc/prototype.h
+++ b/kdelirc/kdelirc/prototype.h
@@ -30,7 +30,7 @@ class Prototype
public:
unsigned count() const{ return theTypes.count(); }
- const QPair<TQString, TQString> operator[](int i) const { return qMakePair(theTypes[i], theNames[i]); }
+ const TQPair<TQString, TQString> operator[](int i) const { return tqMakePair(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/kdelirc/kdelirc/remoteserver.cpp b/kdelirc/kdelirc/remoteserver.cpp
index db33591..04fb290 100644
--- a/kdelirc/kdelirc/remoteserver.cpp
+++ b/kdelirc/kdelirc/remoteserver.cpp
@@ -58,7 +58,7 @@ void Remote::loadFromFile(const TQString &fileName)
curRB = 0;
TQFile xmlFile(fileName);
- TQXmlInputSource source(&xmlFile);
+ TQXmlInputSource source(TQT_TQIODEVICE(&xmlFile));
TQXmlSimpleReader reader;
reader.setContentHandler(this);
reader.parse(source);
diff --git a/kdelirc/kdelirc/remoteserver.h b/kdelirc/kdelirc/remoteserver.h
index e74b02e..80891ba 100644
--- a/kdelirc/kdelirc/remoteserver.h
+++ b/kdelirc/kdelirc/remoteserver.h
@@ -38,7 +38,7 @@ public:
const TQString &id(void) const { return theId; }
};
-class Remote : public QXmlDefaultHandler
+class Remote : public TQXmlDefaultHandler
{
TQString theName, theId, theAuthor;
TQDict<RemoteButton> theButtons;
diff --git a/kdelirc/profiles/klauncher.profile.xml b/kdelirc/profiles/klauncher.profile.xml
index 436a04d..87f9035 100644
--- a/kdelirc/profiles/klauncher.profile.xml
+++ b/kdelirc/profiles/klauncher.profile.xml
@@ -6,13 +6,13 @@
<action objid="default" prototype="void kdeinit_exec(QString, QStringList)" repeat="0" autostart="0">
<name>Execute</name>
<comment>Runs a program or script</comment>
- <argument type="QString"><comment>The executable name and path of the program or script to run</comment></argument>
- <argument type="QStringList"><comment>Parameters for the program or script</comment></argument>
+ <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>
</action>
<action objid="default" prototype="void kdeinit_exec_wait(QString, 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="QString"><comment>The executable name and path of the program or script to run</comment></argument>
- <argument type="QStringList"><comment>Parameters for the program or script</comment></argument>
+ <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>
</action>
</profile>
diff --git a/kdelirc/profiles/konqueror.profile.xml b/kdelirc/profiles/konqueror.profile.xml
index 7dfd78c..0fdfdba 100644
--- a/kdelirc/profiles/konqueror.profile.xml
+++ b/kdelirc/profiles/konqueror.profile.xml
@@ -8,7 +8,7 @@
<action objid="KonquerorIface" prototype="void createNewWindow(QString)" repeat="0" autostart="0">
<name>Create New Window</name>
<comment>Creates a new window and loads an arbitrary URL.</comment>
- <argument type="QString"><comment>The URL to load in the window initially.</comment></argument>
+ <argument type=TQSTRING_OBJECT_NAME_STRING><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>