9 files changed, 28 insertions, 19 deletions
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui b/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui
index 6cff8c9..79ca1a3 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui
+++ b/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui
@@ -258,12 +258,12 @@
     <include location="global" impldecl="in implementation">kled.h</include>
     <include location="global" impldecl="in implementation">kprogress.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"/>
 </UI>
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
index e1522d4..ea24905 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
+++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
@@ -66,7 +66,7 @@ KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList
     layout->addWidget( mKVaioGeneral );
     layout->addStretch();
 
-    mDriver = new KVaioDriverInterface(TQT_TQOBJECT(this));
+    mDriver = new KVaioDriverInterface(this);
     mDriverAvailable = mDriver->connectToDriver(false);
     mTimer = new TQTimer(this);
     mTimer->start(231);
@@ -82,10 +82,10 @@ KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList
         // mKVaioGeneral->frameMain->setEnabled (true);
     }
 
-    connect(mKVaioGeneral, TQT_SIGNAL(changed()),
-            TQT_SLOT(changed()));
-    connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()));
-    connect(mDriver, TQT_SIGNAL (vaioEvent(int)), TQT_SLOT (vaioEvent(int) ) );
+    connect(mKVaioGeneral, TQ_SIGNAL(changed()),
+            TQ_SLOT(changed()));
+    connect(mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()));
+    connect(mDriver, TQ_SIGNAL (vaioEvent(int)), TQ_SLOT (vaioEvent(int) ) );
 }
 
 void KVaioModule::save()
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.h b/kmilo/kmilo_kvaio/kcmkvaio/main.h
index e976d40..52e04ca 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/main.h
+++ b/kmilo/kmilo_kvaio/kcmkvaio/main.h
@@ -30,7 +30,7 @@ class KCMKVaioGeneral;
 
 class KVaioModule : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.h b/kmilo/kmilo_kvaio/kmilo_kvaio.h
index dcef77f..071b461 100644
--- a/kmilo/kmilo_kvaio/kmilo_kvaio.h
+++ b/kmilo/kmilo_kvaio/kmilo_kvaio.h
@@ -22,7 +22,7 @@
 #define _KMILO_KVAIO_H_
 
 #include <tdemainwindow.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 #include <dcopref.h>
 #include <tdeapplication.h>
 
@@ -33,7 +33,7 @@
 class KVaio;
 
 class KMiloKVaio : public KMilo::Monitor {
-//	Q_OBJECT
+//	TQ_OBJECT
   
 
 	public:
diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp
index 63f50da..c9b114d 100644
--- a/kmilo/kmilo_kvaio/kvaio.cpp
+++ b/kmilo/kmilo_kvaio/kvaio.cpp
@@ -69,8 +69,8 @@ KVaio::KVaio(KMiloKVaio *parent, const char* name)
         kdDebug() << "KVaio: Cannot connect to driver." << endl;
     } else {
         kdDebug() << "KVaio: Connected to SonyPI driver." << endl;
-        connect(mDriver, TQT_SIGNAL(vaioEvent(int)), TQT_SLOT(slotVaioEvent(int)));
-	connect (mTimer, TQT_SIGNAL (timeout ()), TQT_SLOT (slotTimeout() ) );
+        connect(mDriver, TQ_SIGNAL(vaioEvent(int)), TQ_SLOT(slotVaioEvent(int)));
+	connect (mTimer, TQ_SIGNAL (timeout ()), TQ_SLOT (slotTimeout() ) );
 	mTimer->start (10000, true);
     }
 
@@ -478,7 +478,7 @@ bool KVaio::retrieveVolume() {
         {
 //                _interface->displayText
 		showTextMsg(i18n("Starting KMix..."));
-                if (kapp->startServiceByDesktopName("kmix")==0) // trying to start kmix
+                if (tdeApp->startServiceByDesktopName("kmix")==0) // trying to start kmix
                 {
                         // trying again
                         reply = kmixClient->call("masterVolume");
@@ -545,7 +545,7 @@ bool KVaio::retrieveMute()
                 // maybe the error occurred because kmix wasn't running
                 //_interface->displayText
 		showTextMsg(i18n("Starting KMix..."));
-                if (kapp->startServiceByDesktopName("kmix")==0) // trying to start kmix
+                if (tdeApp->startServiceByDesktopName("kmix")==0) // trying to start kmix
                 {
                         // trying again
                         reply = kmixClient->call("masterMute");
diff --git a/kmilo/kmilo_kvaio/kvaio.h b/kmilo/kmilo_kvaio/kvaio.h
index 867ef4c..0ee3a5c 100644
--- a/kmilo/kmilo_kvaio/kvaio.h
+++ b/kmilo/kmilo_kvaio/kvaio.h
@@ -54,7 +54,7 @@ class KMiloKVaio;
  */
 class KVaio : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 //    KVaio(TQObject *parent = 0, const char *name =0);
diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
index c10c11c..e8e8541 100644
--- a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
+++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
@@ -29,7 +29,14 @@ extern "C" {
 #include <unistd.h>
 #include <errno.h>
 #include <sys/ioctl.h>
+#ifdef Q_OS_LINUX
 #include <linux/types.h>
+#elif defined(Q_OS_SOLARIS)
+#include <sys/ioccom.h>
+#define	O_ASYNC O_DIRECT
+typedef uint8_t __u8;
+typedef uint16_t __u16;
+#endif
 #include <X11/Xlib.h>
 //#include <X11/extensions/XTest.h>
 
@@ -90,7 +97,7 @@ bool KVaioDriverInterface::connectToDriver(bool listen)
     if(listen)
         {
             mNotifier = new TQSocketNotifier(mFd,  TQSocketNotifier::Read, this);
-            connect(mNotifier, TQT_SIGNAL(activated(int)), TQT_SLOT(socketActivated(int)));
+            connect(mNotifier, TQ_SIGNAL(activated(int)), TQ_SLOT(socketActivated(int)));
         }
     return true;
 }
diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.h b/kmilo/kmilo_kvaio/kvaiodriverinterface.h
index 2ca7a46..3e41ac6 100644
--- a/kmilo/kmilo_kvaio/kvaiodriverinterface.h
+++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.h
@@ -33,7 +33,7 @@ class TQSocketNotifier;
 
 class KVaioDriverInterface : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     KVaioDriverInterface(TQObject *parent=0);
diff --git a/kmilo/kmilo_kvaio/sonypi.h b/kmilo/kmilo_kvaio/sonypi.h
index 43cfc80..658c5ed 100644
--- a/kmilo/kmilo_kvaio/sonypi.h
+++ b/kmilo/kmilo_kvaio/sonypi.h
@@ -36,7 +36,9 @@
 #ifndef _SONYPI_H_ 
 #define _SONYPI_H_
 
+#ifdef Q_OS_LINUX
 #include <linux/types.h>
+#endif /* Linux */
 
 /* events the user application reading /dev/sonypi can use */