diff options
Diffstat (limited to 'kmilo')
39 files changed, 235 insertions, 315 deletions
diff --git a/kmilo/asus/CMakeLists.txt b/kmilo/asus/CMakeLists.txt index a0c0dfa..6c4bc70 100644 --- a/kmilo/asus/CMakeLists.txt +++ b/kmilo/asus/CMakeLists.txt @@ -38,5 +38,5 @@ tde_add_kpart( kmilo_asus AUTOMOC tde_create_translated_desktop( SOURCE kmilo_asus.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kmilo - PO_DIR ${CMAKE_SOURCE_DIR}/translations/desktop_files/kmilo-desktops + PO_DIR kmilo-desktops ) diff --git a/kmilo/delli8k/CMakeLists.txt b/kmilo/delli8k/CMakeLists.txt index e8655e7..29cd516 100644 --- a/kmilo/delli8k/CMakeLists.txt +++ b/kmilo/delli8k/CMakeLists.txt @@ -38,5 +38,5 @@ tde_add_kpart( kmilo_delli8k AUTOMOC tde_create_translated_desktop( SOURCE kmilo_delli8k.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kmilo - PO_DIR ${CMAKE_SOURCE_DIR}/translations/desktop_files/kmilo-desktops + PO_DIR kmilo-desktops ) 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/demo/CMakeLists.txt b/kmilo/demo/CMakeLists.txt index a5ec42d..d5738c3 100644 --- a/kmilo/demo/CMakeLists.txt +++ b/kmilo/demo/CMakeLists.txt @@ -36,5 +36,5 @@ tde_add_kpart( kmilo_demo AUTOMOC tde_create_translated_desktop( SOURCE kmilo_demo.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kmilo - PO_DIR ${CMAKE_SOURCE_DIR}/translations/desktop_files/kmilo-desktops + PO_DIR kmilo-desktops ) diff --git a/kmilo/generic/CMakeLists.txt b/kmilo/generic/CMakeLists.txt index 6ee0492..a515424 100644 --- a/kmilo/generic/CMakeLists.txt +++ b/kmilo/generic/CMakeLists.txt @@ -38,5 +38,5 @@ tde_add_kpart( kmilo_generic AUTOMOC tde_create_translated_desktop( SOURCE kmilo_generic.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kmilo - PO_DIR ${CMAKE_SOURCE_DIR}/translations/desktop_files/kmilo-desktops + PO_DIR kmilo-desktops ) diff --git a/kmilo/generic/generic_monitor.cpp b/kmilo/generic/generic_monitor.cpp index 9017f70..2c15ad5 100644 --- a/kmilo/generic/generic_monitor.cpp +++ b/kmilo/generic/generic_monitor.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*- /* This file is part of the KDE project @@ -25,7 +24,7 @@ #include <kgenericfactory.h> #include <kdebug.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeconfig.h> #include <sys/types.h> @@ -36,33 +35,63 @@ #include <tqmessagebox.h> #include <tqfile.h> #include <tqdir.h> +#include <tqtimer.h> #define CONFIG_FILE "kmilodrc" using namespace KMilo; +// now the key data (from kkeyserver_x11.h and $TQTDIR/include/tqnamespace.h) +struct ShortcutInfo +{ + const char* name; + int symbol; + const char *slot; +}; + +static const ShortcutInfo shortcuts[] = +{ + { "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) -: Monitor(parent, name, args), kmixClient(NULL), kmixWindow(NULL), tdepowersave(NULL) +: Monitor(parent, name, args), kmixClient(NULL), kmixWindow(NULL), tdepowersave(NULL), + m_progress(0), m_displayType(Monitor::None) { _poll = false; - m_displayType = Monitor::None; - - m_mute = false; - m_progress = 0; - m_minVolume = 0; - m_maxVolume = 100; - m_volume = 50; } GenericMonitor::~GenericMonitor() { - if(ga) { - ga->remove("FastVolumeUp"); - ga->remove("FastVolumeDown"); - ga->remove("SlowVolumeUp"); - ga->remove("SlowVolumeDown"); - ga->remove("Mute"); + if (ga) + { + int len = (int)sizeof(shortcuts)/sizeof(ShortcutInfo); + for (int i = 0; i < len; i++) + { + ga->remove(shortcuts[i].name); + } + ga->updateConnections(); delete ga; } } @@ -75,27 +104,6 @@ bool GenericMonitor::init() if(!m_enabled) return false; // exit early if we are not supposed to run - 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(mute()) }, - { "BrightnessUp", TDEShortcut("XF86MonBrightnessUp"), TQT_SLOT(brightnessUp()) }, - { "BrightnessDown", TDEShortcut("XF86MonBrightnessDown"), TQT_SLOT(brightnessDown()) } - }; ga = new TDEGlobalAccel(this, "miloGenericAccel"); @@ -113,7 +121,7 @@ bool GenericMonitor::init() ga->readSettings(); ga->updateConnections(); - kmixClient = new DCOPRef("kmix", "Mixer0"); + kmixClient = new DCOPRef("kmix", "kmix"); kmixWindow = new DCOPRef("kmix", "kmix-mainwindow#1"); tdepowersave = new DCOPRef("tdepowersave", "tdepowersaveIface"); @@ -123,114 +131,72 @@ bool GenericMonitor::init() void GenericMonitor::reconfigure(TDEConfig *config) { config->setGroup("generic monitor"); - - m_volumeDeviceIdx = config->readNumEntry("volumeDeviceIdx", -1); - m_muteDeviceIdx = config->readNumEntry("muteDeviceIdx", m_volumeDeviceIdx); - m_extraDeviceIdx = config->readNumEntry("extraDeviceIdx", -1); m_volumeStepFast = config->readNumEntry("volumeStepFast", 10); m_volumeStepSlow = config->readNumEntry("volumeStepSlow", 1); m_enabled = config->readBoolEntry("enabled", true); } -bool GenericMonitor::retrieveKmixDevices() +bool GenericMonitor::retrieveVolume(int &volume) { - if(m_volumeDeviceIdx != -1 && m_muteDeviceIdx != -1) - return true; // both indexes already set - - DCOPReply reply = kmixClient->call("masterDeviceIndex"); - if (!reply.isValid()) - { // maybe the error occurred because kmix wasn't running - _interface->displayText(i18n("Starting KMix...")); - if (kapp->startServiceByDesktopName("kmix")==0) // trying to start kmix - { - reply = kmixClient->call("masterDeviceIndex"); - if (reply.isValid()) - kmixWindow->send("hide"); - } - } - - if (!reply.isValid()) + DCOPReply reply = kmixClient->call("volume"); + if (reply.isValid()) { - kdDebug() << "KMilo: GenericMonitor could not access kmix/Mixer0 via dcop" - << endl; - _interface->displayText(i18n("It seems that KMix is not running.")); - - return false; - } else { - if (m_volumeDeviceIdx == -1) - m_volumeDeviceIdx = reply; - if (m_muteDeviceIdx == -1) - m_muteDeviceIdx = m_volumeDeviceIdx; // this is the behaviour documented in README + volume = reply; return true; } + + // maybe the error occurred because kmix wasn't running. Try to start it + _interface->displayText(i18n("Starting KMix...")); + if (tdeApp->startServiceByDesktopName("kmix") == 0) + { + // trying again + reply = kmixClient->call("volume"); + if (reply.isValid()) + { + volume = reply; + kmixWindow->send("hide"); + return true; + } + } + kdDebug() << "KMilo: GenericMonitor could not access kmix via dcop" << endl; + _interface->displayText(i18n("It seems that KMix is not running.")); + return false; } -bool GenericMonitor::retrieveVolume() +void GenericMonitor::volumeChange(int direction, int percentage) { - bool kmix_error = false; - - if(!retrieveKmixDevices()) - return false; - - DCOPReply reply = kmixClient->call("absoluteVolume", m_volumeDeviceIdx); - if (reply.isValid()) - m_volume = reply; - else - kmix_error = true; + int volume; + if (!direction || !retrieveVolume(volume)) + { + return; + } - if (kmix_error) // maybe the error occurred because kmix wasn't running + if (direction > 0) { - _interface->displayText(i18n("Starting KMix...")); - if (kapp->startServiceByDesktopName("kmix")==0) // trying to start kmix + volume += percentage; + if (volume > 100) { - // trying again - reply = kmixClient->call("absoluteVolume", m_volumeDeviceIdx); - if (reply.isValid()) - { - m_volume = reply; - kmix_error = false; - kmixWindow->send("hide"); - } + volume = 100; } } - - if (kmix_error) + else { - kdDebug() << "KMilo: GenericMonitor could not access kmix/Mixer0 via dcop" - << endl; - _interface->displayText(i18n("It seems that KMix is not running.")); - - return false; - } else { - reply = kmixClient->call("absoluteVolumeMax", m_volumeDeviceIdx); - m_maxVolume = reply; - reply = kmixClient->call("absoluteVolumeMin", m_volumeDeviceIdx); - m_minVolume = reply; - return true; + volume -= percentage; + if (volume < 0) + { + volume = 0; + } } -} -void GenericMonitor::volumeChange(int direction, int step) -{ - if (!retrieveVolume()) - return; + _interface->displayProgress(i18n("Volume"), volume); + kmixClient->send("setVolume", volume); - /* Following snippet of code may seem to be overcomplicated, but it works for both devices with - * volume grain < 100 (32 tested) and devices with volume grain > 100 (256 tested) while preserving - * accuracy for devices with fine grain and preserving usability for devices with rough grain. */ - int userVisibleVolume = tqRound(m_volume * 100.0 / (m_maxVolume - m_minVolume)); - userVisibleVolume += direction * step; // add requested volume step - long previousVolume = m_volume; - m_volume = tqRound(m_minVolume + userVisibleVolume * (m_maxVolume - m_minVolume) / 100.0); - if (m_volume == previousVolume) // if the change was rounded to zero - m_volume += direction; - - if (m_volume > m_maxVolume) - m_volume = m_maxVolume; - if (m_volume < m_minVolume) - m_volume = m_minVolume; - - displayVolume(); + // if mute then unmute + bool muted = false; + if (retrieveMute(muted) && muted) + { + kmixClient->send("setMute", false); + } } void GenericMonitor::slowVolumeUp() { volumeChange( 1, m_volumeStepSlow); } @@ -238,90 +204,53 @@ void GenericMonitor::slowVolumeDown() { volumeChange(-1, m_volumeStepSlow); } void GenericMonitor::fastVolumeUp() { volumeChange( 1, m_volumeStepFast); } void GenericMonitor::fastVolumeDown() { volumeChange(-1, m_volumeStepFast); } -void GenericMonitor::displayVolume() +bool GenericMonitor::retrieveMute(bool &muted) { - _interface->displayProgress(i18n("Volume"), tqRound(m_volume * 100.0 / (m_maxVolume - m_minVolume))); - - // If we got this far, the DCOP communication with kmix works, - // so we don't have to test the result. - // Also, device indexes are set to their proper values. - kmixClient->send("setAbsoluteVolume", m_volumeDeviceIdx, m_volume); - if(m_extraDeviceIdx != -1) - // for simplicity, use relative volume rather that absolute (extra precision is not needed here) - kmixClient->send("setVolume", m_extraDeviceIdx, tqRound(m_volume * 100.0 / (m_maxVolume - m_minVolume))); - - // if mute then unmute - if (m_mute) + DCOPReply reply = kmixClient->call("mute"); + if (reply.isValid()) { - m_mute = false; - kmixClient->send("setMute", m_muteDeviceIdx, m_mute); + muted = reply; + return true; } -} - -bool GenericMonitor::retrieveMute() -{ - bool kmix_error = false; - - if(!retrieveKmixDevices()) - return false; - - DCOPReply reply = kmixClient->call("mute", m_muteDeviceIdx); - if (reply.isValid()) - m_mute = reply; - else - kmix_error = true; - if (kmix_error) + // maybe the error occurred because kmix wasn't running. Try to start it + _interface->displayText(i18n("Starting KMix...")); + if (tdeApp->startServiceByDesktopName("kmix") == 0) { - // maybe the error occurred because kmix wasn't running - _interface->displayText(i18n("Starting KMix...")); - if (kapp->startServiceByDesktopName("kmix")==0) // trying to start kmix - { - // trying again - reply = kmixClient->call("mute", m_muteDeviceIdx); - if (reply.isValid()) - { - m_mute = reply; - kmix_error = false; - kmixWindow->send("hide"); - } - } else + // trying again + reply = kmixClient->call("mute"); + if (reply.isValid()) { + muted = reply; kmixWindow->send("hide"); - kmix_error = true; + return true; } } - - if (kmix_error) - { - kdDebug() << "KMilo: GenericMonitor could not access kmix/Mixer0 via dcop" - << endl; - _interface->displayText(i18n("It seems that KMix is not running.")); - - return false; - } else { - return true; - } + kdDebug() << "KMilo: GenericMonitor could not access kmix via dcop" << endl; + _interface->displayText(i18n("It seems that KMix is not running.")); + return false; } -void GenericMonitor::mute() +void GenericMonitor::toggleMute() { - if (!retrieveMute()) + bool muted = false; + if (!retrieveMute(muted)) + { return; + } - m_mute = !m_mute; + muted = !muted; TQString muteText; - if (m_mute) + if (muted) { - muteText = i18n("Mute on"); - } else { - muteText = i18n("Mute off"); + muteText = i18n("System muted"); + } + else + { + muteText = i18n("System unmuted"); } - kmixClient->send("setMute", m_muteDeviceIdx, m_mute); - if(m_extraDeviceIdx != -1) - kmixClient->send("setMute", m_extraDeviceIdx, m_mute); - + kmixClient->send("setMute", muted); _interface->displayText(muteText); } @@ -335,44 +264,51 @@ void GenericMonitor::brightnessDown() brightnessChange(-1, 10); } +void GenericMonitor::brightnessSlowUp() +{ + brightnessChange(1, 1); +} + +void GenericMonitor::brightnessSlowDown() +{ + brightnessChange(-1, 1); +} + 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); } } -int GenericMonitor::progress() const +int GenericMonitor::progress() const { return m_progress; } -Monitor::DisplayType GenericMonitor::poll() +Monitor::DisplayType GenericMonitor::poll() { return m_displayType; } @@ -388,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 9305ac3..b986677 100644 --- a/kmilo/generic/generic_monitor.h +++ b/kmilo/generic/generic_monitor.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*- /* This file is part of the KDE project @@ -26,7 +25,7 @@ #define _GENERICMONITOR_H_ #include <tdemainwindow.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <dcopref.h> #include <tdeapplication.h> #include <tdeconfig.h> @@ -36,18 +35,9 @@ namespace KMilo { -// now the key data (from kkeyserver_x11.h and $TQTDIR/include/tqnamespace.h) -struct ShortcutInfo -{ - const char* name; - uint symbol; - const char *slot; -}; - - class GenericMonitor : public Monitor { - Q_OBJECT + TQ_OBJECT public: @@ -64,9 +54,11 @@ public slots: void slowVolumeDown(); void fastVolumeUp(); void fastVolumeDown(); - void mute(); + void toggleMute(); void brightnessUp(); void brightnessDown(); + void brightnessSlowUp(); + void brightnessSlowDown(); void launchMail(); void launchBrowser(); void launchSearch(); @@ -79,12 +71,13 @@ public slots: void lightBulb(); void pmBattery(); +private slots: + void brightnessValueUpdate(); + private: - bool retrieveKmixDevices(); - void volumeChange(int direction, int step); - bool retrieveMute(); - bool retrieveVolume(); - void displayVolume(); + void volumeChange(int direction, int percentage); + bool retrieveMute(bool &muted); + bool retrieveVolume(int &volume); void brightnessChange(int direction, int step); void launch(TQString configKey, TQString defaultApplication); @@ -94,14 +87,9 @@ private: DCOPRef *kmixClient, *kmixWindow, *tdepowersave; int m_progress; - long m_volume; - bool m_mute; - - long m_maxVolume, m_minVolume; // following properties are read from config file: int m_volumeStepFast, m_volumeStepSlow; - int m_volumeDeviceIdx, m_muteDeviceIdx, m_extraDeviceIdx; bool m_enabled; Monitor::DisplayType m_displayType; diff --git a/kmilo/kmilo_kvaio/CMakeLists.txt b/kmilo/kmilo_kvaio/CMakeLists.txt index 8a6c5b7..543fc4e 100644 --- a/kmilo/kmilo_kvaio/CMakeLists.txt +++ b/kmilo/kmilo_kvaio/CMakeLists.txt @@ -48,5 +48,5 @@ tde_add_kpart( kmilo_kvaio AUTOMOC tde_create_translated_desktop( SOURCE kmilo_kvaio.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kmilo - PO_DIR ${CMAKE_SOURCE_DIR}/translations/desktop_files/kmilo-desktops + PO_DIR kmilo-desktops ) diff --git a/kmilo/kmilo_kvaio/kcmkvaio/CMakeLists.txt b/kmilo/kmilo_kvaio/kcmkvaio/CMakeLists.txt index 3291ede..ae71b8a 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/CMakeLists.txt +++ b/kmilo/kmilo_kvaio/kcmkvaio/CMakeLists.txt @@ -38,5 +38,5 @@ tde_add_kpart( kcm_kvaio AUTOMOC tde_create_translated_desktop( SOURCE kvaio.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} - PO_DIR ${CMAKE_SOURCE_DIR}/translations/desktop_files/kmilo-desktops + PO_DIR kmilo-desktops ) 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.cpp b/kmilo/kmilo_kvaio/kmilo_kvaio.cpp index 87de2da..155df33 100644 --- a/kmilo/kmilo_kvaio/kmilo_kvaio.cpp +++ b/kmilo/kmilo_kvaio/kmilo_kvaio.cpp @@ -1,5 +1,4 @@ -/* -*- C++ -*- - +/* This file implements the KVaio module for KMilo. $ Author: Mirko Boehm $ diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.h b/kmilo/kmilo_kvaio/kmilo_kvaio.h index 851a74e..071b461 100644 --- a/kmilo/kmilo_kvaio/kmilo_kvaio.h +++ b/kmilo/kmilo_kvaio/kmilo_kvaio.h @@ -1,5 +1,4 @@ -/* -*- C++ -*- - +/* This file declares the KVaio module for KMilo. $ Author: Mirko Boehm $ @@ -23,7 +22,7 @@ #define _KMILO_KVAIO_H_ #include <tdemainwindow.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <dcopref.h> #include <tdeapplication.h> @@ -34,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 a7c28d5..c9b114d 100644 --- a/kmilo/kmilo_kvaio/kvaio.cpp +++ b/kmilo/kmilo_kvaio/kvaio.cpp @@ -1,5 +1,4 @@ -/* -*- C++ -*- - +/* This file implements the KVaio class. $ Author: Mirko Boehm $ @@ -70,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); } @@ -479,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"); @@ -546,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 5f6170b..0ee3a5c 100644 --- a/kmilo/kmilo_kvaio/kvaio.h +++ b/kmilo/kmilo_kvaio/kvaio.h @@ -1,5 +1,4 @@ -/* -*- C++ -*- - +/* This file declares the KVaio class. $ Author: Mirko Boehm $ @@ -55,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 088ae51..e8e8541 100644 --- a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp +++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp @@ -1,5 +1,4 @@ -/* -*- C++ -*- - +/* This file implements the KVaioDriverInterface class. It provides an event-oriented wrapper for the kernel sonypi driver. @@ -30,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> @@ -91,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 3371786..3e41ac6 100644 --- a/kmilo/kmilo_kvaio/kvaiodriverinterface.h +++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.h @@ -1,5 +1,4 @@ -/* -*- C++ -*- - +/* This file declares the KVaioDrierInterface class. It provides an event-oriented wrapper for the kernel sonypi driver. @@ -34,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/CMakeLists.txt b/kmilo/kmilod/CMakeLists.txt index 2bce8c2..f7a1921 100644 --- a/kmilo/kmilod/CMakeLists.txt +++ b/kmilo/kmilod/CMakeLists.txt @@ -47,11 +47,11 @@ tde_add_kpart( kded_kmilod AUTOMOC tde_create_translated_desktop( SOURCE kmilod.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded - PO_DIR ${CMAKE_SOURCE_DIR}/translations/desktop_files/kmilo-desktops + PO_DIR kmilo-desktops ) tde_create_translated_desktop( SOURCE kmilopluginsvc.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}/kmilo - PO_DIR ${CMAKE_SOURCE_DIR}/translations/desktop_files/kmilo-desktops + PO_DIR kmilo-desktops ) diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp index 1320f25..156f2ac 100644 --- a/kmilo/kmilod/defaultskin.cpp +++ b/kmilo/kmilod/defaultskin.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*- /* This file is part of the KDE project @@ -39,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 2399d83..1e6cc55 100644 --- a/kmilo/kmilod/defaultskin.h +++ b/kmilo/kmilod/defaultskin.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*- /* This file is part of the KDE project @@ -31,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 46bd445..6f21917 100644 --- a/kmilo/kmilod/displayskin.h +++ b/kmilo/kmilod/displayskin.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*- /* This file is part of the KDE project @@ -23,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 3535ee0..1598bb5 100644 --- a/kmilo/kmilod/kmilod.cpp +++ b/kmilo/kmilod/kmilod.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*- /* This file is part of the KDE project @@ -43,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); } } @@ -80,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 d58ea01..58d9fd5 100644 --- a/kmilo/kmilod/kmilod.h +++ b/kmilo/kmilod/kmilod.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*- /* This file is part of the KDE project @@ -35,7 +34,7 @@ namespace KMilo { class KMiloInterface; class KMiloD : public KDEDModule { - Q_OBJECT + TQ_OBJECT // K_DCOP public: diff --git a/kmilo/kmilod/kmilointerface.cpp b/kmilo/kmilod/kmilointerface.cpp index 21a6430..ce1b219 100644 --- a/kmilo/kmilod/kmilointerface.cpp +++ b/kmilo/kmilod/kmilointerface.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*- /* This file is part of the KDE project diff --git a/kmilo/kmilod/kmilointerface.h b/kmilo/kmilod/kmilointerface.h index 4d21185..540b565 100644 --- a/kmilo/kmilod/kmilointerface.h +++ b/kmilo/kmilod/kmilointerface.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*- /* This file is part of the KDE project @@ -31,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 e646a7e..771615c 100644 --- a/kmilo/kmilod/monitor.h +++ b/kmilo/kmilod/monitor.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*- /* This file is part of the KDE project @@ -28,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/powerbook/CMakeLists.txt b/kmilo/powerbook/CMakeLists.txt index 2cd68f5..b25a900 100644 --- a/kmilo/powerbook/CMakeLists.txt +++ b/kmilo/powerbook/CMakeLists.txt @@ -38,5 +38,5 @@ tde_add_kpart( kmilo_powerbook AUTOMOC tde_create_translated_desktop( SOURCE kmilo_powerbook.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kmilo - PO_DIR ${CMAKE_SOURCE_DIR}/translations/desktop_files/kmilo-desktops + PO_DIR kmilo-desktops ) diff --git a/kmilo/powerbook2/CMakeLists.txt b/kmilo/powerbook2/CMakeLists.txt index 2cd68f5..b25a900 100644 --- a/kmilo/powerbook2/CMakeLists.txt +++ b/kmilo/powerbook2/CMakeLists.txt @@ -38,5 +38,5 @@ tde_add_kpart( kmilo_powerbook AUTOMOC tde_create_translated_desktop( SOURCE kmilo_powerbook.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kmilo - PO_DIR ${CMAKE_SOURCE_DIR}/translations/desktop_files/kmilo-desktops + PO_DIR kmilo-desktops ) diff --git a/kmilo/powerbook2/pb_monitor.cpp b/kmilo/powerbook2/pb_monitor.cpp index 313a32d..b43cef0 100644 --- a/kmilo/powerbook2/pb_monitor.cpp +++ b/kmilo/powerbook2/pb_monitor.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*- /* This file is part of the KDE project diff --git a/kmilo/powerbook2/pb_monitor.h b/kmilo/powerbook2/pb_monitor.h index e9dfb71..dc8a4c0 100644 --- a/kmilo/powerbook2/pb_monitor.h +++ b/kmilo/powerbook2/pb_monitor.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*- /* This file is part of the KDE project 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()) { |