From c36a2855c42ea04c7c1965228507e874426fd7e6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:39:11 -0600 Subject: Remove additional unneeded tq method conversions --- src/blacklistedit_Dialog.ui | 2 +- src/configure_Dialog.ui | 12 ++++++------ src/configuredialog.cpp | 2 +- src/countdown_Dialog.ui | 2 +- src/countdowndialog.cpp | 4 ++-- src/dbusHAL.cpp | 2 +- src/detailed_Dialog.ui | 8 ++++---- src/detaileddialog.cpp | 12 ++++++------ src/dummy.cpp | 40 ++++++++++++++++++++-------------------- src/hardware.cpp | 2 +- src/hardware.h | 2 +- src/info_Dialog.ui | 2 +- src/kpowersave.cpp | 44 ++++++++++++++++++++++---------------------- src/kpowersave.h | 2 +- src/logviewer.cpp | 2 +- 15 files changed, 69 insertions(+), 69 deletions(-) (limited to 'src') diff --git a/src/blacklistedit_Dialog.ui b/src/blacklistedit_Dialog.ui index 3e25290..557aea5 100644 --- a/src/blacklistedit_Dialog.ui +++ b/src/blacklistedit_Dialog.ui @@ -205,7 +205,7 @@ - + AlignBottom diff --git a/src/configure_Dialog.ui b/src/configure_Dialog.ui index 7c49fb1..98005da 100644 --- a/src/configure_Dialog.ui +++ b/src/configure_Dialog.ui @@ -530,7 +530,7 @@ - + WordBreak|AlignTop @@ -637,7 +637,7 @@ after: - + AlignCenter @@ -861,7 +861,7 @@ after: - + AlignCenter @@ -1179,7 +1179,7 @@ RichText - + WordBreak|AlignTop @@ -1471,7 +1471,7 @@ RichText - + WordBreak|AlignTop @@ -1688,7 +1688,7 @@ RichText - + WordBreak|AlignTop diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp index 2d49931..1ca5fea 100644 --- a/src/configuredialog.cpp +++ b/src/configuredialog.cpp @@ -1074,7 +1074,7 @@ void ConfigureDialog::pB_deleteScheme_clicked(){ if (pB_deleteScheme->isEnabled()) { int answer = KMessageBox::questionYesNo( this, i18n("Do you really want to delete the " - "%1 scheme?").tqarg(schemes[currentScheme]), + "%1 scheme?").arg(schemes[currentScheme]), i18n("Confirm delete scheme"), i18n("Delete"), i18n("Cancel")); if (answer == KMessageBox::Yes) { diff --git a/src/countdown_Dialog.ui b/src/countdown_Dialog.ui index 3e4c1ca..5531538 100644 --- a/src/countdown_Dialog.ui +++ b/src/countdown_Dialog.ui @@ -142,7 +142,7 @@ AutoText - + WordBreak|AlignVCenter diff --git a/src/countdowndialog.cpp b/src/countdowndialog.cpp index 6abaf90..f8d268d 100644 --- a/src/countdowndialog.cpp +++ b/src/countdowndialog.cpp @@ -114,7 +114,7 @@ bool countDownDialog::showDialog() { if (!textLabel->text().isEmpty() && timeOut > 0) { // init the progressbar - progressBar->setFormat(i18n("%1 seconds").tqarg(remaining)); + progressBar->setFormat(i18n("%1 seconds").arg(remaining)); progressBar->setPercentageVisible(true); progressBar->setProgress(100); progressBar->setEnabled(true); @@ -160,7 +160,7 @@ void countDownDialog::updateProgress() { int setTo = (int)((100.0/(float)timeOut)*(float)remaining); // set the progressBar - progressBar->setFormat(i18n("%1 seconds").tqarg(remaining)); + progressBar->setFormat(i18n("%1 seconds").arg(remaining)); progressBar->setPercentageVisible(true); progressBar->setProgress(setTo); progressBar->setEnabled(true); diff --git a/src/dbusHAL.cpp b/src/dbusHAL.cpp index 6983eb3..4bac9c8 100644 --- a/src/dbusHAL.cpp +++ b/src/dbusHAL.cpp @@ -1288,7 +1288,7 @@ filterFunction (DBusConnection *connection, DBusMessage *message, void */*data*/ if (dbus_message_get_args( message, &error, DBUS_TYPE_BOOLEAN, &active, DBUS_TYPE_INVALID )) { ((dbusHAL*) myInstance)->emitMsgReceived( CONSOLEKIT_SESSION_ACTIVE, - session, TQString("%1").tqarg((int)active)); + session, TQString("%1").arg((int)active)); } else { if (dbus_error_is_set( &error )) dbus_error_free( &error ); } diff --git a/src/detailed_Dialog.ui b/src/detailed_Dialog.ui index b34b485..89f16f1 100644 --- a/src/detailed_Dialog.ui +++ b/src/detailed_Dialog.ui @@ -92,7 +92,7 @@ - + AlignTop|AlignRight @@ -111,7 +111,7 @@ - + AlignTop @@ -322,7 +322,7 @@ plugged in - + AlignVCenter|AlignRight @@ -351,7 +351,7 @@ - + AlignVCenter|AlignRight diff --git a/src/detaileddialog.cpp b/src/detaileddialog.cpp index 9f9b0a2..a8cc129 100644 --- a/src/detaileddialog.cpp +++ b/src/detaileddialog.cpp @@ -78,9 +78,9 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settin if ((primaryBatteries->getNumBatteries() > 1) && (i == 0)) Label->setText( i18n( "Total:" )); else if ((primaryBatteries->getNumBatteries() > 1) && (i > 0)) - Label->setText( i18n( "Battery %1" ).tqarg(i)); + Label->setText( i18n( "Battery %1" ).arg(i)); else - Label->setText( i18n( "Battery %1" ).tqarg(i + 1)); + Label->setText( i18n( "Battery %1" ).arg(i + 1)); BatteryGridLayout->addWidget( Label, i , 0); @@ -111,7 +111,7 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settin for (int i = 0; i < numOfCPUs; i++) { TQLabel *Label = new TQLabel(ProcessorFrame, "ProcessorLabel"); - Label->setText( i18n( "Processor %1" ).tqarg(i + 1)); + Label->setText( i18n( "Processor %1" ).arg(i + 1)); ProcessorGridLayout->addWidget( Label, i , 0); KProgress *CPUPBar = new KProgress(ProcessorFrame, "ProcessorPBar"); @@ -242,10 +242,10 @@ void detaileddialog::setBattery() { // this should fix apm, where we have no time info if charging BatteryPBar[i]->setFormat("%p% " + i18n("charged")); } else if (_c_state == CHARGING) { - TQString temp = i18n("%1:%2 h until charged").tqarg(hours).tqarg(minutes); + TQString temp = i18n("%1:%2 h until charged").arg(hours).arg(minutes); BatteryPBar[i]->setFormat(temp); } else if (_c_state == DISCHARGING) { - TQString temp = i18n("%1:%2 h remaining").tqarg(hours).tqarg(minutes); + TQString temp = i18n("%1:%2 h remaining").arg(hours).arg(minutes); BatteryPBar[i]->setFormat(temp); } else { @@ -355,7 +355,7 @@ void detaileddialog::setProcessorThrottling() { if (throttling && cpuInfo->cpufreq_speed[i] > 0 && cpuInfo->cpu_throttling[i] >= 0) { // get max cpu freq and set it to the max of the progressbar ProcessorPBar[i]->setTotalSteps(100); - TQString ProgressString = TQString("%1% (%2 MHz)").tqarg(100 - cpuInfo->cpu_throttling[i]).tqarg(cpuInfo->cpufreq_speed[i]); + TQString ProgressString = TQString("%1% (%2 MHz)").arg(100 - cpuInfo->cpu_throttling[i]).arg(cpuInfo->cpufreq_speed[i]); ProcessorPBar[i]->setFormat(i18n(ProgressString.ascii())); ProcessorPBar[i]->setProgress(100 - cpuInfo->cpu_throttling[i]); ProcessorPBar[i]->setEnabled(true); diff --git a/src/dummy.cpp b/src/dummy.cpp index bd3f2f9..5f5b01f 100644 --- a/src/dummy.cpp +++ b/src/dummy.cpp @@ -57,20 +57,20 @@ class dummy { dummy = i18n("activated"); dummy = i18n("deactivated"); dummy = i18n("do nothing"); - dummy = i18n("Deactivate following tqdevices:"); - dummy = i18n("Activate following tqdevices"); - dummy = i18n("Reactivate following tqdevices"); - dummy = i18n("Deactivate following tqdevice classes:"); - dummy = i18n("Activate following tqdevices classes"); - dummy = i18n("Reactivate following tqdevice classes"); - dummy = i18n("If the scheme switched all tqdevices are again activated."); + dummy = i18n("Deactivate following devices:"); + dummy = i18n("Activate following devices"); + dummy = i18n("Reactivate following devices"); + dummy = i18n("Deactivate following device classes:"); + dummy = i18n("Activate following devices classes"); + dummy = i18n("Reactivate following device classes"); + dummy = i18n("If the scheme switched all devices are again activated."); dummy = i18n("This is a experimental feature."); dummy = i18n("If you have problems with this feature, please report them."); - dummy = i18n("Select one of the available tqdevices and click on "); - dummy = i18n("Select one of the available tqdevice classes and click on "); - dummy = i18n("Select one or more of the available tqdevices and click on "); - dummy = i18n("Select one or more of the available tqdevice classes and click on "); - dummy = i18n("Please note: If you e.g. deactivate a network tqdevice you may lose your " + dummy = i18n("Select one of the available devices and click on "); + dummy = i18n("Select one of the available device classes and click on "); + dummy = i18n("Select one or more of the available devices and click on "); + dummy = i18n("Select one or more of the available device classes and click on "); + dummy = i18n("Please note: If you e.g. deactivate a network device you may lose your " "internet connection."); dummy = i18n("Note: If you select this option, the computer will suspend or standby " "if the current user is inactive for the defined time.

This feature " @@ -92,11 +92,11 @@ class dummy { // for kpowersave.cpp: dummy = i18n("Cannot connect to D-Bus. The D-Bus daemon may not be running."); - dummy = i18n("Scheme switched to %1. \n Deactivate following tqdevices: %2").tqarg("").tqarg(""); - dummy = i18n("Scheme switched to %1. \n Activate following tqdevices: %2").tqarg("").tqarg(""); + dummy = i18n("Scheme switched to %1. \n Deactivate following devices: %2").arg("").arg(""); + dummy = i18n("Scheme switched to %1. \n Activate following devices: %2").arg("").arg(""); dummy = i18n("Report ..."); dummy = i18n("Suspend to RAM is not supported on your machine."); - dummy = i18n("Additionally, please mail the output of %1 to %2 . Thanks!").tqarg("").tqarg(""); + dummy = i18n("Additionally, please mail the output of %1 to %2 . Thanks!").arg("").arg(""); dummy = i18n("Power consumption"); // for screen.cpp @@ -116,12 +116,12 @@ class dummy { dummy = i18n("Session active:"); // for countdowndialog.cpp - dummy = i18n("The display get dimmed down to %1% in: ").tqarg(30); + dummy = i18n("The display get dimmed down to %1% in: ").arg(30); // other ConsoleKit related stuff - dummy = i18n("Could not call %1. The current desktop session is not active.").tqarg(""); - dummy = i18n("Could not set %1. The current desktop session is not active.").tqarg(""); - dummy = i18n("Stopped %1. The current desktop session is now inactive.").tqarg(""); - dummy = i18n("Restarted %1. The current desktop session is now active again.").tqarg(""); + dummy = i18n("Could not call %1. The current desktop session is not active.").arg(""); + dummy = i18n("Could not set %1. The current desktop session is not active.").arg(""); + dummy = i18n("Stopped %1. The current desktop session is now inactive.").arg(""); + dummy = i18n("Restarted %1. The current desktop session is now active again.").arg(""); } }; diff --git a/src/hardware.cpp b/src/hardware.cpp index 2053180..ab65969 100644 --- a/src/hardware.cpp +++ b/src/hardware.cpp @@ -891,7 +891,7 @@ void HardwareInfo::checkLidcloseState() { if (dbus_HAL->halGetPropertyBool(*udis["lidclose"] , "button.state.value", &_state )) { if (_state != lidclose) { lidclose = _state; - emit lidcloseStatus( lidclose ); + emit lidclosetStatus( lidclose ); } } else { lidclose = false; diff --git a/src/hardware.h b/src/hardware.h index b3864b8..9df2ce5 100644 --- a/src/hardware.h +++ b/src/hardware.h @@ -364,7 +364,7 @@ signals: //! signal the AC adapter void ACStatus( bool ); //! signal for the lidclose button - void lidcloseStatus ( bool ); + void lidclosetStatus ( bool ); //! signal for pressed the power button void powerButtonPressed (); //! signal for pressed sleep (suspend2ram) button diff --git a/src/info_Dialog.ui b/src/info_Dialog.ui index ea2fa91..1b95e5e 100644 --- a/src/info_Dialog.ui +++ b/src/info_Dialog.ui @@ -106,7 +106,7 @@ - + WordBreak|AlignTop diff --git a/src/kpowersave.cpp b/src/kpowersave.cpp index 5afd915..b1c3a35 100644 --- a/src/kpowersave.cpp +++ b/src/kpowersave.cpp @@ -106,7 +106,7 @@ kpowersave::kpowersave( bool force_acpi_check, bool trace_func ) : KSystemTray(0 connect(hwinfo, TQT_SIGNAL(dbusRunning(int)), this, TQT_SLOT(showDBusErrorMsg(int))); // connect to events - connect(hwinfo, TQT_SIGNAL(lidcloseStatus(bool)), this, TQT_SLOT(handleLidEvent(bool))); + connect(hwinfo, TQT_SIGNAL(lidclosetStatus(bool)), this, TQT_SLOT(handleLidEvent(bool))); connect(hwinfo, TQT_SIGNAL(powerButtonPressed()), this, TQT_SLOT (handlePowerButtonEvent())); connect(hwinfo, TQT_SIGNAL(sleepButtonPressed()), this, TQT_SLOT (handleSleepButtonEvent())); connect(hwinfo, TQT_SIGNAL(s2diskButtonPressed()), this, TQT_SLOT (handleS2DiskButtonEvent())); @@ -474,26 +474,26 @@ void kpowersave::updateTooltip(){ else if (minutes > 0){ if (charging_state == CHARGING) tmp = i18n("Plugged in -- %1% charged (%2:%3 h until full " - "charged)").tqarg(percent).tqarg(minutes / 60).tqarg(num3); + "charged)").arg(percent).arg(minutes / 60).arg(num3); else tmp = i18n("Plugged in -- %1% charged (%2:%3 remaining hours)") - .tqarg(percent).tqarg(minutes / 60).tqarg(num3); + .arg(percent).arg(minutes / 60).arg(num3); } else if (charging_state == CHARGING && hwinfo->hasAPM()) { - tmp = i18n("Plugged in -- %1% charged").tqarg(percent); + tmp = i18n("Plugged in -- %1% charged").arg(percent); } else{ if (percent == -1) tmp = i18n("Plugged in -- no battery"); - else tmp = i18n("Plugged in -- %1% charged").tqarg(percent); + else tmp = i18n("Plugged in -- %1% charged").arg(percent); } } } else{ if (minutes >= 0){ tmp = i18n("Running on batteries -- %1% charged (%2:%3 hours remaining)") - .tqarg(percent).tqarg(minutes / 60).tqarg(num3); + .arg(percent).arg(minutes / 60).arg(num3); } else { - tmp = i18n("Running on batteries -- %1% charged").tqarg(percent); + tmp = i18n("Running on batteries -- %1% charged").arg(percent); } } // add string whether battery is charging, but only if < 100% to avoid @@ -873,7 +873,7 @@ void kpowersave::do_autosuspendWarn() { // TODO: rework this after translation round for openSUSE 10.3 ! message = i18n("Inactivity detected.") + " " + i18n("To stop the %1 press the 'Cancel' button before the countdown " - "expire.").tqarg(i18n("Autosuspend")) + "\n\n" + + "expire.").arg(i18n("Autosuspend")) + "\n\n" + i18n("The computer autosuspend in: "); countdown->setMessageText(message); @@ -1104,13 +1104,13 @@ bool kpowersave::handleMounts( bool suspend ) { _msg = "" + i18n("Could not umount external media before suspend/standby. \n " "(Reason: %1)\n \n Would you like to continue suspend/standby " - "anyway? \n(Warning: Continue suspend can cause data loss!)").tqarg(_e_msg) + + "anyway? \n(Warning: Continue suspend can cause data loss!)").arg(_e_msg) + ""; _suspend = getSuspendString(calledSuspend); int answer = KMessageBox::questionYesNo( 0, _msg, - i18n("Error while prepare %1").tqarg(_suspend), + i18n("Error while prepare %1").arg(_suspend), i18n("Suspend anyway"), i18n("Cancel suspend"), "ignoreMountOnSuspend"); @@ -1306,7 +1306,7 @@ void kpowersave::do_setSpeedPolicy(int menu_id){ if(!hwinfo->setCPUFreq((cpufreq_type)menu_id, settings->cpuFreqDynamicPerformance)) { KPassivePopup::message(i18n("WARNING"), - i18n("CPU Freq Policy %1 could not be set.").tqarg(speed_menu->text(menu_id)), + i18n("CPU Freq Policy %1 could not be set.").arg(speed_menu->text(menu_id)), SmallIcon("messagebox_warning", 20), this, i18n("Warning").ascii(), 10000); } else { hwinfo->checkCurrentCPUFreqPolicy(); @@ -1335,7 +1335,7 @@ void kpowersave::do_setActiveScheme( int i ){ notifySchemeSwitch(); } else if (!settings->schemes[i]){ KPassivePopup::message( i18n("WARNING"), - i18n("Scheme %1 could not be activated.").tqarg(scheme_menu->text(i)), + i18n("Scheme %1 could not be activated.").arg(scheme_menu->text(i)), SmallIcon("messagebox_warning", 20), this, i18n("Warning").ascii(), 5000); } @@ -1990,7 +1990,7 @@ void kpowersave::notifyBatteryStatusChange ( int type, int state ) { if (!settings->disableNotifications) KNotifyClient::event(this->winId(), "battery_warning_event", i18n("Battery state changed to WARNING -- remaining time: " - "%1 hours and %2 minutes.").tqarg(min/60).tqarg(min%60)); + "%1 hours and %2 minutes.").arg(min/60).arg(min%60)); // set/call related actions handleActionCall(settings->batteryWarningLevelAction, settings->batteryWarningLevelActionValue); @@ -1999,7 +1999,7 @@ void kpowersave::notifyBatteryStatusChange ( int type, int state ) { if (!settings->disableNotifications) KNotifyClient::event(this->winId(), "battery_low_event", i18n("Battery state changed to LOW -- remaining time: " - "%1 hours and %2 minutes.").tqarg(min/60).tqarg(min%60)); + "%1 hours and %2 minutes.").arg(min/60).arg(min%60)); // set/call related actions handleActionCall(settings->batteryLowLevelAction, settings->batteryLowLevelActionValue); @@ -2014,7 +2014,7 @@ void kpowersave::notifyBatteryStatusChange ( int type, int state ) { "Shut down your system or plug in the power " "cable immediately. Otherwise the machine\n" "will go shutdown in 30 seconds") - .tqarg(min/ 60).tqarg(min%60)); + .arg(min/ 60).arg(min%60)); TQTimer::singleShot(30000, this, TQT_SLOT(handleCriticalBatteryActionCall())); } else { @@ -2024,7 +2024,7 @@ void kpowersave::notifyBatteryStatusChange ( int type, int state ) { "remaining time: %1 hours and %2 minutes.\n" "Shut down your system or plug in the power " "cable immediately.") - .tqarg(min/ 60).tqarg(min%60)); + .arg(min/ 60).arg(min%60)); handleActionCall(settings->batteryCriticalLevelAction, settings->batteryCriticalLevelActionValue); @@ -2181,7 +2181,7 @@ void kpowersave::notifySchemeSwitch() { eventType = "scheme_" + _scheme; KNotifyClient::event( this->winId(), eventType, - i18n("Switched to scheme: %1").tqarg(i18n(_scheme.ascii())).ascii()); + i18n("Switched to scheme: %1").arg(i18n(_scheme.ascii())).ascii()); } kdDebugFuncOut(trace); @@ -2258,17 +2258,17 @@ void kpowersave::handleResumeSignal() { switch (calledSuspend) { case SUSPEND2DISK: KNotifyClient::event( this->winId(), "resume_from_suspend2disk_event", - i18n("System is resumed from %1.").tqarg( + i18n("System is resumed from %1.").arg( i18n("Suspend to Disk"))); break; case SUSPEND2RAM: KNotifyClient::event( this->winId(), "resume_from_suspend2ram_event", - i18n("System is resumed from %1.").tqarg( + i18n("System is resumed from %1.").arg( i18n("Suspend to RAM"))); break; case STANDBY: KNotifyClient::event( this->winId(), "resume_from_standby_event", - i18n("System is resumed from %1.").tqarg( + i18n("System is resumed from %1.").arg( i18n("Standby"))); break; default: @@ -2297,7 +2297,7 @@ void kpowersave::handleResumeSignal() { TQString msg; msg = i18n("An unknown error occurred while %1. The errorcode is: '%2'"). - tqarg(getSuspendString(calledSuspend)).tqarg(resume_result); + arg(getSuspendString(calledSuspend)).arg(resume_result); #if defined(DISTRO_IS_SUSE) || defined(DISTRO_IS_SLES_SLED) || defined(DISTRO_IS_PARDUS) // okay we know this system use pm-utils and log is under /var/log/pm-suspend.log @@ -2328,7 +2328,7 @@ void kpowersave::handleResumeSignal() { #endif } #else - KMessageBox::error(0, msg, i18n("Error while %1").tqarg(getSuspendString(calledSuspend))); + KMessageBox::error(0, msg, i18n("Error while %1").arg(getSuspendString(calledSuspend))); #endif } // set back ... suspend is handled diff --git a/src/kpowersave.h b/src/kpowersave.h index 62a22eb..af0d49c 100644 --- a/src/kpowersave.h +++ b/src/kpowersave.h @@ -390,7 +390,7 @@ private slots: //! set for a battery status the related actions void handleActionCall ( action action, int value, bool checkAC = false, bool batWarnCall = false ); - //! this lock/reactivate the screen if a lidcloseStatus() signal is triggered + //! this lock/reactivate the screen if a lidclosetStatus() signal is triggered void handleLidEvent( bool closed ); //! show the login dialog after locked the screen void activateLoginScreen(); diff --git a/src/logviewer.cpp b/src/logviewer.cpp index f63e797..b3083ce 100644 --- a/src/logviewer.cpp +++ b/src/logviewer.cpp @@ -41,7 +41,7 @@ LogViewer::LogViewer( TQString filename, TQWidget *parent, const char *name) :log_viewer(parent, name, false, WDestructiveClose ) { - this->setCaption(i18n("KPowersave Logfile Viewer: %1").tqarg(filename)); + this->setCaption(i18n("KPowersave Logfile Viewer: %1").arg(filename)); if (!TQFile::exists ( filename )) return; -- cgit v1.2.1