6 files changed, 11 insertions, 13 deletions
diff --git a/kmilo/thinkpad/CMakeLists.txt b/kmilo/thinkpad/CMakeLists.txt
index 95c5927..148d03b 100644
--- a/kmilo/thinkpad/CMakeLists.txt
+++ b/kmilo/thinkpad/CMakeLists.txt
@@ -40,5 +40,5 @@ tde_add_kpart( kmilo_thinkpad AUTOMOC
 tde_create_translated_desktop(
   SOURCE kmilo_thinkpad.desktop
   DESTINATION ${SERVICES_INSTALL_DIR}/kmilo
-  PO_DIR ${CMAKE_SOURCE_DIR}/translations/desktop_files/kmilo-desktops
+  PO_DIR kmilo-desktops
 )
diff --git a/kmilo/thinkpad/kcmthinkpad/CMakeLists.txt b/kmilo/thinkpad/kcmthinkpad/CMakeLists.txt
index c3568f2..d550a6c 100644
--- a/kmilo/thinkpad/kcmthinkpad/CMakeLists.txt
+++ b/kmilo/thinkpad/kcmthinkpad/CMakeLists.txt
@@ -39,5 +39,5 @@ tde_add_kpart( kcm_thinkpad AUTOMOC
 tde_create_translated_desktop(
   SOURCE thinkpad.desktop
   DESTINATION ${XDG_APPS_INSTALL_DIR}
-  PO_DIR ${CMAKE_SOURCE_DIR}/translations/desktop_files/kmilo-desktops
+  PO_DIR kmilo-desktops
 )
diff --git a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui
index 0951321..f87cf7a 100644
--- a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui
+++ b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui
@@ -282,18 +282,16 @@
     <tabstop>commandExecMail</tabstop>
 </tabstops>
 <includes>
-    <include location="local" impldecl="in implementation">kcmthinkpad_general.ui.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="local"  impldecl="in implementation">kcmthinkpad_general.ui.h</include>
 </includes>
-<Q_SIGNALS>
+<signals>
     <signal>changed();</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
     <slot>slotChanged()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp
index 9113f36..fd893d6 100644
--- a/kmilo/thinkpad/kcmthinkpad/main.cpp
+++ b/kmilo/thinkpad/kcmthinkpad/main.cpp
@@ -122,7 +122,7 @@ KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const T
 		m_KCMThinkpadGeneral->tlOff->setText(i18n("Thinkpad Buttons KMilo Plugin Ready For Configuration"));
 	}
 
-	connect( m_KCMThinkpadGeneral, TQT_SIGNAL(changed()), TQT_SLOT(changed()));
+	connect( m_KCMThinkpadGeneral, TQ_SIGNAL(changed()), TQ_SLOT(changed()));
 
 }
 
diff --git a/kmilo/thinkpad/kcmthinkpad/main.h b/kmilo/thinkpad/kcmthinkpad/main.h
index d7c8682..174ea38 100644
--- a/kmilo/thinkpad/kcmthinkpad/main.h
+++ b/kmilo/thinkpad/kcmthinkpad/main.h
@@ -30,7 +30,7 @@
 class KCMThinkPadGeneral;
 
 class KCMThinkpadModule : public TDECModule {
-	Q_OBJECT
+	TQ_OBJECT
   
 
  public:
diff --git a/kmilo/thinkpad/thinkpad.cpp b/kmilo/thinkpad/thinkpad.cpp
index 16e22a9..50bc532 100644
--- a/kmilo/thinkpad/thinkpad.cpp
+++ b/kmilo/thinkpad/thinkpad.cpp
@@ -461,7 +461,7 @@ bool ThinkPadMonitor::retrieveVolume() {
 	}
 
 	if (kmix_error) { // maybe the error occurred because kmix wasn't running
-		if (kapp->startServiceByDesktopName("kmix")==0) { // trying to start kmix
+		if (tdeApp->startServiceByDesktopName("kmix")==0) { // trying to start kmix
 			// trying again
 			reply = kmixClient->call("masterVolume");
 			if (reply.isValid())  {