From a2277b6bc715464e83882b90c2a058139b8a6b54 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 23 Jun 2011 01:42:07 +0000 Subject: 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 --- kdelirc/irkick/irkick.cpp | 16 ++-- kdelirc/irkick/irkick.h | 3 +- kdelirc/irkick/klircclient.cpp | 8 +- kdelirc/irkick/klircclient.h | 5 +- kdelirc/kcmlirc/addaction.cpp | 38 ++++---- kdelirc/kcmlirc/addaction.h | 3 +- kdelirc/kcmlirc/addactionbase.ui | 164 ++++++++++++++++----------------- kdelirc/kcmlirc/editaction.cpp | 8 +- kdelirc/kcmlirc/editaction.h | 3 +- kdelirc/kcmlirc/editactionbase.ui | 140 ++++++++++++++-------------- kdelirc/kcmlirc/editmode.cpp | 2 +- kdelirc/kcmlirc/editmode.h | 3 +- kdelirc/kcmlirc/editmodebase.ui | 40 ++++---- kdelirc/kcmlirc/kcmlirc.cpp | 59 ++++++------ kdelirc/kcmlirc/kcmlirc.h | 14 +-- kdelirc/kcmlirc/kcmlircbase.ui | 50 +++++----- kdelirc/kcmlirc/kcmlircbase.ui.h | 6 +- kdelirc/kcmlirc/modeslist.cpp | 2 +- kdelirc/kcmlirc/modeslist.h | 3 +- kdelirc/kcmlirc/newmode.ui | 28 +++--- kdelirc/kcmlirc/newmode.ui.h | 2 +- kdelirc/kcmlirc/selectprofile.ui | 10 +- kdelirc/kdelirc/iraction.cpp | 2 +- kdelirc/kdelirc/iraction.h | 2 +- kdelirc/kdelirc/mode.cpp | 4 +- kdelirc/kdelirc/mode.h | 2 +- kdelirc/kdelirc/modes.cpp | 8 +- kdelirc/kdelirc/profileserver.cpp | 6 +- kdelirc/kdelirc/profileserver.h | 20 ++-- kdelirc/kdelirc/prototype.h | 2 +- kdelirc/kdelirc/remoteserver.cpp | 2 +- kdelirc/kdelirc/remoteserver.h | 2 +- kdelirc/profiles/klauncher.profile.xml | 8 +- kdelirc/profiles/konqueror.profile.xml | 2 +- 34 files changed, 338 insertions(+), 329 deletions(-) (limited to 'kdelirc') 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::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::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 %1...").arg(action.application()), SmallIcon("irkick"), theTrayIcon); + KPassivePopup::message("IRKick", i18n("Starting %1...").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() { //