diff options
Diffstat (limited to 'klaptopdaemon')
40 files changed, 275 insertions, 536 deletions
diff --git a/klaptopdaemon/CMakeL10n.txt b/klaptopdaemon/CMakeL10n.txt index 8fb67db..6ef457d 100644 --- a/klaptopdaemon/CMakeL10n.txt +++ b/klaptopdaemon/CMakeL10n.txt @@ -28,3 +28,9 @@ tde_l10n_create_template( SOURCES "." EXCLUDES ${KLAPTOPDAEMON_EXCLUDES} ) + +tde_l10n_create_template( + CATALOG "desktop_files/klaptopdaemon-desktops/" + SOURCES *.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/klaptopdaemon/CMakeLists.txt b/klaptopdaemon/CMakeLists.txt index 2558f04..6ce141b 100644 --- a/klaptopdaemon/CMakeLists.txt +++ b/klaptopdaemon/CMakeLists.txt @@ -60,20 +60,18 @@ tde_add_library( kcmlaptop SHARED AUTOMOC tde_add_kpart( kcm_laptop AUTOMOC SOURCES battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp acpi.cpp sony.cpp - profile.cpp buttons.cpp apm.cpp - ${CMAKE_CURRENT_BINARY_DIR}/crcresult.h + profile.cpp buttons.cpp apm.cpp LINK tdeio-shared kcmlaptop-shared DESTINATION ${PLUGIN_INSTALL_DIR} + DEPENDENCIES crcresult-header ) -# crcresult.h header is included here cause it is -# generated during build time. Otherwice the -# dependency on it won't be handeled correctly. + ##### kded_klaptopdaemon (kpart) ################ tde_add_kpart( kded_klaptopdaemon AUTOMOC SOURCES laptop_daemon.cpp kpcmcia.cpp - xautolock.cc kpcmciainfo.cpp daemondock.cpp + xautolock.cpp kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c laptop_daemon.skel LINK tdeio-shared kcmlaptop-shared @@ -84,18 +82,19 @@ tde_add_kpart( kded_klaptopdaemon AUTOMOC ##### crcresult.h (header) ###################### -# FIXME: that should potentialy break the cross -# compilation, If it is possible in -# generall. -add_executable( makecrc makecrc.cpp ) -target_link_libraries( makecrc z ) - -get_target_property( MAKECRC_EXE makecrc LOCATION) +tde_add_executable( makecrc + SOURCES makecrc.cpp + LINK z +) -add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/crcresult.h - COMMAND - ${MAKECRC_EXE} >${CMAKE_CURRENT_BINARY_DIR}/crcresult.h - DEPENDS makecrc - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) +add_custom_command( + OUTPUT crcresult.h + COMMAND makecrc > crcresult.h + DEPENDS makecrc klaptop_acpi_helper +) +add_custom_target( crcresult-header + DEPENDS + ${CMAKE_CURRENT_BINARY_DIR}/crcresult.h +) diff --git a/klaptopdaemon/Makefile.am b/klaptopdaemon/Makefile.am index da40ae6..f03981e 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libkcmlaptop_la_LDFLAGS = $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libkcmlaptop_la_LIBADD = $(LIB_TDEUI) -MESSAGE_SOURCES = laptop_daemon.cpp kpcmcia.cpp xautolock.cc kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c +MESSAGE_SOURCES = laptop_daemon.cpp kpcmcia.cpp xautolock.cpp 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version -lXtst $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kded_klaptopdaemon_la_LIBADD = $(LIB_TDEUI) $(LIB_XSS) libkcmlaptop.la klaptop_acpi_helper_SOURCES = acpi_helper.cpp -klaptop_acpi_helper_LDADD = $(LIB_QT) +klaptop_acpi_helper_LDADD = $(LIB_TQT) klaptop_check_SOURCES = laptop_check.cpp -klaptop_check_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +klaptop_check_LDFLAGS = $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor klaptop_check_LDADD = $(LIB_TDEFILE) $(LIB_TDEUI) 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module +kcm_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module kcm_laptop_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEUI) libkcmlaptop.la kcm_laptop_la_COMPILE_FIRST = crcresult.h AM_CPPFLAGS = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor KDE_OPTIONS = nofinal @@ -42,7 +42,7 @@ dummy.cpp: noinst_PROGRAMS = makecrc makecrc_SOURCES = makecrc.cpp -makecrc_LDADD = $(LIBZ) $(LIB_QT) +makecrc_LDADD = $(LIBZ) $(LIB_TQT) crcresult.h: makecrc klaptop_acpi_helper ./makecrc >crcresult.h diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp index 27125dd..8ff1e43 100644 --- a/klaptopdaemon/acpi.cpp +++ b/klaptopdaemon/acpi.cpp @@ -86,27 +86,27 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name) top_layout->addWidget( enableStandby ); TQToolTip::add( enableStandby, i18n( "If checked this box enables transitions to the 'standby' state - a temporary powered down state" ) ); enableStandby->setEnabled(can_enable); - connect( enableStandby, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableStandby, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); enableSuspend = new TQCheckBox( i18n("Enable &suspend"), this ); top_layout->addWidget( enableSuspend ); TQToolTip::add( enableSuspend, i18n( "If checked this box enables transitions to the 'suspend' state - a semi-powered down state, sometimes called 'suspend-to-ram'" ) ); enableSuspend->setEnabled(can_enable); - connect( enableSuspend, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableSuspend, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); TQHBoxLayout *ll = new TQHBoxLayout(); enableHibernate = new TQCheckBox( i18n("Enable &hibernate"), this ); ll->addWidget( enableHibernate ); TQToolTip::add( enableHibernate, i18n( "If checked this box enables transitions to the 'hibernate' state - a powered down state, sometimes called 'suspend-to-disk'" ) ); enableHibernate->setEnabled(can_enable); - connect( enableHibernate, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableHibernate, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); if (laptop_portable::has_software_suspend()) { ll->addStretch(1); enableSoftwareSuspendHibernate = new TQCheckBox( i18n("Use software suspend for hibernate"), this ); ll->addWidget( enableSoftwareSuspendHibernate ); TQToolTip::add( enableSoftwareSuspendHibernate, i18n( "If checked this box enables transitions to the 'hibernate' state - a powered down state, sometimes called 'suspend-to-disk' - the kernel 'Software Suspend' mechanism will be used instead of using ACPI directly" ) ); enableSoftwareSuspendHibernate->setEnabled(laptop_portable::has_software_suspend(2)); - connect( enableSoftwareSuspendHibernate, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableSoftwareSuspendHibernate, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); } else { enableSoftwareSuspendHibernate = 0; } @@ -118,13 +118,13 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name) top_layout->addWidget( enablePerformance ); TQToolTip::add( enablePerformance, i18n( "If checked this box enables access to ACPI performance profiles - usually OK in 2.4 and later" ) ); enablePerformance->setEnabled(can_enable); - connect( enablePerformance, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enablePerformance, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); enableThrottle = new TQCheckBox( i18n("Enable &CPU throttling"), this ); top_layout->addWidget( enableThrottle ); TQToolTip::add( enableThrottle, i18n( "If checked this box enables access to ACPI throttle speed changes - usually OK in 2.4 and later" ) ); enableThrottle->setEnabled(can_enable); - connect( enableThrottle, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableThrottle, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); tmp_label = new TQLabel(i18n("If the above boxes are disabled then there is no 'helper' " "application set up to help change ACPI states, there are two " @@ -136,7 +136,7 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name) top_layout->addWidget( tmp_label ); ll = new TQHBoxLayout(); TQPushButton *setupButton = new TQPushButton(i18n("Setup Helper Application"), this); - connect( setupButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(setupHelper()) ); + connect( setupButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(setupHelper()) ); TQToolTip::add( setupButton, i18n( "This button can be used to enable the ACPI helper application" ) ); ll->addStretch(2); ll->addWidget(setupButton); @@ -165,6 +165,17 @@ void AcpiConfig::setupHelper() unsigned long len, crc; TQString helper = TDEStandardDirs::findExe("klaptop_acpi_helper"); checkcrc(TQFile::encodeName(helper), len, crc); + if (len != file_len || crc != file_crc) + { + TQString str(i18n("The %1 application does not seem to have " + "the same size or checksum as when it was compiled we do NOT recommend " + "you proceed with making it setuid-root without further investigation").arg(helper)); + int rc = KMessageBox::warningContinueCancel(0, str, i18n("KLaptopDaemon"), i18n("Run Nevertheless")); + if (rc != KMessageBox::Continue) + { + return; + } + } TQString tdesu = TDEStandardDirs::findExe("tdesu"); if (!tdesu.isEmpty()) { diff --git a/klaptopdaemon/acpi.h b/klaptopdaemon/acpi.h index 68adb46..0fa3c9c 100644 --- a/klaptopdaemon/acpi.h +++ b/klaptopdaemon/acpi.h @@ -39,7 +39,7 @@ class TQPushButton; class AcpiConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: AcpiConfig( TQWidget *parent=0, const char* name=0); diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp index a7cb189..e02c2f1 100644 --- a/klaptopdaemon/apm.cpp +++ b/klaptopdaemon/apm.cpp @@ -84,13 +84,13 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name) top_layout->addWidget( enableStandby ); TQToolTip::add( enableStandby, i18n( "If checked this box enables transitions to the 'standby' state - a temporary powered down state" ) ); enableStandby->setEnabled(can_enable); - connect( enableStandby, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableStandby, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); enableSuspend = new TQCheckBox( i18n("Enable &suspend"), this ); top_layout->addWidget( enableSuspend ); TQToolTip::add( enableSuspend, i18n( "If checked this box enables transitions to the 'suspend' state - a semi-powered down state, sometimes called 'suspend-to-ram'" ) ); enableSuspend->setEnabled(can_enable); - connect( enableSuspend, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableSuspend, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); apm_name = "/usr/bin/apm"; if (::access(apm_name, F_OK) != 0 && ::access("/usr/sbin/apm", F_OK) == 0) apm_name = "/usr/sbin/apm"; @@ -105,7 +105,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name) top_layout->addWidget( tmp_label ); TQHBoxLayout *ll = new TQHBoxLayout(top_layout); TQPushButton *setupButton = new TQPushButton(i18n("Setup Helper Application"), this); - connect( setupButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(setupHelper()) ); + connect( setupButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(setupHelper()) ); TQToolTip::add( setupButton, i18n( "This button can be used to enable the APM helper application" ) ); ll->addStretch(2); ll->addWidget(setupButton); @@ -120,7 +120,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name) top_layout->addWidget( enableSoftwareSuspendHibernate ); TQToolTip::add( enableSoftwareSuspendHibernate, i18n( "If checked this box enables transitions to the 'hibernate' state using the 'Software Suspend' mechanism" ) ); enableSoftwareSuspendHibernate->setEnabled(laptop_portable::has_software_suspend(2)); - connect( enableSoftwareSuspendHibernate, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableSoftwareSuspendHibernate, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); tmp_label = new TQLabel( i18n("If the above box is disabled then you need to be logged in " "as root or need a helper application to invoke the Software " "Suspend utility - TDE provides a utility to do this, if you " @@ -130,7 +130,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name) top_layout->addWidget( tmp_label ); ll = new TQHBoxLayout(this); TQPushButton *setupSSButton = new TQPushButton(i18n("Setup SS Helper Application"), this); - connect( setupSSButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(setupHelper2()) ); + connect( setupSSButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(setupHelper2()) ); TQToolTip::add( setupSSButton, i18n( "This button can be used to enable the Software Suspend helper application" ) ); ll->addStretch(2); ll->addWidget(setupSSButton); @@ -187,6 +187,17 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend unsigned long len, crc; TQString helper = TDEStandardDirs::findExe("klaptop_acpi_helper"); checkcrc(helper.latin1(), len, crc); + if (len != file_len || crc != file_crc) + { + TQString str(i18n("The %1 application does not seem to have " + "the same size or checksum as when it was compiled we do NOT recommend " + "you proceed with making it setuid-root without further investigation").arg(helper)); + int rc = KMessageBox::warningContinueCancel(0, str, i18n("KLaptopDaemon"), i18n("Run Nevertheless")); + if (rc != KMessageBox::Continue) + { + return; + } + } TQString tdesu = TDEStandardDirs::findExe("tdesu"); if (!tdesu.isEmpty()) { diff --git a/klaptopdaemon/apm.h b/klaptopdaemon/apm.h index 74510ee..829f4e5 100644 --- a/klaptopdaemon/apm.h +++ b/klaptopdaemon/apm.h @@ -39,7 +39,7 @@ class TQPushButton; class ApmConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: ApmConfig( TQWidget *parent=0, const char* name=0); diff --git a/klaptopdaemon/applnk/CMakeLists.txt b/klaptopdaemon/applnk/CMakeLists.txt index 926b330..e5c8003 100644 --- a/klaptopdaemon/applnk/CMakeLists.txt +++ b/klaptopdaemon/applnk/CMakeLists.txt @@ -9,11 +9,13 @@ # ################################################# -install( FILES laptop.desktop pcmcia.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} +tde_create_translated_desktop( + SOURCE laptop.desktop pcmcia.desktop + PO_DIR klaptopdaemon-desktops ) -install( FILES klaptopdaemon.desktop +tde_create_translated_desktop( + SOURCE klaptopdaemon.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded + PO_DIR klaptopdaemon-desktops ) - diff --git a/klaptopdaemon/applnk/klaptopdaemon.desktop b/klaptopdaemon/applnk/klaptopdaemon.desktop index c369af9..d02c5dc 100644 --- a/klaptopdaemon/applnk/klaptopdaemon.desktop +++ b/klaptopdaemon/applnk/klaptopdaemon.desktop @@ -1,4 +1,8 @@ [Desktop Entry] +Name=Laptop Battery Monitor + +Comment=Laptop battery monitor + Type=Service X-TDE-ServiceTypes=KDEDModule @@ -10,107 +14,3 @@ X-TDE-Kded-load-on-demand=true Icon=laptop_battery X-DocPath=kcontrol/battery-monitor.html -Comment=Laptop battery monitor -Comment[ar]=مراقب بطّاريّة الحاسوب المحمول -Comment[bg]=Мониторинг на батериите на лаптоп -Comment[bs]=Nadzor baterije laptopa -Comment[ca]=Monitor de bateria de portàtils -Comment[cs]=Monitor baterií laptopu -Comment[da]=Batteriovervågning for bærbar -Comment[de]=Benachrichtigung über den Akku-Ladezustand -Comment[el]=Επόπτης μπαταρίας φορητού -Comment[eo]=Portkomputila baterimonitoro -Comment[es]=Monitor de batería del portátil -Comment[et]=Sülearvuti aku monitooring -Comment[eu]=Magalekoaren bateria begiralea -Comment[fa]=نمایشگر باتری رایانۀ کیفی -Comment[fi]=Kannettavan koneen akkutarkkailja -Comment[fr]=Indicateur de batterie de portable -Comment[ga]=Monatóir chadhnra ríomhaire glúine -Comment[he]=מד סוללה למחשב ברכיים -Comment[hu]=A telepek szintjelzője -Comment[is]=Rafhlöðueftirlit fyrir ferðavélar -Comment[it]=Controllo batteria computer portatile -Comment[ja]=ラップトップバッテリモニタ -Comment[ka]=ლეპტოპის კვების ელემენტის მონიტორი -Comment[kk]=Ноутбук аккумуляторын бақылау -Comment[km]=កម្មវិធីត្រួតពិនិត្យថ្មរបស់កុំព្យូទ័រយួរដៃ -Comment[lt]=Akumuliatoriaus stebėjimo priemonė -Comment[nb]=Batteriovervåker for bærbar maskin -Comment[nds]=Klappreekner-Batteriekieker -Comment[ne]=ल्यापटप ब्याट्री मोनिटर -Comment[nl]=Programma voor laptop-batterijbewaking -Comment[nn]=Batteriovervaking for bærbar maskin -Comment[pa]=ਲੈਪਟਾਪ ਬੈਟਰੀ ਨਿਗਰਾਨ -Comment[pl]=Kontrola stanu baterii laptopa -Comment[pt]=Monitor de bateria -Comment[pt_BR]=Monitor de bateria de laptop -Comment[ro]=Monitorează bateria laptop-ului -Comment[ru]=Монитор состояния батареи -Comment[sk]=Monitor nabitia bateriek -Comment[sl]=Nadzornik baterije za prenosnik -Comment[sr]=Надгледа батерију лаптопа -Comment[sr@Latn]=Nadgleda bateriju laptopa -Comment[sv]=Batterimonitor för bärbar dator -Comment[ta]= மடிக் கணினி மின்கலம் கண்காணிப்பாளன் -Comment[tr]=Dizüstü bilgisayarlar için pil izleyici -Comment[uk]=Монітор батарей лептопа -Comment[uz]=Laptopning batareyasini nazorat qilish -Comment[uz@cyrillic]=Лаптопнинг батареясини назорат қилиш -Comment[zh_CN]=便携电脑电池监视器 -Comment[zh_TW]=筆記型電腦電池監視器 -Name=Laptop Battery Monitor -Name[ar]=مراقب بطّاريّة الحاسوب المحمول -Name[bg]=Мониторинг на батериите -Name[bs]=Nadzor baterije laptopa -Name[ca]=Monitor de bateria de portàtils -Name[cs]=Monitor baterií laptopu -Name[cy]=Monitr Batri Gliniadur -Name[da]=Batteriovervågning for bærbar -Name[de]=Akku-Überwachung -Name[el]=Επόπτης μπαταρίας φορητού -Name[eo]=Portkomputila baterimonitoro -Name[es]=Monitor de batería del portátil -Name[et]=Sülearvuti aku monitooring -Name[eu]=Magalekoaren Bateria Begiralea -Name[fa]=نمایشگر باتری رایانۀ کیفی -Name[fi]=Akkutarkkailija -Name[fr]=Indicateur de batterie de portable -Name[ga]=Monatóir Chadhnra Ríomhaire Glúine -Name[he]=מד סוללה למחשב ברכיים -Name[hi]=लैपटॉप बैटरी मॉनीटर -Name[hu]=Feltöltöttségi szintjelző -Name[is]=Rafhlöðueftirlit fyrir ferðavélar -Name[it]=Controllo batteria portatile -Name[ja]=ラップトップバッテリモニタ -Name[ka]=ლეპტოპის კვების ელემენტის მონიტორი -Name[kk]=Ноутбук аккумуляторын бақылау -Name[km]=កម្មវិធីត្រួតពិនិត្យថ្មកុំព្យូទ័រយួរដៃ -Name[lt]=Akumuliatoriaus stebėjimo priemonė -Name[mk]=Монитор на батеријата на лаптопот -Name[ms]=Memerhatikan Bateri Komputer Riba -Name[nb]=Batteriovervåker for bærbar maskin -Name[nds]=Klappreekner-Batteriekieker -Name[ne]=ल्यापटप ब्याट्री मोनिटर -Name[nl]=Laptop-batterijbewaking -Name[nn]=Batteriovervakar for bærbar maskin -Name[pa]=ਲੈਪਟਾਪ ਬੈਟਰੀ ਨਿਗਰਾਨ -Name[pl]=Monitor baterii -Name[pt]=Monitor de Bateria -Name[pt_BR]=Monitor de Bateria de Laptop -Name[ro]=Monitor baterie de laptop -Name[ru]=Состояние батареи -Name[sk]=Monitor nabitia bateriek -Name[sl]=Nadzornik baterije za prenosnik -Name[sr]=Надгледање батерије лаптопа -Name[sr@Latn]=Nadgledanje baterije laptopa -Name[sv]=Batterimonitor för bärbar dator -Name[ta]= மடிக் கணினி மின்கலம் கண்காணி -Name[tg]=Дидабони Батареяи Компютери Дастӣ -Name[tr]=Dizüstü Pil Monitörü -Name[uk]=Монітор батарей -Name[uz]=Laptopning batareyasini nazorat qilish -Name[uz@cyrillic]=Лаптопнинг батареясини назорат қилиш -Name[wa]=Corwaitoe del batreye do poirtåve -Name[zh_CN]=便携电脑电池监视器 -Name[zh_TW]=筆記型電腦電池監視器 diff --git a/klaptopdaemon/applnk/laptop.desktop b/klaptopdaemon/applnk/laptop.desktop index ba9d472..da17147 100644 --- a/klaptopdaemon/applnk/laptop.desktop +++ b/klaptopdaemon/applnk/laptop.desktop @@ -1,4 +1,10 @@ [Desktop Entry] +Name=Laptop Battery + +Comment=Laptop Battery + +Init=klaptop_check + X-TDE-Library=laptop X-TDE-FactoryName=laptop X-TDE-Init=laptop @@ -7,129 +13,3 @@ Icon=laptop_battery Type=Application X-DocPath=kcontrol/laptop/index.html Categories=Qt;TDE;X-TDE-settings-hardware; -Comment=Laptop Battery -Comment[af]=Draagbare rekenaar Batery -Comment[ar]=بطّاريّة الحاسوب المحمول -Comment[bg]=Мониторинг на батериите на лаптоп -Comment[br]=Pod-tredan an hezoug -Comment[bs]=Upozorenje istrošene baterije -Comment[ca]=Bateria de portàtil -Comment[cs]=Baterie notebooku -Comment[cy]=Batri Gliniadur -Comment[da]=Batteri for bærbar -Comment[de]=Notebook-Akku -Comment[el]=Μπαταρία φορητού -Comment[eo]=Avertilo por maplenigo de la baterio -Comment[es]=Batería del portátil -Comment[et]=Sülearvuti aku -Comment[eu]=Magalekoen Bateria -Comment[fa]=باتری رایانۀ کیفی -Comment[fi]=Kannettavan akku -Comment[fr]=Batterie d'ordinateur portable -Comment[ga]=Cadhnra Ríomhaire Glúine -Comment[he]=סוללת מחשב נייד -Comment[hi]=लैपटॉप बैटरी -Comment[hr]=Baterija laptopa -Comment[hu]=Energiakezelési beállítások noteszgép esetén -Comment[is]=Rafhlaða ferðavélar -Comment[it]=Batteria computer portatile -Comment[ja]=ラップトップバッテリ -Comment[ka]=ლეპტოპის კვების ელემენტი -Comment[kk]=Ноутбуктің аккумуляторы -Comment[km]=ថ្មកុំព្យូទ័រយួរដៃ -Comment[lt]=Nešiojamo kompiuterio akumuliatorius -Comment[mk]=Предупредува кога батеријата е слаба -Comment[ms]=Bateri Komputer Riba -Comment[mt]=Batterija tal-laptop -Comment[nb]=Batteri til bærbar maskin -Comment[nds]=Klappreekner-Batterie -Comment[ne]=ल्यापटप ब्याट्री -Comment[nl]=Laptopbatterij -Comment[nn]=Batteri til bærbar -Comment[pa]=ਲੈਪਟਾਪ ਬੈਟਰੀ -Comment[pl]=Ostrzeżenie o słabych bateriach -Comment[pt]=Bateria do portátil -Comment[pt_BR]=Bateria do Laptop -Comment[ro]=Baterie de laptop -Comment[ru]=Батарея ноутбука -Comment[sk]=Batérie laptopu -Comment[sl]=Baterija prenosnika -Comment[sr]=Батерија лаптопа -Comment[sr@Latn]=Baterija laptopa -Comment[sv]=Batteri för bärbar dator -Comment[ta]= மடிக் கணினி மின்கலம் -Comment[tg]=Батареяи Компютери Дастӣ -Comment[th]=แบตเตอรีของเครื่องแลปทอบ -Comment[tr]=Dizüstü Pili -Comment[uk]=Батареї лептопа -Comment[uz]=Laptopning batareyasi -Comment[uz@cyrillic]=Лаптопнинг батареяси -Comment[wa]=Batreye do poirtåve -Comment[xh]=Ibhetri ye Laptop -Comment[zh_CN]=便携电脑电池 -Comment[zh_TW]=筆記型電腦的電池 -Comment[zu]=Ibhetri Yekhomputha eyisicaba ephathwayo -Name=Laptop Battery -Name[af]=Draagbare rekenaar Batery -Name[ar]=بطّاريّة الحاسوب المحمول -Name[bg]=Батерии на лаптоп -Name[br]=Pod-tredan an hezoug -Name[bs]=Laptop baterija -Name[ca]=Bateria de portàtil -Name[cs]=Baterie notebooku -Name[cy]=Batri Gliniadur -Name[da]=Batteri for bærbar -Name[de]=Notebook-Akku -Name[el]=Μπαταρία φορητού -Name[eo]=Portkomputila baterio -Name[es]=Batería del portátil -Name[et]=Sülearvuti aku -Name[eu]=Magalekoen Bateria -Name[fa]=باتری رایانۀ کیفی -Name[fi]=Kannettavan akku -Name[fr]=Batterie d'ordinateur portable -Name[ga]=Cadhnra Ríomhaire Glúine -Name[he]=סוללת מחשב נייד -Name[hi]=लैपटॉप बैटरी -Name[hr]=Laptop baterija -Name[hu]=Noteszgép-telepek -Name[is]=Ferðavélarafhlaða -Name[it]=Batteria computer portatile -Name[ja]=ラップトップバッテリ -Name[ka]=ლეპტოპის კვების ელემენტი -Name[kk]=Ноутбуктің аккумуляторы -Name[km]=ថ្មកុំព្យូទ័រយួរដៃ -Name[lt]=Laptop baterija -Name[mk]=Батерија на лаптопот -Name[ms]=Bateri Komputer Riba -Name[mt]=Batterija tal-laptop -Name[nb]=Batteri til bærbar maskin -Name[nds]=Klappreekner-Batterie -Name[ne]=ल्यापटप ब्याट्री -Name[nl]=Laptopbatterij -Name[nn]=Batteri til bærbar -Name[pa]=ਲੈਪਟਾਪ ਬੈਟਰੀ -Name[pl]=Bateria laptopa -Name[pt]=Bateria do Portátil -Name[pt_BR]=Bateria do Laptop -Name[ro]=Baterie laptop -Name[ru]=Батарея ноутбука -Name[sk]=Batérie laptopu -Name[sl]=Baterija prenosnika -Name[sr]=Батерија лаптопа -Name[sr@Latn]=Baterija laptopa -Name[sv]=Batteri för bärbar dator -Name[ta]= மடிக் கணினி மின்கலம் -Name[tg]=Батареяи Компютери Дастӣ -Name[th]=แบตเตอรีแลปทอบ -Name[tr]=Dizüstü Pili -Name[uk]=Батареї лептопа -Name[uz]=Laptopning batareyasi -Name[uz@cyrillic]=Лаптопнинг батареяси -Name[wa]=Batreye do poirtåve -Name[xh]=Ibhetri ye Laptop -Name[zh_CN]=便携电脑电池 -Name[zh_TW]=筆記型電腦的電池 -Name[zu]=Ibhetri Yekhomputha eyisicaba ephathwayo -Init=klaptop_check - diff --git a/klaptopdaemon/applnk/pcmcia.desktop b/klaptopdaemon/applnk/pcmcia.desktop index 1fb946c..d13fe88 100644 --- a/klaptopdaemon/applnk/pcmcia.desktop +++ b/klaptopdaemon/applnk/pcmcia.desktop @@ -1,4 +1,8 @@ [Desktop Entry] +Name=PCMCIA cards + +Comment=PCMCIA status + X-TDE-ModuleType=Library X-TDE-Library=laptop X-TDE-FactoryName=pcmcia @@ -7,79 +11,5 @@ Exec=tdecmshell pcmcia Icon=laptop_pcmcia Type=Application X-DocPath=kcontrol/pcmcia/index.html -Comment=PCMCIA status -Comment[af]=Pcmcia status -Comment[ar]=حالة بطاقة PCMCIA -Comment[az]=PCMCIA vəziyyəti -Comment[bg]=Информация за PCMCIA -Comment[br]=Saviad PCMCIA -Comment[ca]=Estat de PCMCIA -Comment[cs]=Stav PCMCIA -Comment[cy]=Statws PCMCIA -Comment[da]=PCMCIA-status -Comment[de]=PCMCIA-Status -Comment[el]=Κατάσταση PCMCIA -Comment[eo]=PCMCIA-stato -Comment[es]=Estado PCMCIA -Comment[et]=PCMCIA olek -Comment[eu]=PCMCIAren egoera -Comment[fa]=PCMCIA وضعیت -Comment[fi]=PCMCIA-tila -Comment[fr]=État PCMCIA -Comment[ga]=Stádas PCMCIA -Comment[gl]=Estado de PCMCIA -Comment[he]=מידע על מצב PCMCIA -Comment[hi]=पीसीएमसीआईए स्थिति -Comment[hr]=Stanje PCMCIA -Comment[hu]=PCMCIA-állapot -Comment[id]=Status PCMCIA -Comment[is]=PCMCIA staða -Comment[it]=Stato PCMCIA -Comment[ja]=PCMCIA の状態 -Comment[ka]=PCMCIA სტატუსი -Comment[kk]=PCMCIA күйі -Comment[km]=ស្ថានភាព PCMCIA -Comment[ko]=PCMCIA 현재 상태 -Comment[lt]=PCMCIA būsena -Comment[mk]=Статус на PCMCIA -Comment[ms]=Status PCMCIA -Comment[mt]=Stat PCMCIA -Comment[nb]=PCMCIA-status -Comment[nds]=PCMCIA-Status -Comment[ne]=PCMCIA स्थिति -Comment[nl]=Status van PCMCIA -Comment[nn]=PCMCIA-status -Comment[pa]=PCMCIA ਹਾਲਤ -Comment[pl]=Status kart PCMCIA -Comment[pt]=Estado do PCMCIA -Comment[pt_BR]=Estado do PCMCIA -Comment[ro]=Starea PCMCIA -Comment[ru]=Состояние PCMCIA -Comment[sk]=stav PCMCIA -Comment[sl]=Stanje PCMCIA -Comment[sr]=Статус PCMCIA уређаја -Comment[sr@Latn]=Status PCMCIA uređaja -Comment[sv]=PCMCIA-status -Comment[ta]=PCMCIA நிலை -Comment[tg]=Ҳолати PCMCIA -Comment[th]=สถานะอุปกรณ์ PCMCIA -Comment[tr]=PCMCIA durumu -Comment[uk]=Стан PCMCIA -Comment[uz]=PCMCIA holati -Comment[uz@cyrillic]=PCMCIA ҳолати -Comment[ven]=Maimo a PCMCIA -Comment[vi]=Trạng thái PCMCIA -Comment[wa]=Estat do PCMCIA -Comment[xh]=Indawo esemthethweni ye PCMCIA -Comment[zh_CN]=PCMCIA 状态 -Comment[zh_TW]=PCMCIA 狀態 -Comment[zu]=Izinga le-PCMCIA -Name=PCMCIA -Name[af]=Pcmcia -Name[he]=מצב PCMCIA -Name[hi]=पीसीएमसीआईए -Name[pt_BR]=Cartões PCMCIA -Name[ta]= PCMCIA -Name[th]=อุปกรณ์ PCMCIA Categories=Qt;TDE;X-TDE-settings-information; diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp index 9bf6be9..dcd03da 100644 --- a/klaptopdaemon/battery.cpp +++ b/klaptopdaemon/battery.cpp @@ -72,23 +72,23 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name) runMonitor = new TQCheckBox( i18n("&Show battery monitor"), this ); top_layout->addWidget( runMonitor ); TQToolTip::add( runMonitor, i18n( "This box enables the battery state icon in the panel" ) ); - connect( runMonitor, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); - connect( runMonitor, TQT_SIGNAL(clicked()), this, TQT_SLOT(runMonitorChanged()) ); + connect( runMonitor, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); + connect( runMonitor, TQ_SIGNAL(clicked()), this, TQ_SLOT(runMonitorChanged()) ); // show also the battery level percentage showLevel = new TQCheckBox( i18n("Show battery level percentage"), this ); top_layout->addWidget( showLevel ); TQToolTip::add( showLevel, i18n( "This box enables a text message near the battery state icon containing battery level percentage" ) ); - connect( showLevel, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( showLevel, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); notifyMe = new TQCheckBox( i18n("&Notify me whenever my battery becomes fully charged"), this ); top_layout->addWidget( notifyMe ); TQToolTip::add( notifyMe, i18n( "This box enables a dialog box that pops up when your battery becomes fully charged" ) ); - connect( notifyMe, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( notifyMe, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); blankSaver = new TQCheckBox( i18n("&Use a blank screen saver when running on battery"), this ); top_layout->addWidget( blankSaver ); - connect( blankSaver, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( blankSaver, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); if (!apm) { top_layout->addWidget( laptop_portable::no_power_management_explanation(this) ); @@ -105,8 +105,8 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name) TQToolTip::add( editPoll, i18n( "Choose how responsive the laptop software will be when it checks the battery status" ) ); editPoll->setSuffix( i18n("keep short, unit in spinbox", "sec") ); poll_label->setBuddy( editPoll ); - connect( editPoll, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(configChanged()) ); + connect( editPoll, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(configChanged()) ); TQWidget* spacer = new TQWidget( hb ); hb->setStretchFactor( spacer, 1 ); @@ -128,9 +128,9 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name) buttonNoBattery->setIconType( TDEIcon::NoGroup, TDEIcon::Any, 1); buttonNoCharge->setIconType( TDEIcon::NoGroup, TDEIcon::Any, 1); buttonCharge->setIconType( TDEIcon::NoGroup, TDEIcon::Any, 1); - connect(buttonNoBattery, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(iconChanged())); - connect(buttonNoCharge, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(iconChanged())); - connect(buttonCharge, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(configChanged())); + connect(buttonNoBattery, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(iconChanged())); + connect(buttonNoCharge, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(iconChanged())); + connect(buttonCharge, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(configChanged())); int num_batteries; @@ -178,7 +178,7 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name) top_layout->addStretch(1); startMonitor = new TQPushButton( i18n("&Start Battery Monitor"), this); - connect(startMonitor, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStartMonitor())); + connect(startMonitor, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStartMonitor())); top_layout->addWidget( startMonitor, 0, TQt::AlignRight ); load(); diff --git a/klaptopdaemon/battery.h b/klaptopdaemon/battery.h index b93be4b..84f8d10 100644 --- a/klaptopdaemon/battery.h +++ b/klaptopdaemon/battery.h @@ -44,7 +44,7 @@ class TQLabel; class BatteryConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: BatteryConfig( TQWidget *parent=0, const char* name=0); diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp index eed4b8d..cc27f5f 100644 --- a/klaptopdaemon/buttons.cpp +++ b/klaptopdaemon/buttons.cpp @@ -152,10 +152,10 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) TQWidget *wp = new TQWidget(lidBox); TQHBoxLayout *xl = new TQHBoxLayout( wp); xl->addWidget(new TQLabel("-", wp)); - lidValBrightness = new TQSlider(0, 255, 16, 255, Qt::Horizontal, wp); + lidValBrightness = new TQSlider(0, 255, 16, 255, TQt::Horizontal, wp); lidValBrightness->setEnabled(0); TQToolTip::add( lidValBrightness, i18n( "How bright the back panel will be set to" ) ); - connect (lidValBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect (lidValBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); xl->addWidget(lidValBrightness); xl->addWidget(new TQLabel("+", wp)); xl->addStretch(1); @@ -170,7 +170,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) TQToolTip::add( lidValPerformance, i18n( "The performance profile to switch to" ) ); lidValPerformance->insertStringList(performance_list); lidValPerformance->setEnabled(0); - connect (lidValPerformance, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (lidValPerformance, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(lidValPerformance); xl->addStretch(1); } @@ -184,13 +184,13 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) TQToolTip::add( lidValThrottle, i18n( "How much to throttle back the CPU" ) ); lidValThrottle->insertStringList(throttle_list); lidValThrottle->setEnabled(0); - connect (lidValThrottle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (lidValThrottle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(lidValThrottle); xl->addStretch(1); } - connect(lidBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(configChanged())); + connect(lidBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(configChanged())); } if (laptop_portable::has_button(laptop_portable::PowerButton)) { @@ -228,10 +228,10 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) TQWidget *wp = new TQWidget(powerBox); TQHBoxLayout *xl = new TQHBoxLayout( wp); xl->addWidget(new TQLabel("-", wp)); - powerValBrightness = new TQSlider(0, 255, 16, 255, Qt::Horizontal, wp); + powerValBrightness = new TQSlider(0, 255, 16, 255, TQt::Horizontal, wp); TQToolTip::add( powerValBrightness, i18n( "How bright the back panel will be set to" ) ); powerValBrightness->setEnabled(0); - connect (powerValBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect (powerValBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); xl->addWidget(powerValBrightness); xl->addWidget(new TQLabel("+", wp)); xl->addStretch(1); @@ -246,7 +246,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) TQToolTip::add( powerValPerformance, i18n( "The performance profile to switch to" ) ); powerValPerformance->insertStringList(performance_list); powerValPerformance->setEnabled(0); - connect (powerValPerformance, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (powerValPerformance, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(powerValPerformance); xl->addStretch(1); } @@ -260,11 +260,11 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) TQToolTip::add( powerValThrottle, i18n( "How much to throttle back the CPU" ) ); powerValThrottle->insertStringList(throttle_list); powerValThrottle->setEnabled(0); - connect (powerValThrottle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (powerValThrottle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(powerValThrottle); xl->addStretch(1); } - connect(powerBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(configChanged())); + connect(powerBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(configChanged())); } hlay->addStretch(1); diff --git a/klaptopdaemon/buttons.h b/klaptopdaemon/buttons.h index d66d20e..96ca27b 100644 --- a/klaptopdaemon/buttons.h +++ b/klaptopdaemon/buttons.h @@ -39,7 +39,7 @@ class KComboBox; class ButtonsConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: ButtonsConfig( TQWidget *parent=0, const char* name=0); diff --git a/klaptopdaemon/daemon_state.h b/klaptopdaemon/daemon_state.h index 0764e08..2ec5548 100644 --- a/klaptopdaemon/daemon_state.h +++ b/klaptopdaemon/daemon_state.h @@ -31,7 +31,7 @@ #include <tqimage.h> #include <tdelibs_export.h> -class KDE_EXPORT daemon_state +class TDE_EXPORT daemon_state { public: daemon_state(); diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp index 87c4f45..e2a388a 100644 --- a/klaptopdaemon/daemondock.cpp +++ b/klaptopdaemon/daemondock.cpp @@ -80,16 +80,16 @@ laptop_dock::SetupPopup() TQStringList throttle_list; int current_throttle; bool has_throttle = laptop_portable::get_system_throttling(0, current_throttle, throttle_list, active_list); - rightPopup->insertItem(SmallIcon("configure"), i18n("&Configure KLaptop..."), this, TQT_SLOT(invokeSetup())); + rightPopup->insertItem(SmallIcon("configure"), i18n("&Configure KLaptop..."), this, TQ_SLOT(invokeSetup())); if (has_brightness) - rightPopup->insertItem(i18n("Screen Brightness..."), this, TQT_SLOT(invokeBrightness())); + rightPopup->insertItem(i18n("Screen Brightness..."), this, TQ_SLOT(invokeBrightness())); if (has_performance) { performance_popup = new TQPopupMenu(0, "performance"); performance_popup->setCheckable(1); rightPopup->insertItem(i18n("Performance Profile..."), performance_popup); - connect( performance_popup, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( activate_performance( int ) ) ); - connect( performance_popup, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fill_performance() ) ); + connect( performance_popup, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( activate_performance( int ) ) ); + connect( performance_popup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( fill_performance() ) ); } else { performance_popup = 0; } @@ -97,24 +97,24 @@ laptop_dock::SetupPopup() throttle_popup = new TQPopupMenu(0, "throttle"); throttle_popup->setCheckable(1); rightPopup->insertItem(i18n("CPU Throttling..."), throttle_popup); - connect( throttle_popup, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( activate_throttle( int ) ) ); - connect( throttle_popup, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fill_throttle() ) ); + connect( throttle_popup, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( activate_throttle( int ) ) ); + connect( throttle_popup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( fill_throttle() ) ); } else { throttle_popup = 0; } if (can_standby || can_suspend || can_hibernate) { rightPopup->insertSeparator(); - if (can_standby) rightPopup->insertItem(i18n("Standby..."), this, TQT_SLOT(invokeStandby())); - // if (can_suspend) rightPopup->insertItem(i18n("&Lock && Suspend..."), this, TQT_SLOT(invokeLockSuspend())); - if (can_suspend) rightPopup->insertItem(i18n("&Suspend..."), this, TQT_SLOT(invokeLockSuspend())); - // if (can_hibernate) rightPopup->insertItem(i18n("&Lock && Hibernate..."), this, TQT_SLOT(invokeLockHibernation())); - if (can_hibernate) rightPopup->insertItem(i18n("&Hibernate..."), this, TQT_SLOT(invokeLockHibernation())); + if (can_standby) rightPopup->insertItem(i18n("Standby..."), this, TQ_SLOT(invokeStandby())); + // if (can_suspend) rightPopup->insertItem(i18n("&Lock && Suspend..."), this, TQ_SLOT(invokeLockSuspend())); + if (can_suspend) rightPopup->insertItem(i18n("&Suspend..."), this, TQ_SLOT(invokeLockSuspend())); + // if (can_hibernate) rightPopup->insertItem(i18n("&Lock && Hibernate..."), this, TQ_SLOT(invokeLockHibernation())); + if (can_hibernate) rightPopup->insertItem(i18n("&Hibernate..."), this, TQ_SLOT(invokeLockHibernation())); } rightPopup->insertSeparator(); - rightPopup->insertItem(i18n("&Hide Monitor"), this, TQT_SLOT(slotHide())); - rightPopup->insertItem(SmallIcon("system-log-out"), KStdGuiItem::quit().text(), this, TQT_SLOT(slotQuit())); + rightPopup->insertItem(i18n("&Hide Monitor"), this, TQ_SLOT(slotHide())); + rightPopup->insertItem(SmallIcon("system-log-out"), KStdGuiItem::quit().text(), this, TQ_SLOT(slotQuit())); } laptop_dock::~laptop_dock() @@ -198,10 +198,10 @@ laptop_dock::invokeBrightness() brightness_widget = new TQVBox(0L, "Brightness", WStyle_Customize | WType_Popup); brightness_widget->setFrameStyle(TQFrame::PopupPanel); brightness_widget->setMargin(KDialog::marginHint()); - brightness_slider = new TQSlider(0, 255, 16, 255-brightness, Qt::Vertical, brightness_widget, 0); + brightness_slider = new TQSlider(0, 255, 16, 255-brightness, TQt::Vertical, brightness_widget, 0); brightness_slider->setMinimumHeight(40); brightness_slider->setMinimumWidth(15); - connect(brightness_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(invokeBrightnessSlider(int))); + connect(brightness_slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(invokeBrightnessSlider(int))); brightness_widget->resize(brightness_widget->sizeHint()); } else { brightness_slider->setValue(255-brightness); @@ -251,8 +251,8 @@ void laptop_dock::slotGoRoot(int /*id*/) { *_rootProcess << "root"; //*_rootProcess << "--nonewdcop"; *_rootProcess << TDEStandardDirs::findExe("klaptopdaemon"); - connect(_rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(rootExited(TDEProcess*))); + connect(_rootProcess, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(rootExited(TDEProcess*))); _rootProcess->start(TDEProcess::NotifyOnExit); // We should disable this menu item here now. } @@ -362,7 +362,7 @@ KPCMCIAInfo *f = new KPCMCIAInfo(_pcmcia); void laptop_dock::mousePressEvent( TQMouseEvent *event ) { - if(event->button() == Qt::LeftButton) { + if(event->button() == TQt::LeftButton) { TQPopupMenu *popup = new TQPopupMenu(0, "popup"); if (!pdaemon->exists()) { @@ -419,30 +419,30 @@ void laptop_dock::mousePressEvent( TQMouseEvent *event ) _suspendActions.clear(); _resumeActions.clear(); _displayActions.clear(); - id = popup->insertItem(i18n("Card Slots..."), this, TQT_SLOT(slotDisplayAction(int))); + id = popup->insertItem(i18n("Card Slots..."), this, TQ_SLOT(slotDisplayAction(int))); _displayActions.insert(id, _pcmcia->getCard(0)); for (int i = 0; i < _pcmcia->getCardCount(); i++) { KPCMCIACard *thiscard; thiscard = _pcmcia->getCard(i); if (thiscard && (thiscard->present())) { TQPopupMenu *thisSub = new TQPopupMenu(popup, thiscard->name().latin1()); - id = thisSub->insertItem(i18n("Details..."), this, TQT_SLOT(slotDisplayAction(int))); + id = thisSub->insertItem(i18n("Details..."), this, TQ_SLOT(slotDisplayAction(int))); _displayActions.insert(id, thiscard); // add the actions TQPopupMenu *actionsSub = new TQPopupMenu(thisSub, "actions"); - id = actionsSub->insertItem(i18n("Eject"), this, TQT_SLOT(slotEjectAction(int))); + id = actionsSub->insertItem(i18n("Eject"), this, TQ_SLOT(slotEjectAction(int))); actionsSub->setItemEnabled(id, !(thiscard->status() & CARD_STATUS_BUSY)); _ejectActions.insert(id, thiscard); - id = actionsSub->insertItem(i18n("Suspend"), this, TQT_SLOT(slotSuspendAction(int))); + id = actionsSub->insertItem(i18n("Suspend"), this, TQ_SLOT(slotSuspendAction(int))); actionsSub->setItemEnabled(id, !(thiscard->status() & (CARD_STATUS_SUSPEND|CARD_STATUS_BUSY))); _suspendActions.insert(id, thiscard); - id = actionsSub->insertItem(i18n("Resume"), this, TQT_SLOT(slotResumeAction(int))); + id = actionsSub->insertItem(i18n("Resume"), this, TQ_SLOT(slotResumeAction(int))); actionsSub->setItemEnabled(id, (thiscard->status() & CARD_STATUS_SUSPEND)); _resumeActions.insert(id, thiscard); - id = actionsSub->insertItem(i18n("Reset"), this, TQT_SLOT(slotResetAction(int))); + id = actionsSub->insertItem(i18n("Reset"), this, TQ_SLOT(slotResetAction(int))); _resetActions.insert(id, thiscard); - id = actionsSub->insertItem(i18n("Insert"), this, TQT_SLOT(slotInsertAction(int))); + id = actionsSub->insertItem(i18n("Insert"), this, TQ_SLOT(slotInsertAction(int))); _insertActions.insert(id, thiscard); actionsSub->setItemEnabled(id, !(thiscard->status() & (CARD_STATUS_READY|CARD_STATUS_SUSPEND))); thisSub->insertItem(i18n("Actions"), actionsSub); @@ -469,15 +469,15 @@ void laptop_dock::mousePressEvent( TQMouseEvent *event ) } void laptop_dock::mouseReleaseEvent( TQMouseEvent *e ) { - if ( !TQT_TQRECT_OBJECT(rect()).contains( e->pos() ) ) + if ( !rect().contains( e->pos() ) ) return; switch ( e->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: break; - case Qt::MidButton: + case TQt::MidButton: // fall through - case Qt::RightButton: + case TQt::RightButton: { TDEPopupMenu *menu = contextMenu(); contextMenuAboutToShow( menu ); diff --git a/klaptopdaemon/daemondock.h b/klaptopdaemon/daemondock.h index 920ae26..821714c 100644 --- a/klaptopdaemon/daemondock.h +++ b/klaptopdaemon/daemondock.h @@ -40,7 +40,7 @@ class TDEPopupMenu; class laptop_dock : public KSystemTray { - Q_OBJECT + TQ_OBJECT public: diff --git a/klaptopdaemon/kpcmcia.cpp b/klaptopdaemon/kpcmcia.cpp index 941f739..1311997 100644 --- a/klaptopdaemon/kpcmcia.cpp +++ b/klaptopdaemon/kpcmcia.cpp @@ -367,7 +367,7 @@ _refreshSpeed = 750; _haveCardServices = false; _timer = new TQTimer(this); -connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateCardInfo())); +connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateCardInfo())); _cards = new TQMemArray<KPCMCIACard *>(_maxSlots+1); _cardCnt = 0; diff --git a/klaptopdaemon/kpcmcia.h b/klaptopdaemon/kpcmcia.h index 1040268..baca74c 100644 --- a/klaptopdaemon/kpcmcia.h +++ b/klaptopdaemon/kpcmcia.h @@ -177,7 +177,7 @@ private: class KPCMCIA : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/klaptopdaemon/kpcmciainfo.cpp b/klaptopdaemon/kpcmciainfo.cpp index e2e70d5..738b1e3 100644 --- a/klaptopdaemon/kpcmciainfo.cpp +++ b/klaptopdaemon/kpcmciainfo.cpp @@ -60,7 +60,7 @@ KPCMCIAInfo::KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent, const char *name) _mainTab->resize(KDialog::sizeHint()); resize(KDialog::sizeHint()); - connect(_pcmcia, TQT_SIGNAL(cardUpdated(int)), this, TQT_SLOT(updateCard(int))); + connect(_pcmcia, TQ_SIGNAL(cardUpdated(int)), this, TQ_SLOT(updateCard(int))); _sb = new KStatusBar(this); _sb->insertItem(i18n("Ready."), 0, 1, true); @@ -70,10 +70,10 @@ KPCMCIAInfo::KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent, const char *name) _updateButton = new TQPushButton(i18n("&Update"), this); _mainGrid->addWidget(_updateButton, 7, 3); - connect(_updateButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(update())); + connect(_updateButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(update())); _closeButton = new KPushButton(KStdGuiItem::close(), this); _mainGrid->addWidget(_closeButton, 7, 4); - connect(_closeButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotClose())); + connect(_closeButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotClose())); _mainGrid->setRowStretch(7, 0); show(); @@ -99,7 +99,7 @@ void KPCMCIAInfo::slotResetStatus() { void KPCMCIAInfo::statusNotice(const TQString& text, int life) { _sb->changeItem(text, 0); if (life > 0) - TQTimer::singleShot(life, this, TQT_SLOT(slotResetStatus())); + TQTimer::singleShot(life, this, TQ_SLOT(slotResetStatus())); } @@ -133,8 +133,8 @@ void KPCMCIAInfo::prepareCards() { for (int i = 0; i < _pcmcia->getCardCount(); i++) { TQString tabname = i18n("Card Slot %1"); KPCMCIAInfoPage *tp = new KPCMCIAInfoPage(_pcmcia->getCard(i), _mainTab); - connect(this, TQT_SIGNAL(updateNow()), tp, TQT_SLOT(update())); - connect(tp, TQT_SIGNAL(setStatusBar(const TQString&)), this, TQT_SLOT(slotTabSetStatus(const TQString&))); + connect(this, TQ_SIGNAL(updateNow()), tp, TQ_SLOT(update())); + connect(tp, TQ_SIGNAL(setStatusBar(const TQString&)), this, TQ_SLOT(slotTabSetStatus(const TQString&))); tp->resize(_mainTab->sizeHint()); _mainTab->addTab(tp, tabname.arg(i+1)); _pages.insert(i, tp); @@ -182,9 +182,9 @@ KPCMCIAInfoPage::KPCMCIAInfoPage(KPCMCIACard *card, TQWidget *parent, const char _mainGrid->addWidget(_card_ej_ins, 9, 5); _mainGrid->addWidget(_card_sus_res, 9, 6); _mainGrid->addWidget(_card_reset, 9, 7); - connect(_card_reset, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotResetCard())); - connect(_card_sus_res, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotSuspendResume())); - connect(_card_ej_ins, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotInsertEject())); + connect(_card_reset, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotResetCard())); + connect(_card_sus_res, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotSuspendResume())); + connect(_card_ej_ins, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotInsertEject())); update(); } diff --git a/klaptopdaemon/kpcmciainfo.h b/klaptopdaemon/kpcmciainfo.h index f6c1a67..43cefd4 100644 --- a/klaptopdaemon/kpcmciainfo.h +++ b/klaptopdaemon/kpcmciainfo.h @@ -38,7 +38,7 @@ class KPushButton; #include <tqmap.h> class KPCMCIAInfo : public KDialog { -Q_OBJECT +TQ_OBJECT public: @@ -77,7 +77,7 @@ class TQLabel; class KPCMCIAInfoPage : public TQFrame { -Q_OBJECT +TQ_OBJECT public: KPCMCIAInfoPage(KPCMCIACard *card, TQWidget *parent = NULL, const char *name = 0); diff --git a/klaptopdaemon/krichtextlabel.h b/klaptopdaemon/krichtextlabel.h index abd83c8..a01e609 100644 --- a/klaptopdaemon/krichtextlabel.h +++ b/klaptopdaemon/krichtextlabel.h @@ -33,7 +33,7 @@ * TQLabel */ class TDEUI_EXPORT KRichTextLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp index 97e70ba..20843f7 100644 --- a/klaptopdaemon/laptop_daemon.cpp +++ b/klaptopdaemon/laptop_daemon.cpp @@ -51,7 +51,7 @@ extern "C" { - KDE_EXPORT KDEDModule *create_klaptopdaemon(const TQCString& name) { + TDE_EXPORT KDEDModule *create_klaptopdaemon(const TQCString& name) { return new laptop_daemon(name); } } @@ -100,7 +100,7 @@ laptop_daemon::laptop_daemon(const TQCString& obj): KDEDModule(obj) sony_notifier = 0; knownFullyCharged = 0; sony_disp = 0; - connect(this, TQT_SIGNAL(signal_checkBattery()), TQT_SLOT(checkBatteryNow())); + connect(this, TQ_SIGNAL(signal_checkBattery()), TQ_SLOT(checkBatteryNow())); //hasAudio = (audioServer.serverStatus() == 0) ? true : false; @@ -113,8 +113,8 @@ laptop_daemon::laptop_daemon(const TQCString& obj): KDEDModule(obj) else _pcmcia = NULL; if (_pcmcia) - connect(_pcmcia, TQT_SIGNAL(cardUpdated(int)), this, TQT_SLOT(updatePCMCIA(int))); - connect( &autoLock, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) ); + connect(_pcmcia, TQ_SIGNAL(cardUpdated(int)), this, TQ_SLOT(updatePCMCIA(int))); + connect( &autoLock, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerDone()) ); } @@ -297,8 +297,8 @@ void laptop_daemon::restart() if (sony_notifier == 0) { sony_notifier = new TQSocketNotifier( sony_fd, TQSocketNotifier::Read, this ); if (sony_notifier) - TQObject::connect( sony_notifier, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(sonyDataReceived()) ); + TQObject::connect( sony_notifier, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(sonyDataReceived()) ); } } else { if (sony_notifier) { @@ -388,13 +388,13 @@ void laptop_daemon::timerDone() wakepos.setY(TQCursor::pos().y()); if (!wake_timer) { wake_timer = new TQTimer(this); - connect(wake_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(WakeCheck())); + connect(wake_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(WakeCheck())); wake_timer->start(1*1000, 1); } } else { if (!backoffTimer) { backoffTimer = new TQTimer(this); - connect(backoffTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(BackoffRestart())); + connect(backoffTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(BackoffRestart())); backoffTimer->start(60*1000, 1); } } diff --git a/klaptopdaemon/laptop_daemon.h b/klaptopdaemon/laptop_daemon.h index 19fb45e..2c4fad1 100644 --- a/klaptopdaemon/laptop_daemon.h +++ b/klaptopdaemon/laptop_daemon.h @@ -73,7 +73,7 @@ private: class laptop_dock; class laptop_daemon: public KDEDModule { - Q_OBJECT + TQ_OBJECT // K_DCOP public: diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp index 5068a4e..7a8c06b 100644 --- a/klaptopdaemon/main.cpp +++ b/klaptopdaemon/main.cpp @@ -48,49 +48,49 @@ extern void wake_laptop_daemon(); extern "C" { - KDE_EXPORT TDECModule *create_pcmcia(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_pcmcia(TQWidget *parent, const char *) { return new PcmciaConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_bwarning(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_bwarning(TQWidget *parent, const char *) { return new WarningConfig(0, parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_cwarning(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_cwarning(TQWidget *parent, const char *) { return new WarningConfig(1, parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_battery(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_battery(TQWidget *parent, const char *) { return new BatteryConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_power(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_power(TQWidget *parent, const char *) { return new PowerConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_acpi(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_acpi(TQWidget *parent, const char *) { return new AcpiConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_apm(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_apm(TQWidget *parent, const char *) { return new ApmConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_Profile(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_Profile(TQWidget *parent, const char *) { return new ProfileConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_sony(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_sony(TQWidget *parent, const char *) { return new SonyConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_buttons(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_buttons(TQWidget *parent, const char *) { return new ButtonsConfig(parent, "kcmlaptop"); } - KDE_EXPORT void init_battery() + TDE_EXPORT void init_battery() { TDEConfig config("kcmlaptoprc", true /*readonly*/, false /*no globals*/); config.setGroup("BatteryDefault"); @@ -111,12 +111,12 @@ extern "C" wake_laptop_daemon(); } - KDE_EXPORT TDECModule *create_laptop(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_laptop(TQWidget *parent, const char *) { return new LaptopModule(parent, "kcmlaptop"); } - KDE_EXPORT void init_laptop() + TDE_EXPORT void init_laptop() { init_battery(); } @@ -153,19 +153,19 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *) battery = new BatteryConfig(parent, "kcmlaptop"); tab->addTab(battery, i18n("&Battery")); - connect(battery, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(battery, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); power = new PowerConfig(parent, "kcmlaptop"); tab->addTab(power, i18n("&Power Control")); - connect(power, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(power, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); warning = new WarningConfig(0, parent, "kcmlaptop"); tab->addTab(warning, i18n("Low Battery &Warning")); - connect(warning, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(warning, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); critical = new WarningConfig(1, parent, "kcmlaptop"); tab->addTab(critical, i18n("Low Battery &Critical")); - connect(critical, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(critical, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); TQStringList profile_list; int current_profile; @@ -177,28 +177,28 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *) if (laptop_portable::has_brightness() || has_profile || has_throttling) { profile = new ProfileConfig(parent, "kcmlaptop"); tab->addTab(profile, i18n("Default Power Profiles")); - connect(profile, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(profile, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } else { profile = 0; } if (laptop_portable::has_button(laptop_portable::LidButton) || laptop_portable::has_button(laptop_portable::PowerButton)) { buttons = new ButtonsConfig(parent, "kcmlaptop"); tab->addTab(buttons, i18n("Button Actions")); - connect(buttons, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(buttons, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } else { buttons = 0; } if (laptop_portable::has_acpi()) { acpi = new AcpiConfig(parent, "kcmlaptop"); tab->addTab(acpi, i18n("&ACPI Config")); - connect(acpi, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(acpi, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } else { acpi = 0; } if (laptop_portable::has_apm()) { apm = new ApmConfig(parent, "kcmlaptop"); tab->addTab(apm, i18n("&APM Config")); - connect(apm, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(apm, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } else { apm = 0; } @@ -215,7 +215,7 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *) if (do_sony) { sony = new SonyConfig(parent, "kcmlaptop"); tab->addTab(sony, i18n("&Sony Laptop Config")); - connect(sony, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(sony, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } else { sony = 0; } diff --git a/klaptopdaemon/main.h b/klaptopdaemon/main.h index 8e3f660..1e8ef96 100644 --- a/klaptopdaemon/main.h +++ b/klaptopdaemon/main.h @@ -43,7 +43,7 @@ class ButtonsConfig; class LaptopModule : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/klaptopdaemon/pcmcia.h b/klaptopdaemon/pcmcia.h index ea915d6..5a081cf 100644 --- a/klaptopdaemon/pcmcia.h +++ b/klaptopdaemon/pcmcia.h @@ -40,7 +40,7 @@ class PcmciaConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: PcmciaConfig( TQWidget *parent=0, const char* name=0); diff --git a/klaptopdaemon/portable.h b/klaptopdaemon/portable.h index 42d8c16..c7ca415 100644 --- a/klaptopdaemon/portable.h +++ b/klaptopdaemon/portable.h @@ -34,7 +34,7 @@ struct power_result { // ATTENTION: if you change something in here, please update ALL of the // ported sections in the implementation file! -class KDE_EXPORT laptop_portable { +class TDE_EXPORT laptop_portable { public: static void power_management_restart(); // reset internal state static int has_power_management(); // returns 1 if this computer has power management diff --git a/klaptopdaemon/power.cpp b/klaptopdaemon/power.cpp index c29c425..cf132c9 100644 --- a/klaptopdaemon/power.cpp +++ b/klaptopdaemon/power.cpp @@ -145,11 +145,11 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) TQWidget *wp = new TQWidget(nopowerBox); TQHBoxLayout *xl = new TQHBoxLayout( wp); xl->addWidget(new TQLabel("-", wp)); - nopowerValBrightness = new TQSlider(0, 255, 16, 255, Qt::Horizontal, wp); + nopowerValBrightness = new TQSlider(0, 255, 16, 255, TQt::Horizontal, wp); TQToolTip::add( nopowerValBrightness, i18n( "How bright to change the back panel" ) ); nopowerValBrightness->setEnabled(0); - connect(nopowerValBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(nopowerBrightness, TQT_SIGNAL(toggled(bool)), nopowerValBrightness, TQT_SLOT(setEnabled(bool))); + connect(nopowerValBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(nopowerBrightness, TQ_SIGNAL(toggled(bool)), nopowerValBrightness, TQ_SLOT(setEnabled(bool))); xl->addWidget(nopowerValBrightness); xl->addWidget(new TQLabel("+", wp)); xl->addStretch(1); @@ -164,8 +164,8 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) TQToolTip::add( nopowerValPerformance, i18n( "Which profile to change it to" ) ); nopowerValPerformance->insertStringList(performance_list); nopowerValPerformance->setEnabled(0); - connect(nopowerValPerformance, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); - connect(nopowerPerformance, TQT_SIGNAL(toggled(bool)), nopowerValPerformance, TQT_SLOT(setEnabled(bool))); + connect(nopowerValPerformance, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed())); + connect(nopowerPerformance, TQ_SIGNAL(toggled(bool)), nopowerValPerformance, TQ_SLOT(setEnabled(bool))); xl->addWidget(nopowerValPerformance); xl->addStretch(1); } @@ -179,25 +179,25 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) TQToolTip::add( nopowerValThrottle, i18n( "How much to throttle the laptop's CPU" ) ); nopowerValThrottle->insertStringList(throttle_list); nopowerValThrottle->setEnabled(0); - connect(nopowerValThrottle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); - connect(nopowerThrottle, TQT_SIGNAL(toggled(bool)), nopowerValThrottle, TQT_SLOT(setEnabled(bool))); + connect(nopowerValThrottle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed())); + connect(nopowerThrottle, TQ_SIGNAL(toggled(bool)), nopowerValThrottle, TQ_SLOT(setEnabled(bool))); xl->addWidget(nopowerValThrottle); xl->addStretch(1); } - connect(nopowerBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(changed())); + connect(nopowerBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(changed())); bool can_lav = laptop_portable::has_lav(); TQHBox *hbox; if (can_lav) { hbox = new TQHBox( nopowerBox ); noenablelav = new TQCheckBox(i18n("Don't act if LAV is >"), hbox); - connect(noenablelav, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(noenablelav, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); noeditlav = new KDoubleSpinBox(0.0, 10.0, 0.0, 0.1, 1, hbox); TQToolTip::add( noeditlav, i18n( "If enabled and the system load average is greater than this value none of the above options will be applied" ) ); - connect(noeditlav, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(changed())); - connect(noenablelav, TQT_SIGNAL(toggled(bool)), noeditlav, TQT_SLOT(setEnabled(bool))); + connect(noeditlav, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(changed())); + connect(noenablelav, TQ_SIGNAL(toggled(bool)), noeditlav, TQ_SLOT(setEnabled(bool))); } hbox = new TQHBox( nopowerBox ); @@ -207,7 +207,7 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) noeditwait->setSuffix( i18n("keep short, unit in spinbox", "min") ); noedlabel->setBuddy( noeditwait ); hbox->setStretchFactor( noeditwait, 1 ); - connect( noeditwait, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect( noeditwait, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); /////////////////////////////////////////////////////////////// @@ -238,11 +238,11 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) TQWidget *wp = new TQWidget(powerBox); TQHBoxLayout *xl = new TQHBoxLayout( wp); xl->addWidget(new TQLabel("-", wp)); - powerValBrightness = new TQSlider(0, 255, 16, 255, Qt::Horizontal, wp); + powerValBrightness = new TQSlider(0, 255, 16, 255, TQt::Horizontal, wp); TQToolTip::add( powerValBrightness, i18n( "How bright to change the back panel" ) ); powerValBrightness->setEnabled(0); - connect(powerValBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(powerBrightness, TQT_SIGNAL(toggled(bool)), powerValBrightness, TQT_SLOT(setEnabled(bool))); + connect(powerValBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(powerBrightness, TQ_SIGNAL(toggled(bool)), powerValBrightness, TQ_SLOT(setEnabled(bool))); xl->addWidget(powerValBrightness); xl->addWidget(new TQLabel("+", wp)); xl->addStretch(1); @@ -257,8 +257,8 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) TQToolTip::add( powerValPerformance, i18n( "Which profile to change it to" ) ); powerValPerformance->insertStringList(performance_list); powerValPerformance->setEnabled(0); - connect(powerValPerformance, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); - connect(powerPerformance, TQT_SIGNAL(toggled(bool)), powerValPerformance, TQT_SLOT(setEnabled(bool))); + connect(powerValPerformance, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed())); + connect(powerPerformance, TQ_SIGNAL(toggled(bool)), powerValPerformance, TQ_SLOT(setEnabled(bool))); xl->addWidget(powerValPerformance); xl->addStretch(1); } @@ -272,22 +272,22 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) TQToolTip::add( powerValThrottle, i18n( "How much to throttle the laptop's CPU" ) ); powerValThrottle->insertStringList(throttle_list); powerValThrottle->setEnabled(0); - connect(powerValThrottle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); - connect(powerThrottle, TQT_SIGNAL(toggled(bool)), powerValThrottle, TQT_SLOT(setEnabled(bool))); + connect(powerValThrottle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed())); + connect(powerThrottle, TQ_SIGNAL(toggled(bool)), powerValThrottle, TQ_SLOT(setEnabled(bool))); xl->addWidget(powerValThrottle); xl->addStretch(1); } - connect(powerBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(changed())); + connect(powerBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(changed())); if (can_lav) { hbox = new TQHBox( powerBox ); enablelav = new TQCheckBox(i18n("Don't act if LAV is >"), hbox); - connect( enablelav, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect( enablelav, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); editlav = new KDoubleSpinBox(0.0, 10.0, 0.0, 0.1, 1, hbox); TQToolTip::add( editlav, i18n( "If enabled and the system load average is greater than this value none of the above options will be applied" ) ); - connect( editlav, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(changed())); - connect( enablelav, TQT_SIGNAL(toggled(bool)), editlav, TQT_SLOT(setEnabled(bool)) ); + connect( editlav, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(changed())); + connect( enablelav, TQ_SIGNAL(toggled(bool)), editlav, TQ_SLOT(setEnabled(bool)) ); } hbox = new TQHBox( powerBox ); @@ -297,7 +297,7 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) editwait->setSuffix( i18n("keep short, unit in spinbox", "min") ); edlabel->setBuddy( editwait ); hbox->setStretchFactor( editwait, 1 ); - connect( editwait, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect( editwait, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); hlay->addStretch(1); diff --git a/klaptopdaemon/power.h b/klaptopdaemon/power.h index ec9c1b4..645e1bd 100644 --- a/klaptopdaemon/power.h +++ b/klaptopdaemon/power.h @@ -40,7 +40,7 @@ class KDoubleSpinBox; class PowerConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: PowerConfig( TQWidget *parent=0, const char* name=0); diff --git a/klaptopdaemon/profile.cpp b/klaptopdaemon/profile.cpp index e60109e..24f6228 100644 --- a/klaptopdaemon/profile.cpp +++ b/klaptopdaemon/profile.cpp @@ -81,13 +81,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) poff = new TQCheckBox(i18n("Back panel brightness"), wp); TQToolTip::add( poff, i18n( "Enables the changing of the back panel brightness" ) ); xl->addWidget(poff); - connect (poff, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(poff_changed(bool))); + connect (poff, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(poff_changed(bool))); xl->addWidget(new TQLabel("-", wp)); - soff = new TQSlider(0, 255, 16, 160, Qt::Horizontal, wp); + soff = new TQSlider(0, 255, 16, 160, TQt::Horizontal, wp); soff->setEnabled(0); TQToolTip::add( soff, i18n( "How bright it should be when it is changed" ) ); - connect (soff, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect (soff, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); xl->addWidget(soff); xl->addWidget(new TQLabel("+", wp)); xl->addStretch(1); @@ -102,13 +102,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) performance_off = new TQCheckBox(i18n("System performance"), wp); TQToolTip::add( performance_off, i18n( "Enables the changing of the system performance profile" ) ); xl->addWidget(performance_off); - connect (performance_off, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(performance_off_changed(bool))); + connect (performance_off, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(performance_off_changed(bool))); performance_val_off = new KComboBox(0, wp); TQToolTip::add( performance_val_off, i18n( "The new system performance profile to change to" ) ); performance_val_off->insertStringList(performance_list); performance_val_off->setEnabled(0); - connect (performance_val_off, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (performance_val_off, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(performance_val_off); xl->addStretch(1); } else { @@ -121,13 +121,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) throttle_off = new TQCheckBox(i18n("CPU throttling"), wp); TQToolTip::add( throttle_off, i18n( "Enables the throttling of the CPU performance" ) ); xl->addWidget(throttle_off); - connect (throttle_off, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(throttle_off_changed(bool))); + connect (throttle_off, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(throttle_off_changed(bool))); throttle_val_off = new KComboBox(0, wp); throttle_val_off->insertStringList(throttle_list); throttle_val_off->setEnabled(0); TQToolTip::add( throttle_val_off, i18n( "How much to throttle the CPU by" ) ); - connect (throttle_val_off, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (throttle_val_off, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(throttle_val_off); xl->addStretch(1); } else { @@ -145,13 +145,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) pon = new TQCheckBox(i18n("Back panel brightness"), wp); TQToolTip::add( pon, i18n( "Enables the changing of the back panel brightness" ) ); xl->addWidget(pon); - connect (pon, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(pon_changed(bool))); + connect (pon, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(pon_changed(bool))); xl->addWidget(new TQLabel("-", wp)); - son = new TQSlider(0, 255, 16, 255, Qt::Horizontal, wp); + son = new TQSlider(0, 255, 16, 255, TQt::Horizontal, wp); son->setEnabled(0); TQToolTip::add( son, i18n( "How bright it should be when it is changed" ) ); - connect (son, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect (son, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); xl->addWidget(son); xl->addWidget(new TQLabel("+", wp)); xl->addStretch(1); @@ -165,13 +165,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) performance_on = new TQCheckBox(i18n("System performance"), wp); TQToolTip::add( performance_on, i18n( "Enables the changing of the system performance profile" ) ); xl->addWidget(performance_on); - connect (performance_on, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(performance_on_changed(bool))); + connect (performance_on, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(performance_on_changed(bool))); performance_val_on = new KComboBox(0, wp); performance_val_on->insertStringList(performance_list); performance_val_on->setEnabled(0); TQToolTip::add( performance_val_on, i18n( "The new system performance profile to change to" ) ); - connect (performance_val_on, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (performance_val_on, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(performance_val_on); xl->addStretch(1); } else { @@ -184,13 +184,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) throttle_on = new TQCheckBox(i18n("CPU throttle"), wp); TQToolTip::add( throttle_on, i18n( "Enables the throttling of the CPU performance" ) ); xl->addWidget(throttle_on); - connect (throttle_on, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(throttle_on_changed(bool))); + connect (throttle_on, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(throttle_on_changed(bool))); throttle_val_on = new KComboBox(0, wp); throttle_val_on->insertStringList(throttle_list); throttle_val_on->setEnabled(0); TQToolTip::add( throttle_val_on, i18n( "How much to throttle the CPU by" ) ); - connect (throttle_val_on, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (throttle_val_on, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(throttle_val_on); xl->addStretch(1); } else { diff --git a/klaptopdaemon/profile.h b/klaptopdaemon/profile.h index c518c92..df48e2c 100644 --- a/klaptopdaemon/profile.h +++ b/klaptopdaemon/profile.h @@ -41,7 +41,7 @@ class KComboBox; class ProfileConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: ProfileConfig( TQWidget *parent=0, const char* name=0); diff --git a/klaptopdaemon/sony.cpp b/klaptopdaemon/sony.cpp index 02b941a..b252876 100644 --- a/klaptopdaemon/sony.cpp +++ b/klaptopdaemon/sony.cpp @@ -73,12 +73,12 @@ SonyConfig::SonyConfig(TQWidget * parent, const char *name) enableScrollBar = new TQCheckBox( i18n("Enable &scroll bar"), this ); TQToolTip::add( enableScrollBar, i18n( "When checked this box enables the scrollbar so that it works under TDE" ) ); top_layout->addWidget( enableScrollBar ); - connect( enableScrollBar, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableScrollBar, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); enableMiddleEmulation = new TQCheckBox( i18n("&Emulate middle mouse button with scroll bar press"), this ); TQToolTip::add( enableMiddleEmulation, i18n( "When checked this box enables pressing the scroll bar to act in the same way as pressing the middle button on a 3 button mouse" ) ); top_layout->addWidget( enableMiddleEmulation ); - connect( enableMiddleEmulation, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableMiddleEmulation, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); if (::access("/dev/sonypi", R_OK) != 0) { enableMiddleEmulation->setEnabled(0); @@ -89,7 +89,7 @@ SonyConfig::SonyConfig(TQWidget * parent, const char *name) "protections need to be changed. Clicking on the button below will change them\n").replace("\n", " "), this)); TQHBoxLayout *ll = new TQHBoxLayout(); TQPushButton *setupButton = new TQPushButton(i18n("Setup /dev/sonypi"), this); - connect( setupButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(setupHelper()) ); + connect( setupButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(setupHelper()) ); TQToolTip::add( setupButton, i18n( "This button can be used to enable the sony specific features" ) ); ll->addStretch(2); ll->addWidget(setupButton); diff --git a/klaptopdaemon/sony.h b/klaptopdaemon/sony.h index 5339aaf..88baaf9 100644 --- a/klaptopdaemon/sony.h +++ b/klaptopdaemon/sony.h @@ -40,7 +40,7 @@ class TQPushButton; class SonyConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: SonyConfig( TQWidget *parent=0, const char* name=0); diff --git a/klaptopdaemon/wake_laptop.cpp b/klaptopdaemon/wake_laptop.cpp index c994057..bf3d5e6 100644 --- a/klaptopdaemon/wake_laptop.cpp +++ b/klaptopdaemon/wake_laptop.cpp @@ -26,7 +26,7 @@ #include <dcopclient.h> #include <tdeapplication.h> -KDE_EXPORT void +TDE_EXPORT void wake_laptop_daemon() { DCOPClient *dclient = kapp->dcopClient(); diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp index 5152d05..ab3edc1 100644 --- a/klaptopdaemon/warning.cpp +++ b/klaptopdaemon/warning.cpp @@ -88,12 +88,12 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) grid->addWidget(checkCriticalPercent, curRow, 0); grid->addWidget(editCriticalPercent, curRow++, TQt::AlignLeft); - connect(editCriticalTime, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(editCriticalPercent, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(checkCriticalTime, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(configChanged())); - connect(checkCriticalPercent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(configChanged())); - connect(checkCriticalTime, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(checkCriticalTimeChanged(bool))); - connect(checkCriticalPercent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(checkCriticalPercentChanged(bool))); + connect(editCriticalTime, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(editCriticalPercent, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(checkCriticalTime, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(configChanged())); + connect(checkCriticalPercent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(configChanged())); + connect(checkCriticalTime, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(checkCriticalTimeChanged(bool))); + connect(checkCriticalPercent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(checkCriticalPercentChanged(bool))); } else { checkLowTime = new TQCheckBox( i18n("Low &trigger:"), this ); checkLowPercent = new TQCheckBox( i18n("Low &trigger:"), this ); @@ -108,12 +108,12 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) grid->addWidget(checkLowPercent, curRow, 0); grid->addWidget(editLowPercent, curRow++, TQt::AlignLeft); - connect(editLowTime, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(editLowPercent, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(checkLowTime, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(configChanged())); - connect(checkLowPercent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(configChanged())); - connect(checkLowTime, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(checkLowTimeChanged(bool))); - connect(checkLowPercent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(checkLowPercentChanged(bool))); + connect(editLowTime, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(editLowPercent, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(checkLowTime, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(configChanged())); + connect(checkLowPercent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(configChanged())); + connect(checkLowTime, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(checkLowTimeChanged(bool))); + connect(checkLowPercent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(checkLowPercentChanged(bool))); } @@ -123,12 +123,12 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) editRunCommand = new KURLRequester( this ); editRunCommand->setEnabled(false); - connect( checkRunCommand, TQT_SIGNAL(toggled(bool)), - editRunCommand, TQT_SLOT(setEnabled(bool)) ); - connect( checkRunCommand, TQT_SIGNAL(clicked()), - this, TQT_SLOT(configChanged()) ); - connect( editRunCommand, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); + connect( checkRunCommand, TQ_SIGNAL(toggled(bool)), + editRunCommand, TQ_SLOT(setEnabled(bool)) ); + connect( checkRunCommand, TQ_SIGNAL(clicked()), + this, TQ_SLOT(configChanged()) ); + connect( editRunCommand, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); grid->addWidget(editRunCommand, curRow++, 1); TQToolTip::add( editRunCommand, i18n( "This command will be run when the battery gets low" ) ); @@ -138,24 +138,24 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) editPlaySound = new KURLRequester( this ); editPlaySound->setEnabled(false); - connect( checkPlaySound, TQT_SIGNAL(toggled(bool)), - editPlaySound, TQT_SLOT(setEnabled(bool)) ); - connect( checkPlaySound, TQT_SIGNAL(clicked()), - this, TQT_SLOT(configChanged()) ); - connect( editPlaySound, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); + connect( checkPlaySound, TQ_SIGNAL(toggled(bool)), + editPlaySound, TQ_SLOT(setEnabled(bool)) ); + connect( checkPlaySound, TQ_SIGNAL(clicked()), + this, TQ_SLOT(configChanged()) ); + connect( editPlaySound, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); grid->addWidget(editPlaySound, curRow++, 1); TQToolTip::add( editPlaySound, i18n( "This sound will play when the battery gets low" ) ); // setup the System Sound stuff checkBeep = new TQCheckBox(i18n("System &beep"), this); grid->addWidget(checkBeep, curRow++, 0); - connect(checkBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); TQToolTip::add( checkBeep, i18n( "The system will beep if this is enabled" ) ); checkNotify = new TQCheckBox(i18n("&Notify"), this); grid->addWidget(checkNotify, curRow++, 0); - connect(checkNotify, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkNotify, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); int can_suspend = laptop_portable::has_suspend(); int can_standby = laptop_portable::has_standby(); @@ -167,10 +167,10 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) checkBrightness->setMinimumSize(checkBrightness->sizeHint()); TQToolTip::add( checkBrightness, i18n( "If enabled the back panel brightness will change" ) ); grid->addWidget(checkBrightness, curRow, 0); - connect(checkBrightness, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(brightness_changed(bool))); + connect(checkBrightness, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(brightness_changed(bool))); TQHBoxLayout *v = new TQHBoxLayout(); v->addWidget(new TQLabel("-", this)); - valueBrightness = new TQSlider(0, 255, 16, 160, Qt::Horizontal, this); + valueBrightness = new TQSlider(0, 255, 16, 160, TQt::Horizontal, this); TQToolTip::add( valueBrightness, i18n( "How bright or dim to make the back panel" ) ); valueBrightness->setMaximumWidth(70); v->addWidget(valueBrightness); @@ -178,7 +178,7 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) v->addStretch(1); grid->addLayout(v, curRow, 1); valueBrightness->setEnabled(0); - connect(valueBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect(valueBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); ++curRow; } else { checkBrightness = 0; @@ -192,13 +192,13 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) performance = new TQCheckBox(i18n("System performance"), this); TQToolTip::add( performance, i18n( "If enabled the laptop's power performance profile will change" ) ); grid->addWidget(performance, curRow, 0); - connect (performance, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(performance_changed(bool))); + connect (performance, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(performance_changed(bool))); TQHBoxLayout *v = new TQHBoxLayout(); performance_val = new KComboBox(0, this); performance_val->insertStringList(performance_list); performance_val->setEnabled(0); - connect (performance_val, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (performance_val, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); TQToolTip::add( performance_val, i18n( "The performance profile to change to" ) ); v->addWidget(performance_val); v->addStretch(1); @@ -215,13 +215,13 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) throttle = new TQCheckBox(i18n("CPU throttling"), this); TQToolTip::add( throttle, i18n( "If enabled the CPU performance will be throttled" ) ); grid->addWidget(throttle, curRow, 0); - connect (throttle, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(throttle_changed(bool))); + connect (throttle, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(throttle_changed(bool))); TQHBoxLayout *v = new TQHBoxLayout(); throttle_val = new KComboBox(0, this); throttle_val->insertStringList(throttle_list); throttle_val->setEnabled(0); - connect (throttle_val, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (throttle_val, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); TQToolTip::add( throttle_val, i18n( "How much to throttle the CPU performance by" ) ); v->addWidget(throttle_val); v->addStretch(1); @@ -241,30 +241,30 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) checkStandby = new TQRadioButton(i18n("Standb&y"), b); TQToolTip::add( checkStandby, i18n( "Move the system into the standby state - a temporary lower power state" ) ); checkStandby->setMinimumSize(checkStandby->sizeHint()); - connect(checkStandby, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkStandby, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); } if (can_suspend) { checkSuspend = new TQRadioButton(i18n("&Suspend"), b); TQToolTip::add( checkSuspend, i18n( "Move the system into the suspend state - also known as 'save-to-ram'" ) ); checkSuspend->setMinimumSize(checkSuspend->sizeHint()); - connect(checkSuspend, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkSuspend, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); } if (can_hibernate) { checkHibernate = new TQRadioButton(i18n("H&ibernate"), b); TQToolTip::add( checkHibernate, i18n( "Move the system into the hibernate state - also known as 'save-to-disk'" ) ); checkHibernate->setMinimumSize(checkHibernate->sizeHint()); - connect(checkHibernate, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkHibernate, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); } // setup the logout option checkLogout = new TQRadioButton(i18n("&Logout"), b); - connect(checkLogout, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkLogout, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); // setup the shutdown option checkShutdown = new TQRadioButton(i18n("System power off"), b); TQToolTip::add( checkShutdown, i18n( "Power the laptop off" ) ); - connect(checkShutdown, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkShutdown, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); checkNone = new TQRadioButton(i18n("&None"), b); - connect(checkNone, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkNone, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); grid->addMultiCellWidget(b, curRow, curRow, 0, 1, TQt::AlignLeft|TQt::AlignTop); curRow++; diff --git a/klaptopdaemon/warning.h b/klaptopdaemon/warning.h index 5c07ed0..cadcef9 100644 --- a/klaptopdaemon/warning.h +++ b/klaptopdaemon/warning.h @@ -40,7 +40,7 @@ class KComboBox; class WarningConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: WarningConfig(int x, TQWidget *parent=0, const char* name=0); diff --git a/klaptopdaemon/xautolock.cc b/klaptopdaemon/xautolock.cpp index 93834af..93834af 100644 --- a/klaptopdaemon/xautolock.cc +++ b/klaptopdaemon/xautolock.cpp diff --git a/klaptopdaemon/xautolock.h b/klaptopdaemon/xautolock.h index de43be0..12a7eea 100644 --- a/klaptopdaemon/xautolock.h +++ b/klaptopdaemon/xautolock.h @@ -19,7 +19,7 @@ // class XAutoLock : public TQWidget { - Q_OBJECT + TQ_OBJECT public: XAutoLock(); |