From 27f2cfdc57b75ea3994e31ad436464353d966cdd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 02:32:00 -0600 Subject: Additional kde to tde renaming --- klaptopdaemon/Makefile.am | 10 +++++----- klaptopdaemon/acpi.cpp | 8 ++++---- klaptopdaemon/apm.cpp | 16 ++++++++-------- klaptopdaemon/daemondock.cpp | 8 ++++---- klaptopdaemon/sony.cpp | 8 ++++---- 5 files changed, 25 insertions(+), 25 deletions(-) (limited to 'klaptopdaemon') diff --git a/klaptopdaemon/Makefile.am b/klaptopdaemon/Makefile.am index f36a324..9d755ed 100644 --- a/klaptopdaemon/Makefile.am +++ b/klaptopdaemon/Makefile.am @@ -4,30 +4,30 @@ lib_LTLIBRARIES = libkcmlaptop.la SUBDIRS = pics applnk libkcmlaptop_la_SOURCES = portable.cpp smapidev.c daemon_state.cpp wake_laptop.cpp krichtextlabel.cpp -libkcmlaptop_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +libkcmlaptop_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor libkcmlaptop_la_LIBADD = $(LIB_KDEUI) MESSAGE_SOURCES = laptop_daemon.cpp kpcmcia.cpp xautolock.cc kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c kded_klaptopdaemon_la_SOURCES = $(MESSAGE_SOURCES) laptop_daemon.skel -kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version -lXtst $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version -lXtst $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kded_klaptopdaemon_la_LIBADD = $(LIB_KDEUI) $(LIB_XSS) libkcmlaptop.la klaptop_acpi_helper_SOURCES = acpi_helper.cpp klaptop_acpi_helper_LDADD = $(LIB_QT) klaptop_check_SOURCES = laptop_check.cpp -klaptop_check_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +klaptop_check_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor klaptop_check_LDADD = $(LIB_KFILE) $(LIB_KDEUI) libkcmlaptop.la kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \ acpi.cpp sony.cpp profile.cpp buttons.cpp apm.cpp -kcm_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -module +kcm_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module kcm_laptop_la_LIBADD = $(LIB_KFILE) $(LIB_KDEUI) libkcmlaptop.la kcm_laptop_la_COMPILE_FIRST = crcresult.h AM_CPPFLAGS = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor KDE_OPTIONS = nofinal diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp index 3fc436a..44c1822 100644 --- a/klaptopdaemon/acpi.cpp +++ b/klaptopdaemon/acpi.cpp @@ -166,8 +166,8 @@ void AcpiConfig::setupHelper() TQString helper = KStandardDirs::findExe("klaptop_acpi_helper"); checkcrc(TQFile::encodeName(helper), len, crc); - TQString kdesu = KStandardDirs::findExe("kdesu"); - if (!kdesu.isEmpty()) { + TQString tdesu = KStandardDirs::findExe("tdesu"); + if (!tdesu.isEmpty()) { int rc = KMessageBox::warningContinueCancel(0, i18n("You will need to supply a root password " "to allow the privileges of the klaptop_acpi_helper to change."), @@ -175,14 +175,14 @@ void AcpiConfig::setupHelper() ""); if (rc == KMessageBox::Continue) { KProcess proc; - proc << kdesu; + proc << tdesu; proc << "-u"; proc << "root"; proc << "dpkg-statoverride --update --add root root 6755 "+helper; proc.start(KProcess::Block); // run it sync so has_acpi below sees the results } } else { - KMessageBox::sorry(0, i18n("The ACPI helper cannot be enabled because kdesu cannot be found. Please make sure that it is installed correctly."), + KMessageBox::sorry(0, i18n("The ACPI helper cannot be enabled because tdesu cannot be found. Please make sure that it is installed correctly."), i18n("KLaptopDaemon")); } laptop_portable::acpi_set_mask(enablestandby, enablesuspend, enablehibernate, enableperformance, enablethrottle); diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp index e92dfc4..3869457 100644 --- a/klaptopdaemon/apm.cpp +++ b/klaptopdaemon/apm.cpp @@ -154,8 +154,8 @@ ApmConfig::~ApmConfig() void ApmConfig::setupHelper() { - TQString kdesu = KStandardDirs::findExe("kdesu"); - if (!kdesu.isEmpty()) { + TQString tdesu = KStandardDirs::findExe("tdesu"); + if (!tdesu.isEmpty()) { int rc = KMessageBox::warningContinueCancel(0, i18n("You will need to supply a root password " "to allow the privileges of the %1 application to change.").tqarg(apm_name), @@ -163,14 +163,14 @@ void ApmConfig::setupHelper() ""); if (rc == KMessageBox::Continue) { KProcess proc; - proc << kdesu; + proc << tdesu; proc << "-u"; proc << "root"; proc << TQString("dpkg-statoverride --update --add root root 6755 ")+apm_name; proc.start(KProcess::Block); // run it sync so has_apm below sees the results } } else { - KMessageBox::sorry(0, i18n("%1 cannot be enabled because kdesu cannot be found. Please make sure that it is installed correctly.").tqarg(TQString(apm_name)), + KMessageBox::sorry(0, i18n("%1 cannot be enabled because tdesu cannot be found. Please make sure that it is installed correctly.").tqarg(TQString(apm_name)), i18n("KLaptopDaemon")); } laptop_portable::apm_set_mask(enablestandby, enablesuspend); @@ -188,8 +188,8 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend TQString helper = KStandardDirs::findExe("klaptop_acpi_helper"); checkcrc(helper.latin1(), len, crc); - TQString kdesu = KStandardDirs::findExe("kdesu"); - if (!kdesu.isEmpty()) { + TQString tdesu = KStandardDirs::findExe("tdesu"); + if (!tdesu.isEmpty()) { int rc = KMessageBox::warningContinueCancel(0, i18n("You will need to supply a root password " "to allow the privileges of the klaptop_acpi_helper to change."), @@ -197,14 +197,14 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend ""); if (rc == KMessageBox::Continue) { KProcess proc; - proc << kdesu; + proc << tdesu; proc << "-u"; proc << "root"; proc << "dpkg-statoverride --update --add root root 6755 "+helper; proc.start(KProcess::Block); // run it sync so has_acpi below sees the results } } else { - KMessageBox::sorry(0, i18n("The Software Suspend helper cannot be enabled because kdesu cannot be found. Please make sure that it is installed correctly."), + KMessageBox::sorry(0, i18n("The Software Suspend helper cannot be enabled because tdesu cannot be found. Please make sure that it is installed correctly."), i18n("KLaptopDaemon")); } laptop_portable::software_suspend_set_mask(enablesoftwaresuspend); diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp index c5c0a58..7c948b7 100644 --- a/klaptopdaemon/daemondock.cpp +++ b/klaptopdaemon/daemondock.cpp @@ -233,8 +233,8 @@ laptop_dock::invokeBrightness() void laptop_dock::slotGoRoot(int /*id*/) { #ifdef NOTDEF - TQString kdesu = KStandardDirs::findExe("kdesu"); - if (!kdesu.isEmpty()) { + TQString tdesu = KStandardDirs::findExe("tdesu"); + if (!tdesu.isEmpty()) { int rc = KMessageBox::warningContinueCancel(0, i18n("You will need to supply a root password " "to allow KLaptopDaemon to restart " @@ -246,7 +246,7 @@ void laptop_dock::slotGoRoot(int /*id*/) { if (rc == KMessageBox::Continue) { KProcess *_rootProcess; _rootProcess = new KProcess; - *_rootProcess << kdesu; + *_rootProcess << tdesu; *_rootProcess << "-u"; *_rootProcess << "root"; //*_rootProcess << "--nonewdcop"; @@ -257,7 +257,7 @@ void laptop_dock::slotGoRoot(int /*id*/) { // We should disable this menu item here now. } } else { - KMessageBox::sorry(0, i18n("PCMCIA cannot be enabled since kdesu cannot be found. Please make sure that it is installed correctly."), + KMessageBox::sorry(0, i18n("PCMCIA cannot be enabled since tdesu cannot be found. Please make sure that it is installed correctly."), i18n("KLaptopDaemon")); } #else diff --git a/klaptopdaemon/sony.cpp b/klaptopdaemon/sony.cpp index 497a566..689b9d0 100644 --- a/klaptopdaemon/sony.cpp +++ b/klaptopdaemon/sony.cpp @@ -107,8 +107,8 @@ SonyConfig::SonyConfig(TQWidget * parent, const char *name) void SonyConfig::setupHelper() { - TQString kdesu = KStandardDirs::findExe("kdesu"); - if (!kdesu.isEmpty()) { + TQString tdesu = KStandardDirs::findExe("tdesu"); + if (!tdesu.isEmpty()) { int rc = KMessageBox::warningContinueCancel(0, i18n("You will need to supply a root password " "to allow the protections of /dev/sonypi to be changed."), @@ -116,14 +116,14 @@ void SonyConfig::setupHelper() ""); if (rc == KMessageBox::Continue) { KProcess proc; - proc << kdesu; + 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 } } else { - KMessageBox::sorry(0, i18n("The /dev/sonypi protections cannot be changed because kdesu cannot be found. Please make sure that it is installed correctly."), + KMessageBox::sorry(0, i18n("The /dev/sonypi protections cannot be changed because tdesu cannot be found. Please make sure that it is installed correctly."), i18n("KLaptopDaemon")); } bool enable = ::access("/dev/sonypi", R_OK) == 0; -- cgit v1.2.1