diff options
Diffstat (limited to 'tdelirc')
30 files changed, 93 insertions, 293 deletions
diff --git a/tdelirc/CMakeL10n.txt b/tdelirc/CMakeL10n.txt index b585ce4..fb29a0d 100644 --- a/tdelirc/CMakeL10n.txt +++ b/tdelirc/CMakeL10n.txt @@ -1,3 +1,9 @@ ##### create translation templates ############## tde_l10n_auto_add_subdirectories( ) + +tde_l10n_create_template( + CATALOG "desktop_files/tdelirc-desktops/" + SOURCES *.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/tdelirc/irkick/CMakeLists.txt b/tdelirc/irkick/CMakeLists.txt index 415c3b7..81b4830 100644 --- a/tdelirc/irkick/CMakeLists.txt +++ b/tdelirc/irkick/CMakeLists.txt @@ -50,11 +50,12 @@ tde_install_icons( ) ##### other data ################################ -install( FILES irkick.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} +tde_create_translated_desktop( + SOURCE irkick.desktop + PO_DIR tdelirc-desktops ) -install( FILES irkick.desktop +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/irkick.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) - diff --git a/tdelirc/irkick/irkick.cpp b/tdelirc/irkick/irkick.cpp index 2d042f0..cf4827a 100644 --- a/tdelirc/irkick/irkick.cpp +++ b/tdelirc/irkick/irkick.cpp @@ -44,7 +44,7 @@ void IRKTrayIcon::mousePressEvent(TQMouseEvent *e) { - KSystemTray::mousePressEvent(new TQMouseEvent(TQEvent::MouseButtonPress, e->pos(), e->globalPos(), e->button() == Qt::LeftButton ? Qt::RightButton : e->button(), e->state())); + KSystemTray::mousePressEvent(new TQMouseEvent(TQEvent::MouseButtonPress, e->pos(), e->globalPos(), e->button() == TQt::LeftButton ? TQt::RightButton : e->button(), e->state())); } IRKick::IRKick(const TQCString &obj) : TQObject(), DCOPObject(obj), npApp(TQString()) @@ -60,23 +60,23 @@ IRKick::IRKick(const TQCString &obj) : TQObject(), DCOPObject(obj), npApp(TQStri else { theTrayIcon->setPixmap(SmallIcon("irkickoff")); TQToolTip::add(theTrayIcon, i18n("TDE Lirc Server: No infra-red remote controls found.")); - TQTimer::singleShot(10000, this, TQT_SLOT(checkLirc())); + TQTimer::singleShot(10000, this, TQ_SLOT(checkLirc())); } theFlashOff = new TQTimer(theTrayIcon); - connect(theFlashOff, TQT_SIGNAL(timeout()), TQT_SLOT(flashOff())); + connect(theFlashOff, TQ_SIGNAL(timeout()), TQ_SLOT(flashOff())); theResetCount = 0; slotReloadConfiguration(); - connect(theClient, TQT_SIGNAL(connectionClosed()), this, TQT_SLOT(slotClosed())); - connect(theClient, TQT_SIGNAL(remotesRead()), this, TQT_SLOT(resetModes())); - connect(theClient, TQT_SIGNAL(commandReceived(const TQString &, const TQString &, int)), this, TQT_SLOT(gotMessage(const TQString &, const TQString &, int))); + connect(theClient, TQ_SIGNAL(connectionClosed()), this, TQ_SLOT(slotClosed())); + connect(theClient, TQ_SIGNAL(remotesRead()), this, TQ_SLOT(resetModes())); + connect(theClient, TQ_SIGNAL(commandReceived(const TQString &, const TQString &, int)), this, TQ_SLOT(gotMessage(const TQString &, const TQString &, int))); theTrayIcon->contextMenu()->changeTitle(0, "IRKick"); - theTrayIcon->contextMenu()->insertItem(SmallIcon( "configure" ), i18n("&Configure..."), this, TQT_SLOT(slotConfigure())); + theTrayIcon->contextMenu()->insertItem(SmallIcon( "configure" ), i18n("&Configure..."), this, TQ_SLOT(slotConfigure())); theTrayIcon->contextMenu()->insertSeparator(); theTrayIcon->contextMenu()->insertItem(SmallIcon( "help" ), KStdGuiItem::help().text(), (new KHelpMenu(theTrayIcon, TDEGlobal::instance()->aboutData()))->menu()); - theTrayIcon->actionCollection()->action("file_quit")->disconnect(TQT_SIGNAL(activated())); - connect(theTrayIcon->actionCollection()->action("file_quit"), TQT_SIGNAL(activated()), TQT_SLOT(doQuit())); + theTrayIcon->actionCollection()->action("file_quit")->disconnect(TQ_SIGNAL(activated())); + connect(theTrayIcon->actionCollection()->action("file_quit"), TQ_SIGNAL(activated()), TQ_SLOT(doQuit())); theTrayIcon->show(); } @@ -92,7 +92,7 @@ void IRKick::slotClosed() { theTrayIcon->setPixmap(SmallIcon("irkickoff")); KPassivePopup::message("IRKick", i18n("The infrared system has severed its connection. Remote controls are no longer available."), SmallIcon("irkick"), theTrayIcon); - TQTimer::singleShot(1000, this, TQT_SLOT(checkLirc())); + TQTimer::singleShot(1000, this, TQ_SLOT(checkLirc())); } void IRKick::checkLirc() @@ -103,7 +103,7 @@ void IRKick::checkLirc() theTrayIcon->setPixmap(SmallIcon("irkick")); } else - TQTimer::singleShot(10000, this, TQT_SLOT(checkLirc())); + TQTimer::singleShot(10000, this, TQ_SLOT(checkLirc())); } void IRKick::flashOff() diff --git a/tdelirc/irkick/irkick.desktop b/tdelirc/irkick/irkick.desktop index b8f7519..f99e36b 100644 --- a/tdelirc/irkick/irkick.desktop +++ b/tdelirc/irkick/irkick.desktop @@ -1,57 +1,7 @@ [Desktop Entry] Type=Service Name=IRKick -Name[sv]=IRkick GenericName=TDE LIRC Server -GenericName[ar]=خادم LIRC لكدى -GenericName[bg]=Сървър LIRC -GenericName[br]=Servijer LIRC TDE -GenericName[bs]=TDE LIRC server -GenericName[ca]=Servidor LIRC de TDE -GenericName[cs]=LIRC server pro TDE -GenericName[cy]=Gweinydd LIRC TDE -GenericName[da]=TDE LIRC-server -GenericName[de]=TDE LIRC-Server -GenericName[el]=Εξυπηρετητής LIRC του TDE -GenericName[eo]=TDE LIRC-servilo -GenericName[es]=Servidor LIRC de TDE -GenericName[et]=TDE LIRC server -GenericName[eu]=TDE LIRC Zerbitzaria -GenericName[fa]=TDE LIRC کارساز -GenericName[fi]=TDE:n LIRC-palvelin -GenericName[fr]=Serveur TDE LIRC -GenericName[ga]=Freastalaí LIRC TDE -GenericName[he]=שרת ה-LIRC של TDE -GenericName[hu]=TDE LIRC szolgáltatás -GenericName[is]=TDE LIRC þjónn -GenericName[it]=Server LIRC di TDE -GenericName[ja]=TDE LIRC サーバ -GenericName[ka]=TDE LIRC სერვერი -GenericName[kk]=TDE LIRC сервері -GenericName[km]=ម៉ាស៊ីនបម្រើ TDE LIRC -GenericName[lt]=TDE LIRC serveris -GenericName[nb]=TDE LIRC-tjener -GenericName[nds]=TDE LIRC-Server -GenericName[ne]=TDE LIRC सर्भर -GenericName[nl]=TDE LIRC-server -GenericName[nn]=TDE LIRC-tenar -GenericName[pa]=TDE LIRC ਸਰਵਰ -GenericName[pl]=Serwer LIRC dla TDE -GenericName[pt]=Servidor de LIRC do TDE -GenericName[pt_BR]=Servidor LIRC do TDE -GenericName[ru]=Сервер LIRC для TDE -GenericName[sk]=TDE LIRC server -GenericName[sl]=Strežnik TDE LIRC -GenericName[sr]=TDE-ов LIRC сервер -GenericName[sr@Latn]=TDE-ov LIRC server -GenericName[sv]=TDE:s LIRC-server -GenericName[ta]=TDE LIRC சேவகன் -GenericName[tr]=TDE LIRC Sunucusu -GenericName[uk]=Сервер LIRC для TDE -GenericName[uz]=TDE LIRC serveri -GenericName[uz@cyrillic]=TDE LIRC сервери -GenericName[zh_CN]=TDE LIRC 服务器 -GenericName[zh_TW]=TDE LIRC 伺服器 X-TDE-Library=irkick X-TDE-autostart-after=panel @@ -64,53 +14,3 @@ Exec=irkick Icon=irkick X-DocPath=irkick/index.html Comment=TDE Linux infrared remote control server. -Comment[ar]=خادم كدى للتحكّم عن بعد بالأشعة تحت الحمراء في لينكس. -Comment[bg]=Сървър за управление на дистанционно устройство с инфрачервени лъчи -Comment[bs]=TDEov server za Linux infracrveno daljinsko upravljanje (Linux Infrared Remote Control). -Comment[ca]=Servidor de control remot per infrarojos de Linux TDE. -Comment[cs]=Server dálkového ovládání pro TDE. -Comment[cy]=Gweinydd rheolydd pell isgoch Linux TDE -Comment[da]=TDE Linux infrarød fjernbetjeningsserver. -Comment[de]=TDE Linux Infrarot Fernsteuerungsserver. -Comment[el]=Εξυπηρετητής τηλεχειριστηρίου υπερύθρων του Linux για το TDE. -Comment[es]=Servidor de control remoto por infrarrojos de TDE -Comment[et]=TDE Linuxi infrapuna kaugjuhtimise server. -Comment[eu]=TDE Linux infrasare urruneko aginte zerbitzaria. -Comment[fa]=TDE Linuxکارساز کنترل از راه دور مادون قرمز -Comment[fi]=TDE:n Linux infrapunalla toimivien kauko-ohjainten ohjauspalvelin. -Comment[fr]=Serveur de contrôle distant infrarouge sous Linux pour TDE. -Comment[ga]=Freastalaí TDE cianrialaithe infridhearg Linux -Comment[he]=שרת לשלט רחוק עבור TDE. -Comment[hi]=केडीई लिनक्स इन्फ्रारेड रिमोट नियंत्रण सर्वर. -Comment[hu]=TDE Linux szolgáltatás infravörös távirányítók kezeléséhez -Comment[is]=TDE Linux innrauða fjarstýringarstjórnborðið -Comment[it]=Server TDE per i telecomandi ad infrarossi -Comment[ja]=TDE Linux 赤外線リモートコントロールサーバ -Comment[ka]= TDE ლინუქსის ინფრაწითელი დაშორებული მართვის სერვერი -Comment[kk]=TDE Linux инфрақызыл порт арқылы басқару сервері. -Comment[km]=ម៉ាស៊ីនបម្រើបញ្ជា TDE Linux infrared ពីចម្ងាយ ។ -Comment[lt]=TDE Linux infraraudonųjų spindulių sąsajos nuotolinio valdymo serveris -Comment[nb]=TDE Linux-tjener for infrarød fjernkontroll -Comment[nds]=TDE-Linux Infraroot-Feernbedeenkuntrullserver -Comment[ne]=TDE लिनक्स अवरक्त टाढाको नियन्त्रण सर्भर । -Comment[nl]=TDE-server voor infrarood-afstandsbediening. -Comment[nn]=TDE-tenar for infraraud fjernkontroll. -Comment[pa]=TDE ਲੀਨਕਸ ਇੰਫਰਾਰੈੱਡ ਰਿਮੋਟ ਕੰਟਰੋਲ ਸਰਵਰ ਹੈ। -Comment[pl]=Serwer obsługi pilotów dla TDE. -Comment[pt]=Servidor de comandos à distância por infravermelhos do TDE. -Comment[pt_BR]=servidor de controle infra-vermelho do Linux no TDE -Comment[ro]=Server de control al telecomenziilor în infraroşu -Comment[ru]=Сервер управления TDE через инфракрасный порт. -Comment[sk]=TDE server pre infračervené vzdialené ovládanie pre Linux. -Comment[sl]=Strežnik TDE Linux za infrardeči daljninski upravljalnik -Comment[sr]=TDE-ов сервер за контролу инфрацрвених даљинских управљача у Linux-у. -Comment[sr@Latn]=TDE-ov server za kontrolu infracrvenih daljinskih upravljača u Linux-u. -Comment[sv]=Infraröd fjärrkontrollserver -Comment[ta]=கேடிஇ லினக்ஸ் அகச்சிவப்பு கதிர் தொலைதூர கட்டுப்பாட்டு சேவகன் -Comment[tg]=Хидматрасони идоракунии дурдасти инфрасурхи TDE Linux. -Comment[tr]=TDE Linux kızılötesi uzaktan kontrol sunucusu. -Comment[uk]=Сервер дистанційного керування інфрачервоними пристроями для Linux та TDE. -Comment[uz]=Infraqizil nur bilan masofadan boshqarish serveri -Comment[uz@cyrillic]=Инфрақизил нур билан масофадан бошқариш сервери -Comment[zh_CN]=TDE Linux 红外远程控制服务器。 -Comment[zh_TW]=TDE Linux 紅外線遙控伺服器。 diff --git a/tdelirc/irkick/irkick.h b/tdelirc/irkick/irkick.h index cecc26b..a3b7cc3 100644 --- a/tdelirc/irkick/irkick.h +++ b/tdelirc/irkick/irkick.h @@ -41,7 +41,7 @@ public: class IRKick: public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/tdelirc/irkick/main.cpp b/tdelirc/irkick/main.cpp index 5d5a791..612262d 100644 --- a/tdelirc/irkick/main.cpp +++ b/tdelirc/irkick/main.cpp @@ -17,7 +17,7 @@ #include "irkick.h" -extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) +extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) { TDEAboutData *aboutData = new TDEAboutData("irkick", I18N_NOOP("IRKick"), VERSION, I18N_NOOP("The TDE Infrared Remote Control Server"), TDEAboutData::License_GPL, "(c) 2003, Gav Wood", 0, 0, "gav@kde.org"); aboutData->addAuthor("Gav Wood", I18N_NOOP("Author"), "gav@kde.org", "http://www.indigoarchive.net/gav/"); diff --git a/tdelirc/irkick/tdelircclient.cpp b/tdelirc/irkick/tdelircclient.cpp index ee00c88..c70d39a 100644 --- a/tdelirc/irkick/tdelircclient.cpp +++ b/tdelirc/irkick/tdelircclient.cpp @@ -72,8 +72,8 @@ bool KLircClient::connectToLirc() theSocket = new TQSocket; theSocket->setSocket(sock); - connect(theSocket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotRead())); - connect(theSocket, TQT_SIGNAL(connectionClosed()), TQT_SLOT(slotClosed())); + connect(theSocket, TQ_SIGNAL(readyRead()), TQ_SLOT(slotRead())); + connect(theSocket, TQ_SIGNAL(connectionClosed()), TQ_SLOT(slotClosed())); updateRemotes(); return true; } diff --git a/tdelirc/irkick/tdelircclient.h b/tdelirc/irkick/tdelircclient.h index 68c1906..a3da5df 100644 --- a/tdelirc/irkick/tdelircclient.h +++ b/tdelirc/irkick/tdelircclient.h @@ -28,7 +28,7 @@ class TQSocketNotifier; class KLircClient: public TQObject { - Q_OBJECT + TQ_OBJECT private: diff --git a/tdelirc/kcmlirc/CMakeLists.txt b/tdelirc/kcmlirc/CMakeLists.txt index 7761e97..2798fb1 100644 --- a/tdelirc/kcmlirc/CMakeLists.txt +++ b/tdelirc/kcmlirc/CMakeLists.txt @@ -35,13 +35,14 @@ tde_add_kpart( kcm_kcmlirc AUTOMOC editmodebase.ui editmode.cpp editaction.cpp modeslist.cpp LINK tdelirc-static tdeui-shared tdeio-shared + DEPENDENCIES irkick_common-static DESTINATION ${PLUGIN_INSTALL_DIR} ) ##### other data ################################ -install( FILES kcmlirc.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} +tde_create_translated_desktop( + SOURCE kcmlirc.desktop + PO_DIR tdelirc-desktops ) - diff --git a/tdelirc/kcmlirc/addaction.cpp b/tdelirc/kcmlirc/addaction.cpp index 8a87775..3a3e6bd 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(); @@ -274,7 +274,7 @@ void AddAction::updateParameter() { theValue->raiseWidget(1); theValueCheckBox->setChecked(theArguments[index].toBool()); } - else if(type.find(TQSTRINGLIST_OBJECT_NAME_STRING) != -1) + else if(type.find("TQStringList") != -1) { theValue->raiseWidget(4); TQStringList backup = theArguments[index].toStringList(); // backup needed because calling clear will kill what ever has been saved. @@ -313,7 +313,7 @@ void AddAction::slotParameterChanged() theArguments[index].asDouble() = theValueDoubleNumInput->value(); else if(type.find("bool") != -1) theArguments[index].asBool() = theValueCheckBox->isChecked(); - else if(type.find(TQSTRINGLIST_OBJECT_NAME_STRING) != -1) + else if(type.find("TQStringList") != -1) theArguments[index].asStringList() = theValueEditListBox->items(); else theArguments[index].asString() = theValueLineEdit->text(); diff --git a/tdelirc/kcmlirc/addaction.h b/tdelirc/kcmlirc/addaction.h index 3a3f22f..135f89d 100644 --- a/tdelirc/kcmlirc/addaction.h +++ b/tdelirc/kcmlirc/addaction.h @@ -26,7 +26,7 @@ class TQListViewItem; class AddAction : public AddActionBase { - Q_OBJECT + TQ_OBJECT int curPage; diff --git a/tdelirc/kcmlirc/addactionbase.ui b/tdelirc/kcmlirc/addactionbase.ui index 9887a97..dc28b78 100644 --- a/tdelirc/kcmlirc/addactionbase.ui +++ b/tdelirc/kcmlirc/addactionbase.ui @@ -1574,7 +1574,7 @@ <slot>accept()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>updateFunctions()</slot> <slot>updateParameter()</slot> <slot>updateParameters()</slot> @@ -1587,7 +1587,7 @@ <slot>updateForPageChange()</slot> <slot>slotParameterChanged()</slot> <slot>updateOptions()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">keditlistbox.h</include> diff --git a/tdelirc/kcmlirc/editaction.h b/tdelirc/kcmlirc/editaction.h index 8b19b6a..20b7da1 100644 --- a/tdelirc/kcmlirc/editaction.h +++ b/tdelirc/kcmlirc/editaction.h @@ -25,7 +25,7 @@ class EditAction : public EditActionBase { - Q_OBJECT + TQ_OBJECT IRAIt theAction; TQMap<TQString, TQString> applicationMap, functionMap; diff --git a/tdelirc/kcmlirc/editactionbase.ui b/tdelirc/kcmlirc/editactionbase.ui index e7dd0f7..d82d68b 100644 --- a/tdelirc/kcmlirc/editactionbase.ui +++ b/tdelirc/kcmlirc/editactionbase.ui @@ -1263,7 +1263,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>updateFunctions()</slot> <slot>updateApplications()</slot> <slot>updateDCOPApplications()</slot> @@ -1273,7 +1273,7 @@ <slot>updateArgument(int)</slot> <slot>slotParameterChanged()</slot> <slot>updateOptions()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">keditlistbox.h</include> diff --git a/tdelirc/kcmlirc/editmode.h b/tdelirc/kcmlirc/editmode.h index 5de0836..669e991 100644 --- a/tdelirc/kcmlirc/editmode.h +++ b/tdelirc/kcmlirc/editmode.h @@ -20,7 +20,7 @@ */ class EditMode : public EditModeBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdelirc/kcmlirc/editmodebase.ui b/tdelirc/kcmlirc/editmodebase.ui index e6c36f3..649d886 100644 --- a/tdelirc/kcmlirc/editmodebase.ui +++ b/tdelirc/kcmlirc/editmodebase.ui @@ -289,10 +289,10 @@ <slot>slotClearIcon()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotCheckText(const TQString &)</slot> <slot>slotClearIcon()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kicondialog.h</include> diff --git a/tdelirc/kcmlirc/kcmlirc.cpp b/tdelirc/kcmlirc/kcmlirc.cpp index e1f35e3..a22508c 100644 --- a/tdelirc/kcmlirc/kcmlirc.cpp +++ b/tdelirc/kcmlirc/kcmlirc.cpp @@ -74,20 +74,20 @@ 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->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(); @@ -530,9 +530,9 @@ TQString KCMLirc::handbookDocPath() const { int index = theKCMLircBase->tabWidget2->currentPageIndex(); if (index == 0) - return "kcmlirc/usage.html"; + return "kcontrol/kcmlirc/usage.html"; else if (index == 1) - return "kcmlirc/extensions.html"; + return "kcontrol/kcmlirc/extensions.html"; else return TQString::null; } @@ -546,7 +546,7 @@ void KCMLirc::configChanged() // TODO: Take this out when I know how extern "C" { - KDE_EXPORT TDECModule *create_kcmlirc(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_kcmlirc(TQWidget *parent, const char *) { TDEGlobal::locale()->insertCatalogue("kcmlirc"); return new KCMLirc(parent, "KCMLirc"); } diff --git a/tdelirc/kcmlirc/kcmlirc.desktop b/tdelirc/kcmlirc/kcmlirc.desktop index 2b3af71..90d2697 100644 --- a/tdelirc/kcmlirc/kcmlirc.desktop +++ b/tdelirc/kcmlirc/kcmlirc.desktop @@ -1,119 +1,16 @@ [Desktop Entry] -Icon=irkick -Comment=Configure your remote controls for use with applications -Comment[ar]=إعداد التحكّم عن بعد لاستخدامه في تطبيقاتك -Comment[bg]=Настройване на дистанционното управление -Comment[bs]=Podesite vaš daljinski upravljač za upotrebu sa programima -Comment[ca]=Configura els teus controls remots per usar amb aplicacions -Comment[cs]=Nastavení dálkových ovladačů -Comment[cy]=Ffurfweddu eich rheolyddion pell ar gyfer ddefnydd efo cymhwysiadau -Comment[da]=Indstil dine fjernbetjeninger til brug for programmer -Comment[de]=Einrichtung diverser Applikationen zur Bedienung mit einer Fernsteuerung -Comment[el]=Ρυθμίστε τα τηλεχειριστήρια σας για χρήση σε εφαρμογές -Comment[es]=Configurar sus controles remotos para usarlos en las aplicaciones -Comment[et]=Kaugjuhtimise seadistamine rakenduste jaoks -Comment[eu]=Konfiguratu zure urruneko kontrolak aplikazioekin erabiltzeko -Comment[fa]=برای استفاده با کاربردها، کنترلهای از راه دورتان را پیکربندی کنید -Comment[fi]=Muokkaa kauko-ohjaimesi toimimaan ohjelmien kanssa -Comment[fr]=Configurer vos contrôleurs distants pour l'utiliser avec vos applications -Comment[ga]=Cumraigh do chuid cianrialtáin chun iad a úsáid le feidhmchláir -Comment[he]=הגדרת שלט רחוק לשימוש ביישומים -Comment[hi]=अनुप्रयोगों के साथ उपयोग के लिए अपने रिमोट नियंत्रण को कॉन्फ़िगर करें -Comment[hu]=Az infravörös távirányítók jellemzői -Comment[is]=Her má stilla fjarstýringar ýmissa forrita -Comment[it]=Configura i telecomandi per l'uso con le applicazioni -Comment[ja]=アプリケーションで使用するリモートコントロールを設定 -Comment[ka]=დააკონფიგურირეთ თქვენი დაშორებული მართვა ამ პროგრამით -Comment[kk]=Қашықтан басқаруды қолданбалармен қолдану үшін баптау -Comment[km]=កំណត់រចនាសម្ព័ន្ធការបញ្ជាពីចម្ងាយរបស់អ្នក សម្រាប់ការប្រើជាមួយនឹងកម្មវិធី -Comment[lt]=Nuotolinio valdymo programomis konfigūravimas -Comment[mk]=Конфигурирајте ги вашите далечински управувачи за користење со апликации -Comment[nb]=Sett opp fjernkontroll for bruk mot programmer -Comment[nds]=Feernbedeners för den Bruuk mit Programmen instellen -Comment[ne]=अनुप्रयोगसँग प्रयोग गर्न तपाईंको टाढाको नियन्त्रण कन्फिगर गर्नुहोस् -Comment[nl]=Uw afstandsbedieningen instellen voor gebruik in TDE -Comment[nn]=Set opp bruken av fjernkontroll i ulike program -Comment[pa]=ਕਾਰਜਾਂ ਨਾਲ ਵਰਤਣ ਲਈ ਆਪਣੇ ਰਿਮੋਟ ਕੰਟਰੋਲ ਦੀ ਸੰਰਚਨਾ ਕਰੋ -Comment[pl]=Konfiguruje piloty do użycia w programach -Comment[pt]=Configure os seus comandos à distância para os usar nas aplicações -Comment[pt_BR]=Configura seus controles remotos para o uso com as aplicações -Comment[ro]=Configurează telecomneziile de utilizat cu aplicaţii -Comment[ru]=Настройка удалённого управления приложениями -Comment[sk]=Nastavenie diaľkového ovládania pre vaše aplikácie -Comment[sl]=Nastavite vaš daljinski upravljalnik za uporabo v programih -Comment[sr]=Подесите контроле вашег даљинског управљача за употребу у програмима -Comment[sr@Latn]=Podesite kontrole vašeg daljinskog upravljača za upotrebu u programima -Comment[sv]=Ställ in fjärrkontroller att använda med program -Comment[ta]=பயன்பாடுகளுடன் பயன்படுத்த தொலைதூர கட்டுப்பாடுகளை வடிவமை -Comment[tg]=Ба воситаи замимаҳо танзимкунии идоракунии дурдасти шумо -Comment[tr]=Uzaktan kontrol ayarlarınızı uygulamalarla kullanmak için ayarla -Comment[uk]=Налаштування елементів дистанційного керування для використання з програмами -Comment[zh_CN]=配置您的远程控制以供应用程序使用 -Comment[zh_TW]=設定遙控按鍵與應用程式的關聯 -Exec=tdecmshell kcmlirc -Keywords=KCMLirc;kcmlirc; -Keywords[bg]=дистанционно устройство; дистанционно; инфрачервени; лъчи; KCMLirc; kcmlirc; -Keywords[nl]=kcmlirc;linux infrarood;infrarood;afstandsbediening; -Keywords[pl]=KCMLirc;kcmlirc;piloty;podczerwień; -Keywords[pt]=kcmlirc; -Keywords[ta]= KCMLirc;kcmlirc; -Keywords[uz]=KCMLirc;kcmlirc;infraqizil nur; -Keywords[uz@cyrillic]=KCMLirc;kcmlirc;инфрақизил нур; Name=Remote Controls -Name[ar]=التحكّم عن بعد -Name[bg]=Дистанционно -Name[bs]=Daljinsko upravljanje -Name[ca]=Controls remots -Name[cs]=Dálková ovládání -Name[cy]=Rheolyddion Pell -Name[da]=Fjernbetjeninger -Name[de]=Fernsteuerungen -Name[el]=Τηλεχειριστήρια -Name[eo]=Teleregiloj -Name[es]=Controles remotos -Name[et]=Kaugjuhtimine -Name[eu]=Urruneko Aginteak -Name[fa]=کنترلهای از راه دور -Name[fi]=Kauko-ohjaimet -Name[fr]=Contrôleurs distants -Name[ga]=Cianrialtáin -Name[he]=שליטה מרחוק -Name[hi]=रिमोट नियंत्रण -Name[hu]=Távirányító -Name[is]=Fjarstýringar -Name[it]=Telecomandi -Name[ja]=リモートコントロール -Name[ka]=დაშორებული მართვა -Name[kk]=Қашықтан басқару -Name[km]=បញ្ជាពីចម្ងាយ -Name[lt]=Nuotolinis valdymas -Name[mk]=Далечински управувачи -Name[nb]=Fjernkontroll -Name[nds]=Feernbedeners -Name[ne]=टाढाको नियन्त्रण -Name[nl]=Afstandsbediening -Name[nn]=Fjernkontrollar -Name[pa]=ਰਿਮੋਟ ਕੰਟਰੋਲ -Name[pl]=Piloty -Name[pt]=Comandos à Distância -Name[pt_BR]=Controles Remotos -Name[ro]=Telecomenzi -Name[ru]=Удалённое управление -Name[sk]=Diaľkový ovládač -Name[sl]=Daljinski upravljalci -Name[sr]=Даљински управљачи -Name[sr@Latn]=Daljinski upravljači -Name[sv]=Fjärrkontroller -Name[ta]= தொலைதூர கட்டுப்பாடுகள் -Name[tg]=Идоракунии Дурдаст -Name[tr]=Uzaktan Kontroller -Name[uk]=Елементи дистанційного керування -Name[zh_CN]=远程控制 -Name[zh_TW]=遙控鍵 + +Comment=Configure remote controls for use with applications + +Keywords=KCMLirc;kcmlirc;lirc + +Exec=tdecmshell kcmlirc +Icon=irkick Terminal=false Type=Application X-TDE-FactoryName=kcmlirc X-TDE-Library=kcmlirc -X-TDE-ModuleType=Library -X-DocPath=kcmlirc/index.html +X-TDE-ParentApp=kcontrol +X-DocPath=kcontrol/kcmlirc/index.html Categories=Qt;TDE;X-TDE-settings-peripherals; diff --git a/tdelirc/kcmlirc/kcmlirc.h b/tdelirc/kcmlirc/kcmlirc.h index c187642..e062534 100644 --- a/tdelirc/kcmlirc/kcmlirc.h +++ b/tdelirc/kcmlirc/kcmlirc.h @@ -30,7 +30,7 @@ class Remote; class KCMLirc: public TDECModule, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/tdelirc/kcmlirc/kcmlircbase.ui b/tdelirc/kcmlirc/kcmlircbase.ui index 3bf02c8..a6e4b4c 100644 --- a/tdelirc/kcmlirc/kcmlircbase.ui +++ b/tdelirc/kcmlirc/kcmlircbase.ui @@ -341,9 +341,6 @@ <property name="text"> <string>Auto-Populate...</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="KPushButton" row="1" column="0"> <property name="name"> @@ -485,14 +482,12 @@ </grid> </widget> <includes> - <include location="local" impldecl="in implementation">kcmlircbase.ui.h</include> <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="local" impldecl="in implementation">kcmlircbase.ui.h</include> </includes> <functions> <function access="private" specifier="non virtual">init()</function> </functions> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> </UI> diff --git a/tdelirc/kcmlirc/kcmlircbase.ui.h b/tdelirc/kcmlirc/kcmlircbase.ui.h index dcf2ec3..f7dc483 100644 --- a/tdelirc/kcmlirc/kcmlircbase.ui.h +++ b/tdelirc/kcmlirc/kcmlircbase.ui.h @@ -23,7 +23,7 @@ void KCMLircBase::init() { delete theModes; modeLayout->removeItem(modeButtonLayout); - theModes = new ModesList(TQT_TQWIDGET(modeLayout->parent()), "theModes"); + theModes = new ModesList(static_cast<TQWidget*>(modeLayout->parent()), "theModes"); theModes->addColumn(i18n("Remote Control")); theModes->addColumn(i18n("Default")); theModes->addColumn(i18n("Icon")); diff --git a/tdelirc/kcmlirc/modeslist.h b/tdelirc/kcmlirc/modeslist.h index d6a4b25..e60ba00 100644 --- a/tdelirc/kcmlirc/modeslist.h +++ b/tdelirc/kcmlirc/modeslist.h @@ -24,7 +24,7 @@ class ModesList : public TDEListView { - Q_OBJECT + TQ_OBJECT public: virtual bool acceptDrag(TQDropEvent *) const; diff --git a/tdelirc/kcmlirc/newmode.ui b/tdelirc/kcmlirc/newmode.ui index 2365dce..483a69b 100644 --- a/tdelirc/kcmlirc/newmode.ui +++ b/tdelirc/kcmlirc/newmode.ui @@ -148,8 +148,8 @@ <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">tdelistview.h</include> </includes> -<Q_SLOTS> +<slots> <slot>slotTextChanged( const TQString & newText )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/tdelirc/profiles/konqueror.profile.xml b/tdelirc/profiles/konqueror.profile.xml index 0fdfdba..464ed52 100644 --- a/tdelirc/profiles/konqueror.profile.xml +++ b/tdelirc/profiles/konqueror.profile.xml @@ -5,10 +5,10 @@ <name>Konqueror</name> <author>Gav Wood</author> <instances uniqueapp="0" ifmulti="sendtotop"/> - <action objid="KonquerorIface" prototype="void createNewWindow(QString)" repeat="0" autostart="0"> + <action objid="KonquerorIface" prototype="void createNewWindow(TQString)" repeat="0" autostart="0"> <name>Create New Window</name> <comment>Creates a new window and loads an arbitrary URL.</comment> - <argument type=TQSTRING_OBJECT_NAME_STRING><comment>The URL to load in the window initially.</comment></argument> + <argument type="TQString"><comment>The URL to load in the window initially.</comment></argument> </action> <action objid="MainApplication-Interface" prototype="void quit()" repeat="0" autostart="0"> <name>Quit</name> diff --git a/tdelirc/profiles/profile.dtd b/tdelirc/profiles/profile.dtd index 070fd14..96c60da 100644 --- a/tdelirc/profiles/profile.dtd +++ b/tdelirc/profiles/profile.dtd @@ -14,7 +14,7 @@ <!ATTLIST profile servicename CDATA #REQUIRED> <!ATTLIST action objid CDATA #REQUIRED> <!ATTLIST action prototype CDATA #REQUIRED> -<!ATTLIST argument type (int|QString|QCString|QStringList|bool|double) #REQUIRED> +<!ATTLIST argument type (int|TQString|QCString|QStringList|bool|double) #REQUIRED> <!ATTLIST range min CDATA #REQUIRED> <!ATTLIST range max CDATA #REQUIRED> <!ATTLIST action class (captions|teletext|fullscreen|scan|finetuneup|finetunedown|recall|enter|number|play|stop|pause|record|previous|next|rewind|forward|eject|mute|volumedown|volumeup|channeldown|channelup|red|yellow|green|blue|on|off) #IMPLIED> diff --git a/tdelirc/profiles/tdelauncher.profile.xml b/tdelirc/profiles/tdelauncher.profile.xml index 57eca31..be55dbd 100644 --- a/tdelirc/profiles/tdelauncher.profile.xml +++ b/tdelirc/profiles/tdelauncher.profile.xml @@ -3,16 +3,16 @@ <profile id="tdelauncher"> <name>TDE Program Launcher</name> <author>Gav Wood</author> - <action objid="default" prototype="void tdeinit_exec(QString, QStringList)" repeat="0" autostart="0"> + <action objid="default" prototype="void tdeinit_exec(TQString, QStringList)" repeat="0" autostart="0"> <name>Execute</name> <comment>Runs a program or script</comment> - <argument type=TQSTRING_OBJECT_NAME_STRING><comment>The executable name and path of the program or script to run</comment></argument> - <argument type=TQSTRINGLIST_OBJECT_NAME_STRING><comment>Parameters for the program or script</comment></argument> + <argument type="TQString"><comment>The executable name and path of the program or script to run</comment></argument> + <argument type="TQStringList"><comment>Parameters for the program or script</comment></argument> </action> - <action objid="default" prototype="void tdeinit_exec_wait(QString, QStringList)" repeat="0" autostart="0"> + <action objid="default" prototype="void tdeinit_exec_wait(TQString, QStringList)" repeat="0" autostart="0"> <name>Execute and Wait</name> <comment>Runs a program or script and waits for it to finish</comment> - <argument type=TQSTRING_OBJECT_NAME_STRING><comment>The executable name and path of the program or script to run</comment></argument> - <argument type=TQSTRINGLIST_OBJECT_NAME_STRING><comment>Parameters for the program or script</comment></argument> + <argument type="TQString"><comment>The executable name and path of the program or script to run</comment></argument> + <argument type="TQStringList"><comment>Parameters for the program or script</comment></argument> </action> </profile> diff --git a/tdelirc/tdelirc/Makefile.am b/tdelirc/tdelirc/Makefile.am index e65ca12..4bed3df 100644 --- a/tdelirc/tdelirc/Makefile.am +++ b/tdelirc/tdelirc/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libtdelirc.la noinst_HEADERS = iraction.h arguments.h iractions.h prototype.h modes.h mode.h profileserver.h remoteserver.h libtdelirc_la_SOURCES = iraction.cpp arguments.cpp iractions.cpp prototype.cpp modes.cpp mode.cpp profileserver.cpp remoteserver.cpp -libtdelirc_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIBSOCKET) +libtdelirc_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIBSOCKET) ####### tdevelop will overwrite this part!!! (end)############ # These paths are TDE specific. Use them: @@ -34,7 +34,7 @@ INCLUDES = $(all_includes) METASOURCES = AUTO # the library search path. -libtdelirc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libtdelirc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # Uncomment the following two lines if you add a ui.rc file for your application to make use of # KDEs XML GUI builing diff --git a/tdelirc/tdelirc/profileserver.cpp b/tdelirc/tdelirc/profileserver.cpp index ba39442..7e41e8e 100644 --- a/tdelirc/tdelirc/profileserver.cpp +++ b/tdelirc/tdelirc/profileserver.cpp @@ -66,7 +66,7 @@ void Profile::loadFromFile(const TQString &fileName) curPAA = 0; TQFile xmlFile(fileName); - TQXmlInputSource source(TQT_TQIODEVICE(&xmlFile)); + TQXmlInputSource source(&xmlFile); TQXmlSimpleReader reader; reader.setContentHandler(this); reader.parse(source); @@ -124,7 +124,7 @@ bool Profile::startElement(const TQString &, const TQString &, const TQString &n curPAA->setType(attributes.value("type")); } else if(name == "range" && curPAA) - curPAA->setRange(tqMakePair(attributes.value("min").toInt(), attributes.value("max").toInt())); + curPAA->setRange(qMakePair(attributes.value("min").toInt(), attributes.value("max").toInt())); charBuffer = ""; return true; diff --git a/tdelirc/tdelirc/prototype.h b/tdelirc/tdelirc/prototype.h index fa101b7..3c86025 100644 --- a/tdelirc/tdelirc/prototype.h +++ b/tdelirc/tdelirc/prototype.h @@ -30,7 +30,7 @@ class Prototype public: unsigned count() const{ return theTypes.count(); } - const TQPair<TQString, TQString> operator[](int i) const { return tqMakePair(theTypes[i], theNames[i]); } + const TQPair<TQString, TQString> operator[](int i) const { return qMakePair(theTypes[i], theNames[i]); } const TQString &name(int i) const { return theNames[i]; } const TQString &type(int i) const { return theTypes[i]; } const TQString &returnType() const { return theReturn; } diff --git a/tdelirc/tdelirc/remoteserver.cpp b/tdelirc/tdelirc/remoteserver.cpp index dafa67d..e197578 100644 --- a/tdelirc/tdelirc/remoteserver.cpp +++ b/tdelirc/tdelirc/remoteserver.cpp @@ -58,7 +58,7 @@ void Remote::loadFromFile(const TQString &fileName) curRB = 0; TQFile xmlFile(fileName); - TQXmlInputSource source(TQT_TQIODEVICE(&xmlFile)); + TQXmlInputSource source(&xmlFile); TQXmlSimpleReader reader; reader.setContentHandler(this); reader.parse(source); |