diff options
Diffstat (limited to 'kmilo/kmilo_kvaio')
| -rw-r--r-- | kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui | 8 | ||||
| -rw-r--r-- | kmilo/kmilo_kvaio/kcmkvaio/main.cpp | 10 | ||||
| -rw-r--r-- | kmilo/kmilo_kvaio/kmilo_kvaio.h | 2 | ||||
| -rw-r--r-- | kmilo/kmilo_kvaio/kvaio.cpp | 8 | ||||
| -rw-r--r-- | kmilo/kmilo_kvaio/kvaiodriverinterface.cpp | 2 |
5 files changed, 15 insertions, 15 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/kmilo_kvaio.h b/kmilo/kmilo_kvaio/kmilo_kvaio.h index 0f8e81b..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> 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/kvaiodriverinterface.cpp b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp index eb8c5e4..e8e8541 100644 --- a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp +++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp @@ -97,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; } |