From 4112c3b48633dac80afbe219fd9f4ee85b2be3d3 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 8 Feb 2022 23:22:23 +0900 Subject: [PATCH] Removed HAL dependant code. Signed-off-by: Michele Calgaro --- TODO | 2 -- config.h.cmake | 10 +++++- doc/doxy/main.dox | 7 +---- po/ar.po | 10 ------ po/bg.po | 13 -------- po/cs.po | 10 ------ po/da.po | 11 ------- po/de.po | 12 ------- po/el.po | 12 ------- po/es.po | 13 -------- po/fi.po | 10 ------ po/fr.po | 13 -------- po/hi.po | 12 ------- po/hu.po | 12 ------- po/it.po | 12 ------- po/ja.po | 13 -------- po/km.po | 10 ------ po/lt.po | 11 ------- po/nb.po | 10 ------ po/nl.po | 12 ------- po/pa.po | 10 ------ po/pl.po | 11 ------- po/pt.po | 12 ------- po/pt_BR.po | 13 -------- po/ru.po | 11 ------- po/sl_SI.po | 12 ------- po/sv.po | 11 ------- po/tr.po | 10 ------ po/uk.po | 11 ------- po/zh_CN.po | 10 ------ po/zh_TW.po | 10 ------ src/autodimm.cpp | 4 +++ src/autosuspend.cpp | 4 +++ src/blacklisteditdialog.cpp | 4 +++ src/configuredialog.cpp | 4 +++ src/countdowndialog.cpp | 4 +++ src/dbusInterface.cpp | 4 +++ src/dbusInterface.h | 5 --- src/detaileddialog.cpp | 4 +++ src/dummy.cpp | 4 +++ src/hardware.cpp | 16 +++++----- src/hardware.h | 5 --- src/hardware_battery.cpp | 50 ++++++++---------------------- src/hardware_battery.h | 18 +---------- src/hardware_batteryCollection.cpp | 4 +++ src/hardware_batteryCollection.h | 6 ---- src/hardware_cpu.cpp | 4 +++ src/hardware_cpu.h | 5 --- src/inactivity.cpp | 4 +++ src/infodialog.cpp | 4 +++ src/logviewer.cpp | 4 +++ src/main.cpp | 4 +++ src/screen.cpp | 4 +++ src/settings.cpp | 4 +++ src/suspenddialog.cpp | 4 +++ src/tdepowersave.cpp | 6 +++- src/tdepowersave.h | 5 --- src/tdepowersave_debug.h | 5 --- 58 files changed, 104 insertions(+), 421 deletions(-) diff --git a/TODO b/TODO index c88b4d9..c36fce0 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,3 @@ -Currently we porting KPowersave to use HAL instead of the powersave daemon. - ******************************************************************************** For more information read this: diff --git a/config.h.cmake b/config.h.cmake index 77d54c6..120d520 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1 +1,9 @@ -#cmakedefine HAVE_HAL_0_5_10 1 +#define VERSION "@VERSION@" + +// Defined if you have fvisibility and fvisibility-inlines-hidden support. +#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1 + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@ + diff --git a/doc/doxy/main.dox b/doc/doxy/main.dox index 727cf2f..d029839 100644 --- a/doc/doxy/main.dox +++ b/doc/doxy/main.dox @@ -2,7 +2,7 @@ \mainpage TDEPowersave - a KDE Kickerapplet/fontend for Powermanagement \section intro_sec Introduction TDEPowersave provides battery monitoring and suspend/standby triggers. - It is based on HAL and D-Bus and therefore supports APM, ACPI and PMU. + It supports APM, ACPI and PMU. Together with the powersave package (to provide powermanagement if TDEPowersave is not running) and the YaST Powermanagement module it is the preferred package @@ -34,11 +34,6 @@ \section using_sec Using tdepowersave This Applet work under KDE (and also GNOME). - To use tdepowersave, you need the following programms/packages: - - linux kernel 2.6.x (Homepage) - - HAL (Hardware Abstraction Layer) >= 0.5.8.1 (Homepage) - - D-Bus >= >= 0.6.x (recommended >= 0.9.x) (Homepage) - Dependig on some features you maybe need also: - PolicyKit (git repository) diff --git a/po/ar.po b/po/ar.po index ee90573..628b10f 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1578,18 +1578,12 @@ msgstr "" #~ msgid "Information" #~ msgstr "معلومات" -#~ msgid "HAL Daemon:" -#~ msgstr "HAL Daemon:" - #~ msgid "running" #~ msgstr "تشغيل" #~ msgid "not running" #~ msgstr "غير مشغل" -#~ msgid "HAL daemon:" -#~ msgstr "HAL daemon:" - #~ msgid "" #~ "The D-Bus daemon is not running.\n" #~ "Starting it will provide full functionality: /etc/init.d/dbus start" @@ -1603,10 +1597,6 @@ msgstr "" #~ msgid "ERROR" #~ msgstr "خطأ" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "لايمكن الحصول على معلومات من HAL. The haldaemon ربما يكون لايعمل." - #~ msgid "Error" #~ msgstr "خطأ" diff --git a/po/bg.po b/po/bg.po index e328970..6669101 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1608,19 +1608,12 @@ msgstr "" #~ msgid "Information" #~ msgstr "Информация" -#, fuzzy -#~ msgid "HAL Daemon:" -#~ msgstr "Демонът HAL:" - #~ msgid "running" #~ msgstr "работи" #~ msgid "not running" #~ msgstr "не работи" -#~ msgid "HAL daemon:" -#~ msgstr "Демонът HAL:" - #, fuzzy #~ msgid "" #~ "The D-Bus daemon is not running.\n" @@ -1636,12 +1629,6 @@ msgstr "" #~ msgid "ERROR" #~ msgstr "ГРЕШКА" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "" -#~ "Не може да се получи информация от HAL. Вероятно демонът HAL не е " -#~ "стартиран." - #~ msgid "Error" #~ msgstr "Грешка" diff --git a/po/cs.po b/po/cs.po index b86f0e6..8dcb43f 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1605,18 +1605,12 @@ msgstr "Uložit jako ..." #~ msgid "Close" #~ msgstr "Zavřít" -#~ msgid "HAL Daemon:" -#~ msgstr "HAL démon:" - #~ msgid "running" #~ msgstr "běží" #~ msgid "not running" #~ msgstr "neběží" -#~ msgid "HAL daemon:" -#~ msgstr "HAL démon:" - #~ msgid "" #~ "The D-Bus daemon is not running.\n" #~ "Starting it will provide full functionality: /etc/init.d/dbus start" @@ -1630,9 +1624,5 @@ msgstr "Uložit jako ..." #~ msgid "ERROR" #~ msgstr "CHYBA" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "Nelze získat informace z HAL. Potřebný hal démon možná neběží." - #~ msgid "Error" #~ msgstr "Chyba" diff --git a/po/da.po b/po/da.po index f0cad08..e492fe7 100644 --- a/po/da.po +++ b/po/da.po @@ -1603,18 +1603,12 @@ msgstr "Gem som..." #~ msgid "Close" #~ msgstr "Luk" -#~ msgid "HAL Daemon:" -#~ msgstr "HAL-dæmon:" - #~ msgid "running" #~ msgstr "kører" #~ msgid "not running" #~ msgstr "kører ikke" -#~ msgid "HAL daemon:" -#~ msgstr "HAL-dæmon:" - #~ msgid "" #~ "The D-Bus daemon is not running.\n" #~ "Starting it will provide full functionality: /etc/init.d/dbus start" @@ -1628,10 +1622,5 @@ msgstr "Gem som..." #~ msgid "ERROR" #~ msgstr "FEJL" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "" -#~ "Information fra HAL kunne ikke hentes. Haldæmonen kører muligvis ikke." - #~ msgid "Error" #~ msgstr "Fejl" diff --git a/po/de.po b/po/de.po index 7df31d6..9af93c0 100644 --- a/po/de.po +++ b/po/de.po @@ -1644,18 +1644,12 @@ msgstr "Speichern als ..." #~ msgid "Close" #~ msgstr "Schließen" -#~ msgid "HAL Daemon:" -#~ msgstr "HAL Daemon:" - #~ msgid "running" #~ msgstr "läuft" #~ msgid "not running" #~ msgstr "läuft nicht" -#~ msgid "HAL daemon:" -#~ msgstr "HAL Daemon:" - #~ msgid "" #~ "The D-Bus daemon is not running.\n" #~ "Starting it will provide full functionality: /etc/init.d/dbus start" @@ -1669,12 +1663,6 @@ msgstr "Speichern als ..." #~ msgid "ERROR" #~ msgstr "FEHLER" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "" -#~ "Kann keine Informationen von HAL erhalten. Möglicherweise läuft der HAL " -#~ "Daemon nicht." - #~ msgid "Error" #~ msgstr "Fehler" diff --git a/po/el.po b/po/el.po index cf69738..e42574e 100644 --- a/po/el.po +++ b/po/el.po @@ -1642,19 +1642,12 @@ msgstr "" #~ msgid "Information" #~ msgstr "Πληροφορίες" -#, fuzzy -#~ msgid "HAL Daemon:" -#~ msgstr "Δαίμονας HAL:" - #~ msgid "running" #~ msgstr "εκτελείται" #~ msgid "not running" #~ msgstr "δεν εκτελείται" -#~ msgid "HAL daemon:" -#~ msgstr "Δαίμονας HAL:" - #, fuzzy #~ msgid "" #~ "The D-Bus daemon is not running.\n" @@ -1670,11 +1663,6 @@ msgstr "" #~ msgid "ERROR" #~ msgstr "ΣΦΑΛΜΑ" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "" -#~ "Αδυναμία λήψης πληροφοριών από HAL. Ο haldaemon μπορεί να μην εκτελείται." - #~ msgid "Error" #~ msgstr "Σφάλμα" diff --git a/po/es.po b/po/es.po index 6216648..6186fc8 100644 --- a/po/es.po +++ b/po/es.po @@ -1637,19 +1637,12 @@ msgstr "" #~ msgid "Information" #~ msgstr "Información" -#, fuzzy -#~ msgid "HAL Daemon:" -#~ msgstr "Daemon HAL:" - #~ msgid "running" #~ msgstr "en ejecución" #~ msgid "not running" #~ msgstr "no se está ejecutando" -#~ msgid "HAL daemon:" -#~ msgstr "Daemon HAL:" - #, fuzzy #~ msgid "" #~ "The D-Bus daemon is not running.\n" @@ -1664,12 +1657,6 @@ msgstr "" #~ msgid "ERROR" #~ msgstr "ERROR" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "" -#~ "No se ha podido obtener información de HAL. Es posible que el daemon hal " -#~ "no se esté ejecutando." - #~ msgid "Error" #~ msgstr "Error" diff --git a/po/fi.po b/po/fi.po index b842b99..b60525e 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1613,18 +1613,12 @@ msgstr "Tallenna nimellä..." #~ msgid "Close" #~ msgstr "Sulje" -#~ msgid "HAL Daemon:" -#~ msgstr "Hal-demoni:" - #~ msgid "running" #~ msgstr "käytössä" #~ msgid "not running" #~ msgstr "ei käytössä" -#~ msgid "HAL daemon:" -#~ msgstr "HAL-demoni:" - #~ msgid "" #~ "The D-Bus daemon is not running.\n" #~ "Starting it will provide full functionality: /etc/init.d/dbus start" @@ -1639,9 +1633,5 @@ msgstr "Tallenna nimellä..." #~ msgid "ERROR" #~ msgstr "VIRHE" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "Tietoja HAL-demonilta ei saatu. Ehkä HAL-demoni ei ole käynnissä." - #~ msgid "Error" #~ msgstr "Virhe" diff --git a/po/fr.po b/po/fr.po index 27e70ba..7394e76 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1629,19 +1629,12 @@ msgstr "" #~ msgid "Information" #~ msgstr "Informations" -#, fuzzy -#~ msgid "HAL Daemon:" -#~ msgstr "Démon HAL :" - #~ msgid "running" #~ msgstr "exécution" #~ msgid "not running" #~ msgstr "non-exécution" -#~ msgid "HAL daemon:" -#~ msgstr "Démon HAL :" - #, fuzzy #~ msgid "" #~ "The D-Bus daemon is not running.\n" @@ -1657,12 +1650,6 @@ msgstr "" #~ msgid "ERROR" #~ msgstr "ERREUR" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "" -#~ "Impossible d'obtenir des informations du démon HAL. Ce démon peut ne pas " -#~ "être en fonctionnement." - #~ msgid "Error" #~ msgstr "Erreur" diff --git a/po/hi.po b/po/hi.po index 8373d77..c11fd18 100644 --- a/po/hi.po +++ b/po/hi.po @@ -1608,19 +1608,12 @@ msgstr "के समान सेव..." #~ msgid "Close" #~ msgstr "बन्द करें" -#, fuzzy -#~ msgid "HAL Daemon:" -#~ msgstr "HAL डेमन :" - #~ msgid "running" #~ msgstr "रन कर रहा है" #~ msgid "not running" #~ msgstr "रन नहीं कर रहा है" -#~ msgid "HAL daemon:" -#~ msgstr "HAL डेमन :" - #, fuzzy #~ msgid "" #~ "The D-Bus daemon is not running.\n" @@ -1635,10 +1628,5 @@ msgstr "के समान सेव..." #~ msgid "ERROR" #~ msgstr "त्रुटि" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "" -#~ "HAL से सूचना नहीं प्राप्त कर सका। हो सकता है कि haldaemon रन नहीं कर रहा हो।" - #~ msgid "Error" #~ msgstr "खराबी" diff --git a/po/hu.po b/po/hu.po index f848d6e..d0d8e37 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1632,18 +1632,12 @@ msgstr "Mentés másként..." #~ msgid "Close" #~ msgstr "Bezárás" -#~ msgid "HAL Daemon:" -#~ msgstr "HAL démon:" - #~ msgid "running" #~ msgstr "fut" #~ msgid "not running" #~ msgstr "nem fut" -#~ msgid "HAL daemon:" -#~ msgstr "HAL démon:" - #~ msgid "" #~ "The D-Bus daemon is not running.\n" #~ "Starting it will provide full functionality: /etc/init.d/dbus start" @@ -1657,11 +1651,5 @@ msgstr "Mentés másként..." #~ msgid "ERROR" #~ msgstr "HIBA" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "" -#~ "Nem sikerült lekérni az adatokat a HAL-tól. Lehet, hogy a HAL démon nem " -#~ "fut." - #~ msgid "Error" #~ msgstr "Hiba" diff --git a/po/it.po b/po/it.po index 071f65f..4df700d 100644 --- a/po/it.po +++ b/po/it.po @@ -1633,18 +1633,12 @@ msgstr "Salva come..." #~ msgid "Close" #~ msgstr "Chiudi" -#~ msgid "HAL Daemon:" -#~ msgstr "Demone HAL:" - #~ msgid "running" #~ msgstr "in esecuzione" #~ msgid "not running" #~ msgstr "non in esecuzione" -#~ msgid "HAL daemon:" -#~ msgstr "Daemon HAL:" - #~ msgid "" #~ "The D-Bus daemon is not running.\n" #~ "Starting it will provide full functionality: /etc/init.d/dbus start" @@ -1658,12 +1652,6 @@ msgstr "Salva come..." #~ msgid "ERROR" #~ msgstr "ERRORE" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "" -#~ "Impossibile ottenere le informazioni da HAL. È possibile che haldaemon " -#~ "non sia in esecuzione." - #~ msgid "Error" #~ msgstr "Errore" diff --git a/po/ja.po b/po/ja.po index bb7b53c..93ba11d 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1611,19 +1611,12 @@ msgstr "" #~ msgid "Information" #~ msgstr "情報" -#, fuzzy -#~ msgid "HAL Daemon:" -#~ msgstr "HALデーモン:" - #~ msgid "running" #~ msgstr "実行中" #~ msgid "not running" #~ msgstr "実行していない" -#~ msgid "HAL daemon:" -#~ msgstr "HALデーモン:" - #, fuzzy #~ msgid "" #~ "The D-Bus daemon is not running.\n" @@ -1638,12 +1631,6 @@ msgstr "" #~ msgid "ERROR" #~ msgstr "エラー" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "" -#~ "HALから情報を取得できませんでした。HALデーモンが起動していない可能性があり" -#~ "ます。" - #~ msgid "Error" #~ msgstr "エラー" diff --git a/po/km.po b/po/km.po index 8325453..5fbc579 100644 --- a/po/km.po +++ b/po/km.po @@ -1576,18 +1576,12 @@ msgstr "រក្សាទុក​ជា ..." #~ msgid "Close" #~ msgstr "បិទ​" -#~ msgid "HAL Daemon:" -#~ msgstr "ដេមិន HAL ៖" - #~ msgid "running" #~ msgstr "កំពុង​រត់" #~ msgid "not running" #~ msgstr "មិន​កំពុង​រត់" -#~ msgid "HAL daemon:" -#~ msgstr "ដេមិន HAL ៖" - #~ msgid "" #~ "The D-Bus daemon is not running.\n" #~ "Starting it will provide full functionality: /etc/init.d/dbus start" @@ -1601,9 +1595,5 @@ msgstr "រក្សាទុក​ជា ..." #~ msgid "ERROR" #~ msgstr "កំហុស" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "មិន​អាច​ទទួល​បាន​ព័ត៌មាន​ពី HAL បាន​ឡើយ ។ haldaemon ប្រហែល​ជា​មិន​កំពុង​រត់ឡើយ ។" - #~ msgid "Error" #~ msgstr "កំហុស" diff --git a/po/lt.po b/po/lt.po index 36ba49e..645ebca 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1557,18 +1557,12 @@ msgstr "Išsaugoti kaip..." #~ msgid "Close" #~ msgstr "Uždaryti" -#~ msgid "HAL Daemon:" -#~ msgstr "HAL demonas:" - #~ msgid "running" #~ msgstr "veikia" #~ msgid "not running" #~ msgstr "neveikia" -#~ msgid "HAL daemon:" -#~ msgstr "HAL demonas:" - #~ msgid "" #~ "The D-Bus daemon is not running.\n" #~ "Starting it will provide full functionality: /etc/init.d/dbus start" @@ -1582,11 +1576,6 @@ msgstr "Išsaugoti kaip..." #~ msgid "ERROR" #~ msgstr "KLAIDA" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "" -#~ "Negaliu gauti informacijos iš HAL hal demonas gali būti nepaleistas." - #~ msgid "Error" #~ msgstr "Klaida" diff --git a/po/nb.po b/po/nb.po index 797883c..1139e97 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1604,18 +1604,12 @@ msgstr "Lagre som ..." #~ msgid "Close" #~ msgstr "Lukk" -#~ msgid "HAL Daemon:" -#~ msgstr "HAL-nisse:" - #~ msgid "running" #~ msgstr "kjører" #~ msgid "not running" #~ msgstr "kjører ikke" -#~ msgid "HAL daemon:" -#~ msgstr "HAL-nisse:" - #~ msgid "" #~ "The D-Bus daemon is not running.\n" #~ "Starting it will provide full functionality: /etc/init.d/dbus start" @@ -1629,9 +1623,5 @@ msgstr "Lagre som ..." #~ msgid "ERROR" #~ msgstr "FEIL" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "Ingen informasjon fra HAL. HAL-nissen er kanskje ikke aktivert." - #~ msgid "Error" #~ msgstr "Feil" diff --git a/po/nl.po b/po/nl.po index caac955..78796a5 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1630,18 +1630,12 @@ msgstr "Opslaan als..." #~ msgid "Close" #~ msgstr "Sluiten" -#~ msgid "HAL Daemon:" -#~ msgstr "HAL-daemon:" - #~ msgid "running" #~ msgstr "actief" #~ msgid "not running" #~ msgstr "niet actief" -#~ msgid "HAL daemon:" -#~ msgstr "HAL-daemon:" - #~ msgid "" #~ "The D-Bus daemon is not running.\n" #~ "Starting it will provide full functionality: /etc/init.d/dbus start" @@ -1655,11 +1649,5 @@ msgstr "Opslaan als..." #~ msgid "ERROR" #~ msgstr "FOUT" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "" -#~ "Kon geen informatie over HAL verkrijgen. De hal-daemon draait mogelijk " -#~ "niet." - #~ msgid "Error" #~ msgstr "Fout" diff --git a/po/pa.po b/po/pa.po index 6ecd388..ff9c8e6 100644 --- a/po/pa.po +++ b/po/pa.po @@ -1583,18 +1583,12 @@ msgstr "ਇੰਝ ਸੰਭਾਲੋ..." #~ msgid "Close" #~ msgstr "ਬੰਦ ਕਰੋ" -#~ msgid "HAL Daemon:" -#~ msgstr "HAL ਡੈਮਨ:" - #~ msgid "running" #~ msgstr "ਚੱਲ ਰਿਹਾ ਹੈ" #~ msgid "not running" #~ msgstr "ਚੱਲ ਨਹੀਂ ਰਿਹਾ" -#~ msgid "HAL daemon:" -#~ msgstr "HAL ਡੈਮਨ:" - #~ msgid "" #~ "The D-Bus daemon is not running.\n" #~ "Starting it will provide full functionality: /etc/init.d/dbus start" @@ -1608,9 +1602,5 @@ msgstr "ਇੰਝ ਸੰਭਾਲੋ..." #~ msgid "ERROR" #~ msgstr "ਗਲਤੀ" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "HAL ਤੋਂ ਜਾਣਕਾਰੀ ਲਈ ਨਹੀਂ ਜਾ ਸਕੀ। haldaemon ਚੱਲ ਨਹੀਂ ਰਹੀ ਹੋ ਸਕਦੀ ਹੈ।" - #~ msgid "Error" #~ msgstr "ਗਲਤੀ" diff --git a/po/pl.po b/po/pl.po index 30229c4..3cd33b9 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1599,18 +1599,12 @@ msgstr "Zapisz jako..." #~ msgid "Close" #~ msgstr "Zamknij" -#~ msgid "HAL Daemon:" -#~ msgstr "Demon HAL:" - #~ msgid "running" #~ msgstr "włączony" #~ msgid "not running" #~ msgstr "wyłączony" -#~ msgid "HAL daemon:" -#~ msgstr "Demon HAL:" - #~ msgid "" #~ "The D-Bus daemon is not running.\n" #~ "Starting it will provide full functionality: /etc/init.d/dbus start" @@ -1624,11 +1618,6 @@ msgstr "Zapisz jako..." #~ msgid "ERROR" #~ msgstr "BŁĄD" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "" -#~ "Nie otrzymano informacji od HAL. Być może demon HAL nie jest uruchomiony." - #~ msgid "Error" #~ msgstr "Błąd" diff --git a/po/pt.po b/po/pt.po index 9fe1a17..c73daeb 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1609,18 +1609,12 @@ msgstr "Gravar Como..." #~ msgid "Close" #~ msgstr "Fechar" -#~ msgid "HAL Daemon:" -#~ msgstr "Serviço HAL:" - #~ msgid "running" #~ msgstr "em execução" #~ msgid "not running" #~ msgstr "parado" -#~ msgid "HAL daemon:" -#~ msgstr "Serviço HAL:" - #~ msgid "" #~ "The D-Bus daemon is not running.\n" #~ "Starting it will provide full functionality: /etc/init.d/dbus start" @@ -1635,11 +1629,5 @@ msgstr "Gravar Como..." #~ msgid "ERROR" #~ msgstr "ERRO" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "" -#~ "Não foi possível obter informação do HAL. O serviço haldaemon pode não " -#~ "estar em execução." - #~ msgid "Error" #~ msgstr "Erro" diff --git a/po/pt_BR.po b/po/pt_BR.po index a162b57..23fa936 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1593,19 +1593,12 @@ msgstr "" #~ msgid "Information" #~ msgstr "Informação" -#, fuzzy -#~ msgid "HAL Daemon:" -#~ msgstr "Daemon do HAL:" - #~ msgid "running" #~ msgstr "em execução" #~ msgid "not running" #~ msgstr "fora de execução" -#~ msgid "HAL daemon:" -#~ msgstr "Daemon do HAL:" - #, fuzzy #~ msgid "" #~ "The D-Bus daemon is not running.\n" @@ -1620,12 +1613,6 @@ msgstr "" #~ msgid "ERROR" #~ msgstr "ERRO" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "" -#~ "Impossível obter informações do HAL. Talvez o haldaemon não esteja em " -#~ "execução." - #~ msgid "Error" #~ msgstr "Erro" diff --git a/po/ru.po b/po/ru.po index 0f8047d..83a3e32 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1623,18 +1623,12 @@ msgstr "Сохранить как..." #~ msgid "Close" #~ msgstr "Закрыть" -#~ msgid "HAL Daemon:" -#~ msgstr "Демон HAL:" - #~ msgid "running" #~ msgstr "работает" #~ msgid "not running" #~ msgstr "не работает" -#~ msgid "HAL daemon:" -#~ msgstr "Демон HAL:" - #~ msgid "" #~ "The D-Bus daemon is not running.\n" #~ "Starting it will provide full functionality: /etc/init.d/dbus start" @@ -1648,11 +1642,6 @@ msgstr "Сохранить как..." #~ msgid "ERROR" #~ msgstr "ОШИБКА" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "" -#~ "Не удалось получить информацию из HAL. Возможно, haldaemon не запущен." - #~ msgid "Error" #~ msgstr "Ошибка" diff --git a/po/sl_SI.po b/po/sl_SI.po index f3cf2bd..8b7d30d 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -1615,18 +1615,12 @@ msgstr "Shrani kot ..." #~ msgid "Close" #~ msgstr "Zapri" -#~ msgid "HAL Daemon:" -#~ msgstr "Pritajeni program HAL:" - #~ msgid "running" #~ msgstr "teče" #~ msgid "not running" #~ msgstr "ne teče" -#~ msgid "HAL daemon:" -#~ msgstr "Pritajeni program HAL:" - #~ msgid "" #~ "The D-Bus daemon is not running.\n" #~ "Starting it will provide full functionality: /etc/init.d/dbus start" @@ -1640,11 +1634,5 @@ msgstr "Shrani kot ..." #~ msgid "ERROR" #~ msgstr "NAPAKA" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "" -#~ "Ni moč dobiti podatkov od HAL-a. Mogoče pritajeni program haldaemon ni " -#~ "zagnan." - #~ msgid "Error" #~ msgstr "Napaka" diff --git a/po/sv.po b/po/sv.po index 8c4d9a8..fe86843 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1606,18 +1606,12 @@ msgstr "Spara som..." #~ msgid "Close" #~ msgstr "Stäng" -#~ msgid "HAL Daemon:" -#~ msgstr "HAL-demon:" - #~ msgid "running" #~ msgstr "igång" #~ msgid "not running" #~ msgstr "inte igång" -#~ msgid "HAL daemon:" -#~ msgstr "HAL-demon:" - #~ msgid "" #~ "The D-Bus daemon is not running.\n" #~ "Starting it will provide full functionality: /etc/init.d/dbus start" @@ -1631,10 +1625,5 @@ msgstr "Spara som..." #~ msgid "ERROR" #~ msgstr "FEL" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "" -#~ "Det gick inte att få information från HAL. HAL-demonen kanske inte körs." - #~ msgid "Error" #~ msgstr "Fel" diff --git a/po/tr.po b/po/tr.po index f63daa7..ddb29b9 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1603,18 +1603,12 @@ msgstr "" #~ msgid "Information" #~ msgstr "Bilgi" -#~ msgid "HAL Daemon:" -#~ msgstr "HAL Servisi:" - #~ msgid "running" #~ msgstr "çalışıyor" #~ msgid "not running" #~ msgstr "çalışmıyor" -#~ msgid "HAL daemon:" -#~ msgstr "HAL başlngıç betiği:" - #~ msgid "" #~ "The D-Bus daemon is not running.\n" #~ "Starting it will provide full functionality: /etc/init.d/dbus start" @@ -1629,10 +1623,6 @@ msgstr "" #~ msgid "ERROR" #~ msgstr "HATA" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "HAL yazılımından bilgi alınamadı. Hal servisi çalışmıyor olabilir." - #~ msgid "Error" #~ msgstr "Hata" diff --git a/po/uk.po b/po/uk.po index db61e74..aaa3a0f 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1595,18 +1595,12 @@ msgstr "Зберегти як..." #~ msgid "Close" #~ msgstr "Закрити" -#~ msgid "HAL Daemon:" -#~ msgstr "Даемон HAL:" - #~ msgid "running" #~ msgstr "запущено" #~ msgid "not running" #~ msgstr "не запущено" -#~ msgid "HAL daemon:" -#~ msgstr "Даемон HAL:" - #~ msgid "" #~ "The D-Bus daemon is not running.\n" #~ "Starting it will provide full functionality: /etc/init.d/dbus start" @@ -1620,10 +1614,5 @@ msgstr "Зберегти як..." #~ msgid "ERROR" #~ msgstr "ПОМИЛКА" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "" -#~ "Не вдалося отримати інформацію з HAL. Можливо, не запущено haldaemon." - #~ msgid "Error" #~ msgstr "Помилка" diff --git a/po/zh_CN.po b/po/zh_CN.po index f600a3a..3bcc4d6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1573,18 +1573,12 @@ msgstr "另存为..." #~ msgid "Close" #~ msgstr "关闭" -#~ msgid "HAL Daemon:" -#~ msgstr "HAL 守护程序：" - #~ msgid "running" #~ msgstr "正在运行" #~ msgid "not running" #~ msgstr "不在运行" -#~ msgid "HAL daemon:" -#~ msgstr "HAL 守护程序：" - #, fuzzy #~ msgid "" #~ "The D-Bus daemon is not running.\n" @@ -1599,10 +1593,6 @@ msgstr "另存为..." #~ msgid "ERROR" #~ msgstr "错误" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "无法从 HAL 获取信息。Haldaemon 可能未在运行。" - #~ msgid "Error" #~ msgstr "错误" diff --git a/po/zh_TW.po b/po/zh_TW.po index f9dae2c..0c7df80 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1564,18 +1564,12 @@ msgstr "" #~ msgid "Information" #~ msgstr "資訊" -#~ msgid "HAL Daemon:" -#~ msgstr "HAL 背景程式：" - #~ msgid "running" #~ msgstr "執行中" #~ msgid "not running" #~ msgstr "尚未執行" -#~ msgid "HAL daemon:" -#~ msgstr "HAL 背景程式：" - #~ msgid "" #~ "The D-Bus daemon is not running.\n" #~ "Starting it will provide full functionality: /etc/init.d/dbus start" @@ -1589,10 +1583,6 @@ msgstr "" #~ msgid "ERROR" #~ msgstr "錯誤" -#~ msgid "" -#~ "Could not get information from HAL. The haldaemon is maybe not running." -#~ msgstr "無法取得由 HAL 取得資訊。可能 haldaemon 並未執行。" - #~ msgid "Error" #~ msgstr "錯誤" diff --git a/src/autodimm.cpp b/src/autodimm.cpp index e797e61..6ecea42 100644 --- a/src/autodimm.cpp +++ b/src/autodimm.cpp @@ -24,6 +24,10 @@ * \date 2007 */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "autodimm.h" /*! The default constructor of the class autodimm */ diff --git a/src/autosuspend.cpp b/src/autosuspend.cpp index 01372ba..ea6515c 100644 --- a/src/autosuspend.cpp +++ b/src/autosuspend.cpp @@ -23,6 +23,10 @@ * \date 2005 */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "autosuspend.h" /*! The default constructor of the class autosuspend */ diff --git a/src/blacklisteditdialog.cpp b/src/blacklisteditdialog.cpp index 85526f5..475670a 100644 --- a/src/blacklisteditdialog.cpp +++ b/src/blacklisteditdialog.cpp @@ -24,6 +24,10 @@ * \date 2005 */ +#ifdef HAVE_CONFIG_H +#include +#endif + // own header #include "blacklisteditdialog.h" diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp index a767508..ffc0a2b 100644 --- a/src/configuredialog.cpp +++ b/src/configuredialog.cpp @@ -25,6 +25,10 @@ * \date 2005 */ +#ifdef HAVE_CONFIG_H +#include +#endif + // KDE - Headers #include #include diff --git a/src/countdowndialog.cpp b/src/countdowndialog.cpp index a745035..7cb86ef 100644 --- a/src/countdowndialog.cpp +++ b/src/countdowndialog.cpp @@ -23,6 +23,10 @@ * \date 2007 */ +#ifdef HAVE_CONFIG_H +#include +#endif + // own header #include "countdowndialog.h" #include "tdepowersave_debug.h" diff --git a/src/dbusInterface.cpp b/src/dbusInterface.cpp index 8ad5552..fccafbc 100644 --- a/src/dbusInterface.cpp +++ b/src/dbusInterface.cpp @@ -24,6 +24,10 @@ * \author Danny Kukawka, , * \date 2006-2007 */ + +#ifdef HAVE_CONFIG_H +#include +#endif // QT - Header #include diff --git a/src/dbusInterface.h b/src/dbusInterface.h index 3fa8071..40dc7bd 100644 --- a/src/dbusInterface.h +++ b/src/dbusInterface.h @@ -35,11 +35,6 @@ #define DBUS_API_SUBJECT_TO_CHANGE #endif -// Global Header -#ifdef HAVE_CONFIG_H -#include -#endif - // QT - Header #include #include diff --git a/src/detaileddialog.cpp b/src/detaileddialog.cpp index 851d844..69dc5f0 100644 --- a/src/detaileddialog.cpp +++ b/src/detaileddialog.cpp @@ -27,6 +27,10 @@ * \date 2006-2007 */ +#ifdef HAVE_CONFIG_H +#include +#endif + // KDE headers: #include #include diff --git a/src/dummy.cpp b/src/dummy.cpp index 4243c94..8e842d8 100644 --- a/src/dummy.cpp +++ b/src/dummy.cpp @@ -24,6 +24,10 @@ * \date 2007 */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include diff --git a/src/hardware.cpp b/src/hardware.cpp index f4efedd..86098db 100644 --- a/src/hardware.cpp +++ b/src/hardware.cpp @@ -24,6 +24,10 @@ * \date 2006-2007 */ +#ifdef HAVE_CONFIG_H +#include +#endif + // include global header #include @@ -193,9 +197,6 @@ void HardwareInfo::processKeyPressEvent(unsigned int keycode, TDEEventDevice* ed // FIXME // How can I get specific button press/release information (instead of just "something happened to the button") from the TDE hardware library? - // TODO: Check if we really need to monitor this events. We get maybe also - // HAL_PROPERTY_CHANGED event for the key -// if (message.startsWith("ButtonPressed")) { kdDebug() << "ButtonPressed event from TDE HW library " << endl; if (((edevice->eventType() == TDEEventDeviceType::ACPIPowerButton) || (edevice->eventType() == TDEEventDeviceType::ACPIOtherInput)) && (keycode == KEY_POWER)) { @@ -212,9 +213,6 @@ void HardwareInfo::processKeyPressEvent(unsigned int keycode, TDEEventDevice* ed // else if (!brightness_in_hardware && value.endsWith("-down")) // TQTimer::singleShot(50, this, TQT_SLOT(brightnessDownPressed())); } -// } else { -// kdDebug() << "Unmonitored HAL_CONDITION: " << message << " : " << value << endl; -// } kdDebugFuncOut(trace); } @@ -1082,9 +1080,9 @@ bool HardwareInfo::setCPUFreqGovernor( const char *governor ) { // --> TDE hardware library method call (trigger actions) section -- END <--- // --> private helper functions/slots to forward/handle events -- START <-- -// need this functions to make events from HAL/D-Bus independent -// from QT event loop and to allow QT3 D-Bus bindings to get not -// blocked by normal KDE/QT (GUI) calls +// need this functions to make events independent +// from TQt event loop and to allow TQt3 D-Bus bindings to get not +// blocked by normal TDE/TQt (GUI) calls /*! * Function to emit the signal for the Power button. */ diff --git a/src/hardware.h b/src/hardware.h index 701df3e..f28f1b4 100644 --- a/src/hardware.h +++ b/src/hardware.h @@ -33,11 +33,6 @@ #ifndef _HARDWARE_H_ #define _HARDWARE_H_ -// Global Header -#ifdef HAVE_CONFIG_H -#include -#endif - // QT - Header #include #include diff --git a/src/hardware_battery.cpp b/src/hardware_battery.cpp index 2e60fb7..9d5c1a0 100644 --- a/src/hardware_battery.cpp +++ b/src/hardware_battery.cpp @@ -24,6 +24,10 @@ * \date 2006-2007 */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "hardware_battery.h" // FOR REFERENCE @@ -110,20 +114,12 @@ void Battery::initDefault() { kdDebugFuncOut(trace); } -//! initialize this battery object with values from HAL +//! initialize this battery object void Battery::init() { kdDebugFuncIn(trace); - // read battery information from HAL - if (resetUdi(udi)) { - //udi is valid - recheck(); //fills all values - //ready here for now - } else { - //udi is invalid or is no battery - state=BAT_HAL_ERROR; - kdWarning() << "Warning: Battery::init cannot make use of udi " << udi << endl; - } + // read battery information + recheck(); //fills all values initialized = true; kdDebugFuncOut(trace); @@ -201,7 +197,7 @@ void Battery::recheck() { kdDebugFuncOut(trace); } -// ---> query HAL for properties SECTION : START <---- +// ---> query for properties SECTION : START <---- //! to check battery.present /*! @@ -729,11 +725,11 @@ bool Battery::checkChargingState () { return _ret; } -// ---> query HAL for properties SECTION : END <---- +// ---> query for properties SECTION : END <---- -//! to recheck a special value for a HAL event +//! to recheck a special value for an event /*! - * Check for the given property new values from HAL and set them to + * Check for the given property new values and set them to * the battery variables. * \param device TDEGenericDevice */ @@ -747,26 +743,6 @@ void Battery::updateProperty(TDEGenericDevice* device) { kdDebugFuncOut(trace); } -//! Resets the current HAL udi used by the one given -/*! -* The given TQString will be (checked and) used as new HAL udi for the battery. -* But don't forget to do a recheck of the battery afterwards. -* \param _udi TQString with the UDI to reset -* \return boolean with the result of the operation -* \retval true if reset was successfull -* \retval false if reset couldn't be applied -*/ -bool Battery::resetUdi(TQString _udi) { - kdDebugFuncIn(trace); - - // FIXME - // What does this function do outside of HAL!?!? Should it even exist any more? - bool tmp_result=true; - - kdDebugFuncOut(trace); - return tmp_result; -} - // ---> write private members SECTION : START <---- //! sets the chargelevel in percent when battery should go into state warning @@ -815,7 +791,7 @@ void Battery::setCritLevel(int _crit_level) { // ---> write private members SECTION : END <---- // ---> get private members SECTION : START <---- -//! reports the HAL udi of this battery +//! reports the udi of this battery TQString Battery::getUdi() const { return TQString(udi); } @@ -880,7 +856,7 @@ int Battery::getCurrentLevel() const { return charge_level_current; } -//! reports HAL capacity_state value +//! reports capacity_state value TQString Battery::getCapacityState() const { return TQString(capacity_state); } diff --git a/src/hardware_battery.h b/src/hardware_battery.h index 36bf68c..f250700 100644 --- a/src/hardware_battery.h +++ b/src/hardware_battery.h @@ -32,11 +32,6 @@ #ifndef _BATTERY_H_ #define _BATTERY_H_ -// Global Header -#ifdef HAVE_CONFIG_H -#include -#endif - // QT - Header #include #include @@ -282,16 +277,6 @@ public: //! reports the chargelevel in percent when battery goes to state critical int getCritLevel() const; - //writeable access to internals - //! Resets the current TDE hardware library udi used by the one given - /*! - * The given TQString will be (checked and) used as new TDE hardware library udi for the battery. - * But don't forget to do a recheck of the battery afterwards. - * \li returns TRUE: if reset was successfull - * \li returns FALSE: if reset couldn't be applied - */ - bool resetUdi(TQString); - //! sets the chargelevel in percent when battery should go into state warning void setWarnLevel(int _warn_level); //! sets the chargelevel in percent when battery should go into state low @@ -336,8 +321,7 @@ enum BAT_STATE { BAT_WARN, BAT_LOW, BAT_CRIT, - BAT_NORM, - BAT_HAL_ERROR + BAT_NORM }; #endif diff --git a/src/hardware_batteryCollection.cpp b/src/hardware_batteryCollection.cpp index e331492..0d4f4dd 100644 --- a/src/hardware_batteryCollection.cpp +++ b/src/hardware_batteryCollection.cpp @@ -24,6 +24,10 @@ * \date 2006-2007 */ +#ifdef HAVE_CONFIG_H +#include +#endif + // own headers #include "hardware_batteryCollection.h" diff --git a/src/hardware_batteryCollection.h b/src/hardware_batteryCollection.h index c30717d..4de81e7 100644 --- a/src/hardware_batteryCollection.h +++ b/src/hardware_batteryCollection.h @@ -31,11 +31,6 @@ #ifndef _BATTERYCOLLECTION_H_ #define _BATTERYCOLLECTION_H_ -// Global Header -#ifdef HAVE_CONFIG_H -#include -#endif - // QT - Header #include #include @@ -85,7 +80,6 @@ private: * \li BAT_LOW: batterylevel is already low * \li BAT_CRIT: batterylevel has become really critical * \li BAT_NONE: battery state not available - * \li BAT_HAL_ERROR: battery state couldn't be retrieved because of a HAL error */ int state; diff --git a/src/hardware_cpu.cpp b/src/hardware_cpu.cpp index e87de1a..5bf25ac 100644 --- a/src/hardware_cpu.cpp +++ b/src/hardware_cpu.cpp @@ -28,6 +28,10 @@ * \date 2006 */ +#ifdef HAVE_CONFIG_H +#include +#endif + // include own header #include "hardware_cpu.h" #include "hardware_cpu.moc" diff --git a/src/hardware_cpu.h b/src/hardware_cpu.h index 62069ac..b0932a5 100644 --- a/src/hardware_cpu.h +++ b/src/hardware_cpu.h @@ -33,11 +33,6 @@ #ifndef _HARDWARE_CPU_H_ #define _HARDWARE_CPU_H_ -// Global Header -#ifdef HAVE_CONFIG_H -#include -#endif - // QT Headers #include #include diff --git a/src/inactivity.cpp b/src/inactivity.cpp index 977161e..d22d7f8 100644 --- a/src/inactivity.cpp +++ b/src/inactivity.cpp @@ -23,6 +23,10 @@ * \date 2006-2007 */ +#ifdef HAVE_CONFIG_H +#include +#endif + // own header #include "inactivity.h" diff --git a/src/infodialog.cpp b/src/infodialog.cpp index 9837acb..00a5790 100644 --- a/src/infodialog.cpp +++ b/src/infodialog.cpp @@ -25,6 +25,10 @@ * \date 2005 */ +#ifdef HAVE_CONFIG_H +#include +#endif + // own headers #include "infodialog.h" diff --git a/src/logviewer.cpp b/src/logviewer.cpp index bd2207a..2761e40 100644 --- a/src/logviewer.cpp +++ b/src/logviewer.cpp @@ -23,6 +23,10 @@ * \version 0.0.1 * \date 2007 */ + +#ifdef HAVE_CONFIG_H +#include +#endif // QT header #include diff --git a/src/main.cpp b/src/main.cpp index 9a7339d..036837c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "tdepowersave.h" #include #include diff --git a/src/screen.cpp b/src/screen.cpp index ef68a26..ff298f1 100644 --- a/src/screen.cpp +++ b/src/screen.cpp @@ -26,6 +26,10 @@ * \author Danny Kukawka, , * \date 2004 - 2006 */ + +#ifdef HAVE_CONFIG_H +#include +#endif // own headers #include "screen.h" diff --git a/src/settings.cpp b/src/settings.cpp index 1d167e6..5ed02d9 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -24,6 +24,10 @@ * \date 2005 */ +#ifdef HAVE_CONFIG_H +#include +#endif + // KDE Header #include diff --git a/src/suspenddialog.cpp b/src/suspenddialog.cpp index cdd82c0..3c6a155 100644 --- a/src/suspenddialog.cpp +++ b/src/suspenddialog.cpp @@ -24,6 +24,10 @@ * \date 2005 */ +#ifdef HAVE_CONFIG_H +#include +#endif + // KDE - Headers #include #include diff --git a/src/tdepowersave.cpp b/src/tdepowersave.cpp index 12f2060..4db6039 100644 --- a/src/tdepowersave.cpp +++ b/src/tdepowersave.cpp @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include +#endif + // KDE headers: #include #include @@ -2895,7 +2899,7 @@ void tdepowersave::showDetailedDialog( ){ /*! * DCOP Interface funtion to open the configure dialog. * \return boolean with the result of open the dialog - * \retval false if failed (e.g. D-Bus or HAL is not running) + * \retval false if failed * \retval true if correct opend */ bool tdepowersave::openConfigureDialog (){ diff --git a/src/tdepowersave.h b/src/tdepowersave.h index df5214a..8014b46 100644 --- a/src/tdepowersave.h +++ b/src/tdepowersave.h @@ -22,11 +22,6 @@ #ifndef _TDEPOWERSAVE_H_ #define _TDEPOWERSAVE_H_ -// Global Header -#ifdef HAVE_CONFIG_H -#include -#endif - // KDE - Header #include #include diff --git a/src/tdepowersave_debug.h b/src/tdepowersave_debug.h index e97ade6..c978bfd 100644 --- a/src/tdepowersave_debug.h +++ b/src/tdepowersave_debug.h @@ -21,11 +21,6 @@ #ifndef _TDEPOWERSAVE_DEBUG_H #define _TDEPOWERSAVE_DEBUG_H -// Global Header -#ifdef HAVE_CONFIG_H -#include -#endif - // Default Header #include #include