summaryrefslogtreecommitdiffstats
path: root/kmilo
diff options
context:
space:
mode:
Diffstat (limited to 'kmilo')
-rw-r--r--kmilo/delli8k/delli8k.cpp5
-rw-r--r--kmilo/delli8k/i8k.h4
-rw-r--r--kmilo/generic/generic_monitor.cpp90
-rw-r--r--kmilo/generic/generic_monitor.h7
-rw-r--r--kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui8
-rw-r--r--kmilo/kmilo_kvaio/kcmkvaio/main.cpp10
-rw-r--r--kmilo/kmilo_kvaio/kcmkvaio/main.h2
-rw-r--r--kmilo/kmilo_kvaio/kmilo_kvaio.h4
-rw-r--r--kmilo/kmilo_kvaio/kvaio.cpp8
-rw-r--r--kmilo/kmilo_kvaio/kvaio.h2
-rw-r--r--kmilo/kmilo_kvaio/kvaiodriverinterface.cpp9
-rw-r--r--kmilo/kmilo_kvaio/kvaiodriverinterface.h2
-rw-r--r--kmilo/kmilo_kvaio/sonypi.h2
-rw-r--r--kmilo/kmilod/defaultskin.cpp4
-rw-r--r--kmilo/kmilod/defaultskin.h2
-rw-r--r--kmilo/kmilod/displayskin.h4
-rw-r--r--kmilo/kmilod/kmilod.cpp4
-rw-r--r--kmilo/kmilod/kmilod.h2
-rw-r--r--kmilo/kmilod/kmilointerface.h2
-rw-r--r--kmilo/kmilod/monitor.h4
-rw-r--r--kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui14
-rw-r--r--kmilo/thinkpad/kcmthinkpad/main.cpp2
-rw-r--r--kmilo/thinkpad/kcmthinkpad/main.h2
-rw-r--r--kmilo/thinkpad/thinkpad.cpp2
24 files changed, 104 insertions, 91 deletions
diff --git a/kmilo/delli8k/delli8k.cpp b/kmilo/delli8k/delli8k.cpp
index d63c8c7..2bcb9ed 100644
--- a/kmilo/delli8k/delli8k.cpp
+++ b/kmilo/delli8k/delli8k.cpp
@@ -31,6 +31,7 @@
#include "kmilointerface.h"
#include <fcntl.h>
+#include <unistd.h>
#include <sys/ioctl.h>
#include "i8k.h"
@@ -144,7 +145,7 @@ bool DellI8kMonitor::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");
@@ -209,7 +210,7 @@ bool DellI8kMonitor::retrieveMute()
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" );
diff --git a/kmilo/delli8k/i8k.h b/kmilo/delli8k/i8k.h
index 1c45ba5..a8b16fd 100644
--- a/kmilo/delli8k/i8k.h
+++ b/kmilo/delli8k/i8k.h
@@ -20,6 +20,10 @@
#define I8K_PROC "/proc/i8k"
#define I8K_PROC_FMT "1.0"
+#ifdef Q_OS_SOLARIS
+#include <sys/ioccom.h>
+#endif
+
#define I8K_BIOS_VERSION _IOR ('i', 0x80, int) /* broken: meant 4 bytes */
#define I8K_MACHINE_ID _IOR ('i', 0x81, int) /* broken: meant 16 bytes */
#define I8K_POWER_STATUS _IOR ('i', 0x82, size_t)
diff --git a/kmilo/generic/generic_monitor.cpp b/kmilo/generic/generic_monitor.cpp
index 739b266..2c15ad5 100644
--- a/kmilo/generic/generic_monitor.cpp
+++ b/kmilo/generic/generic_monitor.cpp
@@ -24,7 +24,7 @@
#include <kgenericfactory.h>
#include <kdebug.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdeconfig.h>
#include <sys/types.h>
@@ -35,6 +35,7 @@
#include <tqmessagebox.h>
#include <tqfile.h>
#include <tqdir.h>
+#include <tqtimer.h>
#define CONFIG_FILE "kmilodrc"
@@ -51,27 +52,27 @@ struct ShortcutInfo
static const ShortcutInfo shortcuts[] =
{
- { "Search", TDEShortcut("XF86Search"), TQT_SLOT(launchSearch()) },
- { "Home Folder", TDEShortcut("XF86MyComputer"), TQT_SLOT(launchHomeFolder()) },
- { "Mail", TDEShortcut("XF86Mail"), TQT_SLOT(launchMail()) },
- { "Audio Media", TDEShortcut("XF86AudioMedia"), TQT_SLOT(launchMusic()) },
- { "Music", TDEShortcut("XF86Music"), TQT_SLOT(launchMusic()) },
- { "Browser", TDEShortcut("XF86WWW"), TQT_SLOT(launchBrowser()) },
- { "Calculator", TDEShortcut("XF86Calculator"), TQT_SLOT(launchCalculator()) },
- { "Terminal", TDEShortcut("XF86Terminal"), TQT_SLOT(launchTerminal()) },
- { "Eject", TDEShortcut("XF86Eject"), TQT_SLOT(eject()) },
- { "Help", TDEShortcut("XF86Launch0"), TQT_SLOT(launchHelp()) },
- { "Light Bulb", TDEShortcut("XF86LightBulb"), TQT_SLOT(lightBulb()) },
- { "Battery", TDEShortcut("XF86LaunchB"), TQT_SLOT(pmBattery()) },
- { "FastVolumeUp", TQt::Key_VolumeUp, TQT_SLOT(fastVolumeUp()) },
- { "FastVolumeDown", TQt::Key_VolumeDown, TQT_SLOT(fastVolumeDown()) },
- { "SlowVolumeUp", TQt::CTRL+TQt::Key_VolumeUp, TQT_SLOT(slowVolumeUp()) },
- { "SlowVolumeDown", TQt::CTRL+TQt::Key_VolumeDown, TQT_SLOT(slowVolumeDown()) },
- { "Mute", TDEShortcut("XF86AudioMute"), TQT_SLOT(toggleMute()) },
- { "BrightnessUp", TDEShortcut("XF86MonBrightnessUp"), TQT_SLOT(brightnessUp()) },
- { "BrightnessDown", TDEShortcut("XF86MonBrightnessDown"), TQT_SLOT(brightnessDown()) },
- { "BrightnessSlowUp", TDEShortcut("Ctrl+XF86MonBrightnessUp"), TQT_SLOT(brightnessSlowUp()) },
- { "BrightnessSlowDown", TDEShortcut("Ctrl+XF86MonBrightnessDown"), TQT_SLOT(brightnessSlowDown()) }
+ { "Search", TDEShortcut("XF86Search"), TQ_SLOT(launchSearch()) },
+ { "Home Folder", TDEShortcut("XF86MyComputer"), TQ_SLOT(launchHomeFolder()) },
+ { "Mail", TDEShortcut("XF86Mail"), TQ_SLOT(launchMail()) },
+ { "Audio Media", TDEShortcut("XF86AudioMedia"), TQ_SLOT(launchMusic()) },
+ { "Music", TDEShortcut("XF86Music"), TQ_SLOT(launchMusic()) },
+ { "Browser", TDEShortcut("XF86WWW"), TQ_SLOT(launchBrowser()) },
+ { "Calculator", TDEShortcut("XF86Calculator"), TQ_SLOT(launchCalculator()) },
+ { "Terminal", TDEShortcut("XF86Terminal"), TQ_SLOT(launchTerminal()) },
+ { "Eject", TDEShortcut("XF86Eject"), TQ_SLOT(eject()) },
+ { "Help", TDEShortcut("XF86Launch0"), TQ_SLOT(launchHelp()) },
+ { "Light Bulb", TDEShortcut("XF86LightBulb"), TQ_SLOT(lightBulb()) },
+ { "Battery", TDEShortcut("XF86LaunchB"), TQ_SLOT(pmBattery()) },
+ { "FastVolumeUp", TQt::Key_VolumeUp, TQ_SLOT(fastVolumeUp()) },
+ { "FastVolumeDown", TQt::Key_VolumeDown, TQ_SLOT(fastVolumeDown()) },
+ { "SlowVolumeUp", TQt::CTRL+TQt::Key_VolumeUp, TQ_SLOT(slowVolumeUp()) },
+ { "SlowVolumeDown", TQt::CTRL+TQt::Key_VolumeDown, TQ_SLOT(slowVolumeDown()) },
+ { "Mute", TDEShortcut("XF86AudioMute"), TQ_SLOT(toggleMute()) },
+ { "BrightnessUp", TDEShortcut("XF86MonBrightnessUp"), TQ_SLOT(brightnessUp()) },
+ { "BrightnessDown", TDEShortcut("XF86MonBrightnessDown"), TQ_SLOT(brightnessDown()) },
+ { "BrightnessSlowUp", TDEShortcut("Ctrl+XF86MonBrightnessUp"), TQ_SLOT(brightnessSlowUp()) },
+ { "BrightnessSlowDown", TDEShortcut("Ctrl+XF86MonBrightnessDown"), TQ_SLOT(brightnessSlowDown()) }
};
GenericMonitor::GenericMonitor(TQObject *parent, const char *name, const TQStringList& args)
@@ -146,7 +147,7 @@ bool GenericMonitor::retrieveVolume(int &volume)
// maybe the error occurred because kmix wasn't running. Try to start it
_interface->displayText(i18n("Starting KMix..."));
- if (kapp->startServiceByDesktopName("kmix") == 0)
+ if (tdeApp->startServiceByDesktopName("kmix") == 0)
{
// trying again
reply = kmixClient->call("volume");
@@ -214,7 +215,7 @@ bool GenericMonitor::retrieveMute(bool &muted)
// maybe the error occurred because kmix wasn't running. Try to start it
_interface->displayText(i18n("Starting KMix..."));
- if (kapp->startServiceByDesktopName("kmix") == 0)
+ if (tdeApp->startServiceByDesktopName("kmix") == 0)
{
// trying again
reply = kmixClient->call("mute");
@@ -275,33 +276,30 @@ void GenericMonitor::brightnessSlowDown()
void GenericMonitor::brightnessChange(int direction, int step)
{
- if (!tdepowersave)
+ if (!tdepowersave || direction == 0)
{
return;
}
+ if (direction > 0)
+ {
+ tdepowersave->call("do_brightnessUp", step);
+ }
+ else
+ {
+ tdepowersave->call("do_brightnessDown", step);
+ }
+ TQTimer::singleShot(250, this, TQ_SLOT(brightnessValueUpdate()));
+}
+
+void GenericMonitor::brightnessValueUpdate()
+{
DCOPReply reply = tdepowersave->call("brightnessGet");
if (reply.isValid())
{
- int brightnessLevel = 100 + (int)reply; // reply value is a negative number between 0 and -100.
- brightnessLevel += direction * step; // add requested brightness step
- if (brightnessLevel > 100)
- {
- brightnessLevel = 100;
- }
- if (brightnessLevel < 0)
- {
- brightnessLevel = 0;
- }
- if (direction > 0)
- {
- tdepowersave->send("do_brightnessUp", step);
- }
- else if (direction < 0)
- {
- tdepowersave->send("do_brightnessDown", step);
- }
- _interface->displayProgress(i18n("Brightness"), brightnessLevel);
+ // Display real brightness value. This may differ from the set value
+ // on machines with few brightness steps.
+ _interface->displayProgress(i18n("Brightness"), (int)reply);
}
}
@@ -326,12 +324,12 @@ void GenericMonitor::launch(TQString configKey, TQString defaultApplication)
void GenericMonitor::launchMail()
{
kdDebug() << "launchMail" << endl;
- kapp->invokeMailer("", "", "", "", "", "", "", "");
+ tdeApp->invokeMailer("", "", "", "", "", "", "", "");
}
void GenericMonitor::launchBrowser()
{
- kapp->invokeBrowser("");
+ tdeApp->invokeBrowser("");
}
void GenericMonitor::launchSearch()
diff --git a/kmilo/generic/generic_monitor.h b/kmilo/generic/generic_monitor.h
index 6968d2c..b986677 100644
--- a/kmilo/generic/generic_monitor.h
+++ b/kmilo/generic/generic_monitor.h
@@ -25,7 +25,7 @@
#define _GENERICMONITOR_H_
#include <tdemainwindow.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
#include <dcopref.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
@@ -37,7 +37,7 @@ namespace KMilo {
class GenericMonitor : public Monitor
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -71,6 +71,9 @@ public slots:
void lightBulb();
void pmBattery();
+private slots:
+ void brightnessValueUpdate();
+
private:
void volumeChange(int direction, int percentage);
bool retrieveMute(bool &muted);
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 */
diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp
index ac983fd..156f2ac 100644
--- a/kmilo/kmilod/defaultskin.cpp
+++ b/kmilo/kmilod/defaultskin.cpp
@@ -38,10 +38,10 @@
DefaultSkin::DefaultSkin() {
- connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()));
+ connect(&_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()));
_widget = new DefaultWidget(0, "Screen Indicator", TQt::WX11BypassWM);
- _widget->setFocusPolicy(TQ_NoFocus);
+ _widget->setFocusPolicy(TQWidget::NoFocus);
KWin::setOnAllDesktops(_widget->winId(), true);
KWin::setState( _widget->winId(), NET::StaysOnTop | NET::Sticky
diff --git a/kmilo/kmilod/defaultskin.h b/kmilo/kmilod/defaultskin.h
index 48badba..1e6cc55 100644
--- a/kmilo/kmilod/defaultskin.h
+++ b/kmilo/kmilod/defaultskin.h
@@ -30,7 +30,7 @@
class DefaultWidget;
class DefaultSkin : public TQObject, public KMilo::DisplaySkin {
- Q_OBJECT
+ TQ_OBJECT
public:
DefaultSkin();
diff --git a/kmilo/kmilod/displayskin.h b/kmilo/kmilod/displayskin.h
index dbeebe6..6f21917 100644
--- a/kmilo/kmilod/displayskin.h
+++ b/kmilo/kmilod/displayskin.h
@@ -22,14 +22,14 @@
#ifndef _DISPLAYSKIN_H_
#define _DISPLAYSKIN_H_
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <tqstring.h>
#include <tqpixmap.h>
namespace KMilo {
-class KDE_EXPORT DisplaySkin {
+class TDE_EXPORT DisplaySkin {
public:
DisplaySkin();
virtual ~DisplaySkin();
diff --git a/kmilo/kmilod/kmilod.cpp b/kmilo/kmilod/kmilod.cpp
index 07d72aa..1598bb5 100644
--- a/kmilo/kmilod/kmilod.cpp
+++ b/kmilo/kmilod/kmilod.cpp
@@ -42,7 +42,7 @@
using namespace KMilo;
extern "C" {
- KDE_EXPORT KDEDModule *create_kmilod(const TQCString &name) {
+ TDE_EXPORT KDEDModule *create_kmilod(const TQCString &name) {
return new KMiloD(name);
}
}
@@ -79,7 +79,7 @@ KMiloD::KMiloD(const TQCString &name) : KDEDModule(name), _interval(100)
}
// Start the timer
- TQObject::connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doTimer()));
+ TQObject::connect(&_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doTimer()));
if (shouldPoll) {
_timer.start(_interval);
}
diff --git a/kmilo/kmilod/kmilod.h b/kmilo/kmilod/kmilod.h
index 232a4b5..58d9fd5 100644
--- a/kmilo/kmilod/kmilod.h
+++ b/kmilo/kmilod/kmilod.h
@@ -34,7 +34,7 @@ namespace KMilo {
class KMiloInterface;
class KMiloD : public KDEDModule {
- Q_OBJECT
+ TQ_OBJECT
//
K_DCOP
public:
diff --git a/kmilo/kmilod/kmilointerface.h b/kmilo/kmilod/kmilointerface.h
index d420543..540b565 100644
--- a/kmilo/kmilod/kmilointerface.h
+++ b/kmilo/kmilod/kmilointerface.h
@@ -30,7 +30,7 @@ namespace KMilo {
// FIXME: make put the methods into .cpp file when the header is installed.
class KMiloInterface : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
KMiloInterface(KMiloD *p) : TQObject() { _p = p; }
diff --git a/kmilo/kmilod/monitor.h b/kmilo/kmilod/monitor.h
index 9dc9127..771615c 100644
--- a/kmilo/kmilod/monitor.h
+++ b/kmilo/kmilod/monitor.h
@@ -27,14 +27,14 @@
#include <tqpixmap.h>
#include <tqobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
class TDEConfig;
namespace KMilo {
class KMiloInterface;
-class KDE_EXPORT Monitor : public TQObject {
+class TDE_EXPORT Monitor : public TQObject {
public:
Monitor(TQObject *parent, const char *name, const TQStringList&);
virtual ~Monitor();
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()) {
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 10:13:20 +0000