From fe9b5d95c9a717fea16685ed7c175e1659d7127c Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpowersave@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/Makefile.am | 2 +- src/blacklisteditdialog.cpp | 2 +- src/configuredialog.cpp | 16 ++++++++-------- src/hardware.cpp | 28 ++++++++++++++-------------- src/hardware_batteryCollection.cpp | 2 +- src/hardware_cpu.cpp | 6 +++--- src/inactivity.cpp | 2 +- src/kpowersave.cpp | 8 ++++---- src/screen.cpp | 2 +- 9 files changed, 34 insertions(+), 34 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index d5d7a6a..a4d826f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -93,7 +93,7 @@ shellrc_DATA = eventsrc SUBDIRS = pics messages: $(EXTRACTRC) *ui eventsrc >> rc.cpp - $(XGETTEXT) `tqfind . -name \*.h -o -name \*.H -o -name \*.cpp -o -name \*.C` -o $(podir)/kpowersave.pot + $(XGETTEXT) `find . -name \*.h -o -name \*.H -o -name \*.cpp -o -name \*.C` -o $(podir)/kpowersave.pot rm -f rc.cpp install-data-local: diff --git a/src/blacklisteditdialog.cpp b/src/blacklisteditdialog.cpp index 02eda50..e2f33ad 100644 --- a/src/blacklisteditdialog.cpp +++ b/src/blacklisteditdialog.cpp @@ -129,7 +129,7 @@ void blacklistEditDialog::pB_add_released(){ // remove the whitespaces and check if text is empty if(text.stripWhiteSpace() != "") { // check if the entry is already present - if(!lB_blacklist->tqfindItem(text, TQt::ExactMatch)) { + if(!lB_blacklist->findItem(text, TQt::ExactMatch)) { lB_blacklist->insertItem(text); lB_blacklist->sort(); blacklist.append(text); diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp index 3c0387b..7091b11 100644 --- a/src/configuredialog.cpp +++ b/src/configuredialog.cpp @@ -205,7 +205,7 @@ void ConfigureDialog::selectScheme (TQString _scheme){ // select the current scheme in the listbox if(!_scheme.isEmpty()) { - int pos = schemes.tqfindIndex(_scheme); + int pos = schemes.findIndex(_scheme); if(pos > -1) { listBox_schemes->setCurrentItem(pos); currentScheme = pos; @@ -451,7 +451,7 @@ void ConfigureDialog::setConfigToDialog( int schemeID ){ // set autosuspend related settings TQString _action = kconfig->readEntry("autoInactiveAction", "NULL"); if( _action != "NULL") { - int _index = actions.tqfindIndex(_action); + int _index = actions.findIndex(_action); if( _index != -1) { cB_autoInactivity->setCurrentItem( _index ); cB_autoInactivity_activated( _index ); @@ -473,7 +473,7 @@ void ConfigureDialog::setConfigToDialog( int schemeID ){ kconfig->setGroup("default-scheme"); _action = kconfig->readEntry("autoInactiveAction", "NULL"); if(_action != "NULL") { - int _index = actions.tqfindIndex(_action); + int _index = actions.findIndex(_action); if( _index != -1) { cB_autoInactivity->setCurrentItem( _index ); tL_autoInactivity_After->setEnabled(true); @@ -734,8 +734,8 @@ void ConfigureDialog::setGeneralSettings() { // default scheme tab: TQString _ac_scheme = kconfig->readEntry( "ac_scheme", "Performance"); TQString _bat_scheme = kconfig->readEntry( "battery_scheme", "Powersave"); - cB_acScheme->setCurrentItem(schemes.tqfindIndex(_ac_scheme)); - cB_batteryScheme->setCurrentItem(schemes.tqfindIndex(_bat_scheme)); + cB_acScheme->setCurrentItem(schemes.findIndex(_ac_scheme)); + cB_batteryScheme->setCurrentItem(schemes.findIndex(_bat_scheme)); kdDebugFuncOut(trace); } @@ -1042,7 +1042,7 @@ void ConfigureDialog::pB_newScheme_clicked(){ } else { _error = TQString(); if (!_new.isEmpty()) { - if ( schemes.tqcontains(_new)) + if ( schemes.contains(_new)) _error = i18n("Error: A scheme with this name already exist.\n"); else _end = true; @@ -1780,10 +1780,10 @@ TQString ConfigureDialog::mapActionToDescription( TQString action ) { } else if (action.startsWith("LOGOUT_DIALOG")) { ret = i18n("Logout Dialog"); } else if (action.startsWith("SUSPEND2DISK")) { - if (actions.tqcontains("Suspend to Disk")) + if (actions.contains("Suspend to Disk")) ret = i18n("Suspend to Disk"); } else if (action.startsWith("SUSPEND2RAM")) { - if (actions.tqcontains("Suspend to RAM")) + if (actions.contains("Suspend to RAM")) ret = i18n("Suspend to RAM"); } else if (action.startsWith("CPUFRETQ_POWERSAVE")) { if (hwinfo->supportCPUFreq()) diff --git a/src/hardware.cpp b/src/hardware.cpp index a07b3e5..fa37a98 100644 --- a/src/hardware.cpp +++ b/src/hardware.cpp @@ -250,7 +250,7 @@ void HardwareInfo::processMessage (msg_type type, TQString message, TQString val } } } else if (message.startsWith("DeviceRemoved")) { - if (allUDIs.tqcontains(value)) { + if (allUDIs.contains(value)) { if (checkIfHandleDevice(value, &_type)) { switch (_type) { case BATTERY: @@ -276,7 +276,7 @@ void HardwareInfo::processMessage (msg_type type, TQString message, TQString val } break; case HAL_PROPERTY_CHANGED: - if (!message.isEmpty() && allUDIs.tqcontains( message )) { + if (!message.isEmpty() && allUDIs.contains( message )) { if (value.startsWith( "ac_adapter.present" )) { TQTimer::singleShot(50, this, TQT_SLOT(checkACAdapterState())); } else if (value.startsWith( "battery." )) { @@ -442,9 +442,9 @@ bool HardwareInfo::checkIfHandleDevice ( TQString _udi, int *type) { bool ret = true; if (dbus_HAL->halGetPropertyStringList( _udi, "info.capabilities", &_cap) && !_cap.isEmpty()) { - if (_cap.tqcontains("ac_adapter")) { + if (_cap.contains("ac_adapter")) { *type = BATTERY; - } else if (_cap.tqcontains("button")) { + } else if (_cap.contains("button")) { TQString _val; if (dbus_HAL->halGetPropertyString( _udi, "button.type", &_val)) { if (_val.startsWith("lid")) { @@ -459,9 +459,9 @@ bool HardwareInfo::checkIfHandleDevice ( TQString _udi, int *type) { } else { ret = false; } - } else if (_cap.tqcontains("battery")) { + } else if (_cap.contains("battery")) { *type = BATTERY; - } else if (_cap.tqcontains("laptop_panel")) { + } else if (_cap.contains("laptop_panel")) { *type = LAPTOP_PANEL; } else { ret = false; @@ -579,7 +579,7 @@ void HardwareInfo::checkSuspend() { &_ret_b )) { suspend_states.suspend2ram_can = _ret_b; if (_ret_b) { - if (ret.tqcontains( "Suspend" )) { + if (ret.contains( "Suspend" )) { suspend_states.suspend2ram = true; suspend_states.suspend2ram_allowed = dbus_HAL->isUserPrivileged(PRIV_SUSPEND, HAL_COMPUTER_UDI); @@ -600,7 +600,7 @@ void HardwareInfo::checkSuspend() { &_ret_b )) { suspend_states.suspend2disk_can = _ret_b; if (_ret_b) { - if (ret.tqcontains( "Hibernate" )) { + if (ret.contains( "Hibernate" )) { suspend_states.suspend2disk = true; suspend_states.suspend2disk_allowed = dbus_HAL->isUserPrivileged(PRIV_HIBERNATE, @@ -620,7 +620,7 @@ void HardwareInfo::checkSuspend() { if (dbus_HAL->halGetPropertyBool( HAL_COMPUTER_UDI, "power_management.can_standby", &_ret_b )) { suspend_states.standby_can = _ret_b; if (_ret_b) { - if (ret.tqcontains( "Standby" )) { + if (ret.contains( "Standby" )) { suspend_states.standby = true; suspend_states.standby_allowed = dbus_HAL->isUserPrivileged(PRIV_STANDBY, HAL_COMPUTER_UDI); @@ -740,7 +740,7 @@ void HardwareInfo::checkBrightness() { // we should asume there is only one laptop panel device in the system if (dbus_HAL->halGetPropertyInt(devices.first(), "laptop_panel.num_levels", &retval )) { udis.insert("laptop_panel", new TQString( devices.first() )); - if (!allUDIs.tqcontains( devices.first() )) + if (!allUDIs.contains( devices.first() )) allUDIs.append( devices.first() ); if (retval > 1) { @@ -808,7 +808,7 @@ bool HardwareInfo::intialiseHWInfo() { for ( TQStringList::iterator it = ret.begin(); it != ret.end(); ++it ) { // we need a deep copy udis.insert("acadapter", new TQString( *it )); - if (!allUDIs.tqcontains( *it )) + if (!allUDIs.contains( *it )) allUDIs.append( *it ); checkACAdapterState(); } @@ -821,7 +821,7 @@ bool HardwareInfo::intialiseHWInfo() { for ( TQStringList::iterator it = ret.begin(); it != ret.end(); ++it ) { // we need a deep copy udis.insert("lidclose", new TQString( *it )); - if (!allUDIs.tqcontains( *it )) + if (!allUDIs.contains( *it )) allUDIs.append( *it ); checkLidcloseState(); } @@ -834,7 +834,7 @@ bool HardwareInfo::intialiseHWInfo() { if (!ret.isEmpty()) { // there should be normaly only one device, but let be sure for ( TQStringList::iterator it = ret.begin(); it != ret.end(); ++it ) { - if (!allUDIs.tqcontains( *it )) + if (!allUDIs.contains( *it )) allUDIs.append( *it ); BatteryList.append( new Battery(dbus_HAL, *it) ); } @@ -910,7 +910,7 @@ void HardwareInfo::checkLidcloseState() { void HardwareInfo::updateBatteryValues (TQString udi, TQString property) { kdDebugFuncIn(trace); - if (!udi.isEmpty() && allUDIs.tqcontains( udi )) { + if (!udi.isEmpty() && allUDIs.contains( udi )) { // find effected battery object Battery *bat; for (bat = BatteryList.first(); bat; bat = BatteryList.next() ) { diff --git a/src/hardware_batteryCollection.cpp b/src/hardware_batteryCollection.cpp index 0d3fe63..523ca6f 100644 --- a/src/hardware_batteryCollection.cpp +++ b/src/hardware_batteryCollection.cpp @@ -204,7 +204,7 @@ bool BatteryCollection::refreshInfo(TQPtrList BatteryList, bool force_l //! check if the given udi is already handled by this collection bool BatteryCollection::isBatteryHandled( TQString udi ) { - return udis.tqcontains( udi ); + return udis.contains( udi ); } // ---> write private members SECTION : START <---- diff --git a/src/hardware_cpu.cpp b/src/hardware_cpu.cpp index 5af515c..1473a6d 100644 --- a/src/hardware_cpu.cpp +++ b/src/hardware_cpu.cpp @@ -82,7 +82,7 @@ int CPUInfo::getCPUNum() { int tmp = cpu_id; cpu_id++; - cpu_path.tqreplace(TQString::number(tmp), TQString::number(cpu_id)); + cpu_path.replace(TQString::number(tmp), TQString::number(cpu_id)); tmp_path = tmp_dir.absFilePath(cpu_path, true); } @@ -141,7 +141,7 @@ int CPUInfo::checkCPUSpeed(){ cpufreq_speed.append(new_value); } - cpu_device.tqreplace(TQString::number(cpu_id), TQString::number(cpu_id+1)); + cpu_device.replace(TQString::number(cpu_id), TQString::number(cpu_id+1)); } if (speed_changed) { @@ -306,7 +306,7 @@ void CPUInfo::getCPUMaxSpeed() { close(fd); } - cpu_device_max.tqreplace(TQString::number(cpu_id), TQString::number(cpu_id+1)); + cpu_device_max.replace(TQString::number(cpu_id), TQString::number(cpu_id+1)); } kdDebugFuncOut(trace); diff --git a/src/inactivity.cpp b/src/inactivity.cpp index d1d9204..8dde0b7 100644 --- a/src/inactivity.cpp +++ b/src/inactivity.cpp @@ -325,7 +325,7 @@ void inactivity::getPIDs(KProcess */*proc*/, char *buffer, int /*lenght*/) { blacklisted_running = false; } else { - if (pids.tqcontains(TQRegExp("[0-9]"))) { + if (pids.contains(TQRegExp("[0-9]"))) { kdDebug() << "BLACKLISTED IS RUNNING" << endl; blacklisted_running = true; blacklisted_running_last = idleTime; diff --git a/src/kpowersave.cpp b/src/kpowersave.cpp index 8e1e27b..1d42505 100644 --- a/src/kpowersave.cpp +++ b/src/kpowersave.cpp @@ -388,7 +388,7 @@ void kpowersave::drawIcon(){ int x, y; countWhiteIconPixel = 0; - if((pixmap_name.tqcontains("laptopbattery") || pixmap_name.tqcontains("charge")) && + if((pixmap_name.contains("laptopbattery") || pixmap_name.contains("charge")) && countWhiteIconPixel == 0) { for (x = 0; x < w; x++) for (y = 0; y < h; y++) @@ -2148,9 +2148,9 @@ void kpowersave::handleACStatusChange ( bool acstate , bool notifyEvent ) { // handle switch to AC/battery default scheme if (acstate) { - index = settings->schemes.tqfindIndex(settings->ac_scheme); + index = settings->schemes.findIndex(settings->ac_scheme); } else { - index = settings->schemes.tqfindIndex(settings->battery_scheme); + index = settings->schemes.findIndex(settings->battery_scheme); } if (index != -1) @@ -2580,7 +2580,7 @@ bool kpowersave::do_setScheme( TQString /*_scheme*/ ) { kdDebugFuncIn(trace); /* int index; - index = settings->schemes.tqfindIndex(_scheme); + index = settings->schemes.findIndex(_scheme); if (index != -1) { do_setActiveScheme(index); diff --git a/src/screen.cpp b/src/screen.cpp index ef62233..6bc9c0b 100644 --- a/src/screen.cpp +++ b/src/screen.cpp @@ -120,7 +120,7 @@ static int got_badwindow; /*! Errorhandler for all X-Server related operations */ static XErrorHandler defaultHandler; -//! to tqfind/handle bad XWindows / XSetErrorHandler +//! to find/handle bad XWindows / XSetErrorHandler /*! * This function is involved by the search for the window of the Xscreensaver. By this * function we seperate the BadWindow-error and set \ref got_badwindow if we get a BadWindow. -- cgit v1.2.3