diff options
Diffstat (limited to 'klaptopdaemon')
-rw-r--r-- | klaptopdaemon/acpi.cpp | 6 | ||||
-rw-r--r-- | klaptopdaemon/apm.cpp | 10 | ||||
-rw-r--r-- | klaptopdaemon/battery.cpp | 2 | ||||
-rw-r--r-- | klaptopdaemon/buttons.cpp | 2 | ||||
-rw-r--r-- | klaptopdaemon/daemondock.cpp | 22 | ||||
-rw-r--r-- | klaptopdaemon/daemondock.h | 2 | ||||
-rw-r--r-- | klaptopdaemon/kpcmcia.cpp | 2 | ||||
-rw-r--r-- | klaptopdaemon/krichtextlabel.cpp | 4 | ||||
-rw-r--r-- | klaptopdaemon/laptop_daemon.cpp | 4 | ||||
-rw-r--r-- | klaptopdaemon/pcmcia.cpp | 2 | ||||
-rw-r--r-- | klaptopdaemon/portable.cpp | 28 | ||||
-rw-r--r-- | klaptopdaemon/power.cpp | 2 | ||||
-rw-r--r-- | klaptopdaemon/profile.cpp | 2 | ||||
-rw-r--r-- | klaptopdaemon/sony.cpp | 6 | ||||
-rw-r--r-- | klaptopdaemon/warning.cpp | 2 |
15 files changed, 48 insertions, 48 deletions
diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp index 4dfb247..e66513b 100644 --- a/klaptopdaemon/acpi.cpp +++ b/klaptopdaemon/acpi.cpp @@ -54,7 +54,7 @@ extern void wake_laptop_daemon(); AcpiConfig::AcpiConfig (TQWidget * parent, const char *name) : KCModule(parent, name) { - KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages + TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages config = new KConfig("kcmlaptoprc"); @@ -174,12 +174,12 @@ void AcpiConfig::setupHelper() i18n("KLaptopDaemon"), KStdGuiItem::cont(), ""); if (rc == KMessageBox::Continue) { - KProcess proc; + TDEProcess proc; proc << tdesu; proc << "-u"; proc << "root"; proc << "chown root "+helper+"; chmod +s "+helper; - proc.start(KProcess::Block); // run it sync so has_acpi below sees the results + proc.start(TDEProcess::Block); // run it sync so has_acpi below sees the results } } else { KMessageBox::sorry(0, i18n("The ACPI helper cannot be enabled because tdesu cannot be found. Please make sure that it is installed correctly."), diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp index 9de0c85..107cff0 100644 --- a/klaptopdaemon/apm.cpp +++ b/klaptopdaemon/apm.cpp @@ -54,7 +54,7 @@ extern void wake_laptop_daemon(); ApmConfig::ApmConfig (TQWidget * parent, const char *name) : KCModule(parent, name) { - KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages + TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages config = new KConfig("kcmlaptoprc"); @@ -162,12 +162,12 @@ void ApmConfig::setupHelper() "KLaptopDaemon", KStdGuiItem::cont(), ""); if (rc == KMessageBox::Continue) { - KProcess proc; + TDEProcess proc; proc << tdesu; proc << "-u"; proc << "root"; proc << TQString("chown root ")+apm_name+TQString("; chmod +s ")+apm_name; - proc.start(KProcess::Block); // run it sync so has_apm below sees the results + proc.start(TDEProcess::Block); // run it sync so has_apm below sees the results } } else { KMessageBox::sorry(0, i18n("%1 cannot be enabled because tdesu cannot be found. Please make sure that it is installed correctly.").arg(TQString(apm_name)), @@ -196,12 +196,12 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend i18n("KLaptopDaemon"), KStdGuiItem::cont(), ""); if (rc == KMessageBox::Continue) { - KProcess proc; + TDEProcess proc; proc << tdesu; proc << "-u"; proc << "root"; proc << "chown root "+helper+"; chmod +s "+helper; - proc.start(KProcess::Block); // run it sync so has_acpi below sees the results + proc.start(TDEProcess::Block); // run it sync so has_acpi below sees the results } } else { KMessageBox::sorry(0, i18n("The Software Suspend helper cannot be enabled because tdesu cannot be found. Please make sure that it is installed correctly."), diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp index 7ca5a55..e4ba202 100644 --- a/klaptopdaemon/battery.cpp +++ b/klaptopdaemon/battery.cpp @@ -59,7 +59,7 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name) buttonNoCharge(0), buttonCharge(0) { - KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages + TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages apm = laptop_portable::has_power_management(); config = new KConfig("kcmlaptoprc"); diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp index 51c9ce7..eb3a6bf 100644 --- a/klaptopdaemon/buttons.cpp +++ b/klaptopdaemon/buttons.cpp @@ -77,7 +77,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) int can_shutdown = 1; // fix me int can_logout = 1; // fix me - KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages + TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages apm = laptop_portable::has_power_management(); config = new KConfig("kcmlaptoprc"); diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp index 32d1dfd..88b89e6 100644 --- a/klaptopdaemon/daemondock.cpp +++ b/klaptopdaemon/daemondock.cpp @@ -52,7 +52,7 @@ laptop_dock::laptop_dock( laptop_daemon* parent ) : KSystemTray() { setCaption(i18n("KLaptop Daemon")); - KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages + TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages _pcmcia = NULL; pdaemon = parent; current_code = -1; @@ -207,7 +207,7 @@ laptop_dock::invokeBrightness() brightness_slider->setValue(255-brightness); } if (!brightness_widget->isVisible()) { - TQRect desktop = KGlobalSettings::desktopGeometry(this); + TQRect desktop = TDEGlobalSettings::desktopGeometry(this); int sw = desktop.width(); int sh = desktop.height(); int sx = desktop.x(); @@ -244,16 +244,16 @@ void laptop_dock::slotGoRoot(int /*id*/) { i18n("KLaptopDaemon"), KStdGuiItem::cont(), "switchToPCMCIAPrompt"); if (rc == KMessageBox::Continue) { - KProcess *_rootProcess; - _rootProcess = new KProcess; + TDEProcess *_rootProcess; + _rootProcess = new TDEProcess; *_rootProcess << tdesu; *_rootProcess << "-u"; *_rootProcess << "root"; //*_rootProcess << "--nonewdcop"; *_rootProcess << KStandardDirs::findExe("klaptopdaemon"); - connect(_rootProcess, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(rootExited(KProcess*))); - _rootProcess->start(KProcess::NotifyOnExit); + connect(_rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(rootExited(TDEProcess*))); + _rootProcess->start(TDEProcess::NotifyOnExit); // We should disable this menu item here now. } } else { @@ -307,7 +307,7 @@ void laptop_dock::slotQuit() { } -void laptop_dock::rootExited(KProcess *p) { +void laptop_dock::rootExited(TDEProcess *p) { if (p && p->isRunning()) { p->detach(); } @@ -525,10 +525,10 @@ void laptop_dock::invokeLockSuspend() void laptop_dock::invokeSetup() { - KProcess proc; + TDEProcess proc; proc << KStandardDirs::findExe("kcmshell"); proc << "laptop"; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); proc.detach(); } @@ -690,7 +690,7 @@ quit: int oldPixmapWidth = image.size().width(); int oldPixmapHeight = image.size().height(); - TQFont percentageFont = KGlobalSettings::generalFont(); + TQFont percentageFont = TDEGlobalSettings::generalFont(); percentageFont.setBold(true); // decrease the size of the font for the number of unread messages if the diff --git a/klaptopdaemon/daemondock.h b/klaptopdaemon/daemondock.h index 3297bb6..f35e9fd 100644 --- a/klaptopdaemon/daemondock.h +++ b/klaptopdaemon/daemondock.h @@ -80,7 +80,7 @@ private slots: void fill_performance(); - void rootExited(KProcess *p); + void rootExited(TDEProcess *p); void slotGoRoot(int id); void slotQuit(); void slotHide(); diff --git a/klaptopdaemon/kpcmcia.cpp b/klaptopdaemon/kpcmcia.cpp index 50d7b4c..a17b5f8 100644 --- a/klaptopdaemon/kpcmcia.cpp +++ b/klaptopdaemon/kpcmcia.cpp @@ -520,7 +520,7 @@ return -1; } static int openDevice(dev_t dev) { -TQString tmp_path = locateLocal("tmp", KGlobal::instance()->instanceName()); +TQString tmp_path = locateLocal("tmp", TDEGlobal::instance()->instanceName()); TQString ext = "_socket%1"; tmp_path += ext.arg((int)dev); diff --git a/klaptopdaemon/krichtextlabel.cpp b/klaptopdaemon/krichtextlabel.cpp index 499577b..0df5a95 100644 --- a/klaptopdaemon/krichtextlabel.cpp +++ b/klaptopdaemon/krichtextlabel.cpp @@ -40,14 +40,14 @@ static TQString qrichtextify( const TQString& text ) KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); + m_defaultWidth = TQMIN(400, TDEGlobalSettings::desktopGeometry(this).width()*2/5); setAlignment( TQt::WordBreak ); setText(text); } KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); + m_defaultWidth = TQMIN(400, TDEGlobalSettings::desktopGeometry(this).width()*2/5); setAlignment( TQt::WordBreak ); } diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp index 3d1caab..6868545 100644 --- a/klaptopdaemon/laptop_daemon.cpp +++ b/klaptopdaemon/laptop_daemon.cpp @@ -503,9 +503,9 @@ void laptop_daemon::haveBatteryLow(int t, const int num, const int type) if (s.runCommand[t]) { // make sure the command exists if (!s.runCommandPath[t].isEmpty()) { - KProcess command; + TDEProcess command; command << s.runCommandPath[t]; - command.start(KProcess::DontCare); + command.start(TDEProcess::DontCare); } } diff --git a/klaptopdaemon/pcmcia.cpp b/klaptopdaemon/pcmcia.cpp index 60d1fc0..4554686 100644 --- a/klaptopdaemon/pcmcia.cpp +++ b/klaptopdaemon/pcmcia.cpp @@ -48,7 +48,7 @@ PcmciaConfig::PcmciaConfig (TQWidget * parent, const char *name) about->addAuthor("Paul Campbell", 0, "paul@taniwha.com"); setAboutData( about ); - KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages + TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages label0 = laptop_portable::pcmcia_info(0, this); label0_text = laptop_portable::pcmcia_info(1, this); diff --git a/klaptopdaemon/portable.cpp b/klaptopdaemon/portable.cpp index 7c5d227..ed4801f 100644 --- a/klaptopdaemon/portable.cpp +++ b/klaptopdaemon/portable.cpp @@ -745,14 +745,14 @@ laptop_portable::acpi_set_mask(bool standby, bool suspend, bool hibernate, bool static void invoke_acpi_helper(const char *param, const char *param2, const char *param3) { - KProcess proc; + TDEProcess proc; proc << KStandardDirs::findExe("klaptop_acpi_helper"); proc << param; if (param2) proc << param2; if (param3) proc << param3; - proc.start(KProcess::Block); // helper runs fast and we want to see the result + proc.start(TDEProcess::Block); // helper runs fast and we want to see the result } static unsigned long apm_sleep_enabled = 0x0c; // apm sleep functions enabled mask @@ -1086,10 +1086,10 @@ void laptop_portable::invoke_standby() return; } // add other machine specific standbys here - KProcess proc; + TDEProcess proc; proc << "/usr/bin/apm"; proc << "--standby"; - proc.start(KProcess::Block); // helper runs fast and we want to see the result + proc.start(TDEProcess::Block); // helper runs fast and we want to see the result } // @@ -1100,10 +1100,10 @@ void laptop_portable::invoke_suspend() last_seed++; // make it look for battery removal/return if (::has_pmu()) { - KProcess proc; + TDEProcess proc; proc << "/usr/bin/apm"; proc << "-f"; - proc.start(KProcess::Block); // helper runs fast and we want to see the result + proc.start(TDEProcess::Block); // helper runs fast and we want to see the result return; } @@ -1125,10 +1125,10 @@ void laptop_portable::invoke_suspend() return; } // add other machine specific suspends here - KProcess proc; + TDEProcess proc; proc << "/usr/bin/apm"; proc << "--suspend"; - proc.start(KProcess::Block); // helper runs fast and we want to see the result + proc.start(TDEProcess::Block); // helper runs fast and we want to see the result } // @@ -2225,12 +2225,12 @@ void laptop_portable::invoke_suspend() // void laptop_portable::invoke_hibernation() { - KProcess thisProc; + TDEProcess thisProc; if (::access(PATH_TPCTL, X_OK)==0) { thisProc << PATH_TPCTL; thisProc << "---hibernate"; - thisProc.start(KProcess::Block); + thisProc.start(TDEProcess::Block); return; } } @@ -2603,10 +2603,10 @@ TQLabel *laptop_portable::pcmcia_info(int x, TQWidget *parent) // void laptop_portable::invoke_standby() { - KProcess proc; + TDEProcess proc; proc << "/usr/sbin/apm"; proc << "-S"; - proc.start(KProcess::Block); // helper runs fast and we want to see the result + proc.start(TDEProcess::Block); // helper runs fast and we want to see the result } // @@ -2616,10 +2616,10 @@ void laptop_portable::invoke_standby() // void laptop_portable::invoke_suspend() { - KProcess proc; + TDEProcess proc; proc << "/usr/sbin/apm"; proc << "-z"; - proc.start(KProcess::Block); // helper runs fast and we want to see the result + proc.start(TDEProcess::Block); // helper runs fast and we want to see the result } // diff --git a/klaptopdaemon/power.cpp b/klaptopdaemon/power.cpp index 446e900..28e558e 100644 --- a/klaptopdaemon/power.cpp +++ b/klaptopdaemon/power.cpp @@ -79,7 +79,7 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) noeditlav(0), editlav(0) { - KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages + TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages apm = laptop_portable::has_power_management(); config = new KConfig("kcmlaptoprc"); diff --git a/klaptopdaemon/profile.cpp b/klaptopdaemon/profile.cpp index f71325f..c61e884 100644 --- a/klaptopdaemon/profile.cpp +++ b/klaptopdaemon/profile.cpp @@ -64,7 +64,7 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) int current_throttle; bool has_throttle = laptop_portable::get_system_throttling(0, current_throttle, throttle_list, active_list); - KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages + TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages config = new KConfig("kcmlaptoprc"); diff --git a/klaptopdaemon/sony.cpp b/klaptopdaemon/sony.cpp index 7bc7175..a318153 100644 --- a/klaptopdaemon/sony.cpp +++ b/klaptopdaemon/sony.cpp @@ -58,7 +58,7 @@ extern void wake_laptop_daemon(); SonyConfig::SonyConfig(TQWidget * parent, const char *name) : KCModule(parent, name) { - KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages + TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages config = new KConfig("kcmlaptoprc"); @@ -115,12 +115,12 @@ void SonyConfig::setupHelper() i18n("KLaptopDaemon"), KStdGuiItem::cont(), ""); if (rc == KMessageBox::Continue) { - KProcess proc; + TDEProcess proc; proc << tdesu; proc << "-u"; proc << "root"; proc << "chmod +r /dev/sonypi"; - proc.start(KProcess::Block); // run it sync so has_acpi below sees the results + proc.start(TDEProcess::Block); // run it sync so has_acpi below sees the results } } else { KMessageBox::sorry(0, i18n("The /dev/sonypi protections cannot be changed because tdesu cannot be found. Please make sure that it is installed correctly."), diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp index 4845fdc..14fb14b 100644 --- a/klaptopdaemon/warning.cpp +++ b/klaptopdaemon/warning.cpp @@ -50,7 +50,7 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) checkStandby(0), checkHibernate(0) { - KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages + TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages type = t; apm = laptop_portable::has_power_management(); |