15 files changed, 51 insertions, 158 deletions
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 &amp;)</slot>
     <slot>slotClearIcon()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">kicondialog.h</include>
diff --git a/tdelirc/kcmlirc/kcmlirc.cpp b/tdelirc/kcmlirc/kcmlirc.cpp
index 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 &amp; newText )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>