From 9a3f0aacd44fb866833ebcb852df3cd31475cb33 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/kdebase@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ksmserver/legacy.cpp | 10 +++++----- ksmserver/server.cpp | 12 ++++++------ ksmserver/shutdowndlg.cpp | 14 +++++++------- ksmserver/startup.cpp | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) (limited to 'ksmserver') diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp index f754d4126..1a1cea765 100644 --- a/ksmserver/legacy.cpp +++ b/ksmserver/legacy.cpp @@ -71,7 +71,7 @@ static Atom wm_client_leader = None; static int winsErrorHandler(Display *, XErrorEvent *ev) { if (windowMapPtr) { - WindowMap::Iterator it = windowMapPtr->tqfind(ev->resourceid); + WindowMap::Iterator it = windowMapPtr->find(ev->resourceid); if (it != windowMapPtr->end()) (*it).type = SM_ERROR; } @@ -101,7 +101,7 @@ void KSMServer::performLegacySessionSave() for ( TQValueList::ConstIterator it = module.windows().begin(); it != module.windows().end(); ++it) { WId leader = windowWmClientLeader( *it ); - if (!legacyWindows.tqcontains(leader) && windowSessionId( *it, leader ).isEmpty()) { + if (!legacyWindows.contains(leader) && windowSessionId( *it, leader ).isEmpty()) { SMType wtype = SM_WMCOMMAND; int nprotocols = 0; Atom *protocols = 0; @@ -165,7 +165,7 @@ void KSMServer::performLegacySessionSave() XNextEvent(newdisplay, &ev); if ( ( ev.xany.type == UnmapNotify ) || ( ev.xany.type == PropertyNotify && ev.xproperty.atom == XA_WM_COMMAND ) ) { - WindowMap::Iterator it = legacyWindows.tqfind( ev.xany.window ); + WindowMap::Iterator it = legacyWindows.find( ev.xany.window ); if ( it != legacyWindows.end() && (*it).type != SM_WMCOMMAND ) { awaiting_replies -= 1; if ( (*it).type != SM_ERROR ) @@ -217,8 +217,8 @@ void KSMServer::storeLegacySession( KConfig* config ) int count = 0; for (WindowMap::ConstIterator it = legacyWindows.begin(); it != legacyWindows.end(); ++it) { if ( (*it).type != SM_ERROR) { - if( excludeApps.tqcontains( (*it).wmclass1.lower()) - || excludeApps.tqcontains( (*it).wmclass2.lower()) || (*it).wmCommand[0] == "compiz" || (*it).wmCommand[0] == "beryl" || (*it).wmCommand[0] == "aquamarine" || (*it).wmCommand[0] == "beryl-manager" || (*it).wmCommand[0] == "beryl-settings" || (*it).wmCommand[0] == "kde-window-decorator" || (*it).wmCommand[0] == "emerald") + if( excludeApps.contains( (*it).wmclass1.lower()) + || excludeApps.contains( (*it).wmclass2.lower()) || (*it).wmCommand[0] == "compiz" || (*it).wmCommand[0] == "beryl" || (*it).wmCommand[0] == "aquamarine" || (*it).wmCommand[0] == "beryl-manager" || (*it).wmCommand[0] == "beryl-settings" || (*it).wmCommand[0] == "kde-window-decorator" || (*it).wmCommand[0] == "emerald") continue; if ( !(*it).wmCommand.isEmpty() && !(*it).wmClientMachine.isEmpty() ) { count++; diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp index fc3afb288..ecb3cdcde 100644 --- a/ksmserver/server.cpp +++ b/ksmserver/server.cpp @@ -632,9 +632,9 @@ KSMServer::KSMServer( const TQString& windowManager, bool _only_local ) TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver")); TQCString display = ::getenv("DISPLAY"); // strip the screen number from the display - display.tqreplace(TQRegExp("\\.[0-9]+$"), ""); + display.replace(TQRegExp("\\.[0-9]+$"), ""); int i; - while( (i = display.tqfind(':')) >= 0) + while( (i = display.find(':')) >= 0) display[i] = '_'; fName += "_"+display; @@ -697,9 +697,9 @@ void KSMServer::cleanUp() TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver")); TQCString display = ::getenv("DISPLAY"); // strip the screen number from the display - display.tqreplace(TQRegExp("\\.[0-9]+$"), ""); + display.replace(TQRegExp("\\.[0-9]+$"), ""); int i; - while( (i = display.tqfind(':')) >= 0) + while( (i = display.find(':')) >= 0) display[i] = '_'; fName += "_"+display; @@ -761,7 +761,7 @@ KSMClient* KSMServer::newClient( SmsConn conn ) void KSMServer::deleteClient( KSMClient* client ) { - if ( clients.tqfindRef( client ) == -1 ) // paranoia + if ( clients.findRef( client ) == -1 ) // paranoia return; clients.removeRef( client ); if ( client == clientInteracting ) { @@ -868,7 +868,7 @@ void KSMServer::storeSession() TQStringList restartCommand = c->restartCommand(); if (program.isEmpty() && restartCommand.isEmpty()) continue; - if (excludeApps.tqcontains( program.lower())) + if (excludeApps.contains( program.lower())) continue; count++; diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index 3a415d193..261793dcf 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -320,7 +320,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, FlatButton* btnLogout = new FlatButton( frame ); btnLogout->setTextLabel( TQString("&") + i18n("Log out"), false ); btnLogout->setPixmap( DesktopIcon( "back") ); - int i = btnLogout->textLabel().tqfind( TQRegExp("\\&"), 0 ); // i == 1 + int i = btnLogout->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 btnLogout->setAccel( "ALT+" + btnLogout->textLabel().lower()[i+1] ) ; hbuttonbox->addWidget ( btnLogout ); connect(btnLogout, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogout())); @@ -431,7 +431,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, FlatButton* btnSuspend = new FlatButton( frame ); btnSuspend->setTextLabel( i18n("&Suspend"), false ); btnSuspend->setPixmap( DesktopIcon( "suspend") ); - int i = btnSuspend->textLabel().tqfind( TQRegExp("\\&"), 0 ); // i == 1 + int i = btnSuspend->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 btnSuspend->setAccel( "ALT+" + btnSuspend->textLabel().lower()[i+1] ) ; hbuttonbox->addWidget ( btnSuspend); connect(btnSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotSuspend())); @@ -443,7 +443,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, FlatButton* btnHibernate = new FlatButton( frame ); btnHibernate->setTextLabel( i18n("&Hibernate"), false ); btnHibernate->setPixmap( DesktopIcon( "hibernate") ); - int i = btnHibernate->textLabel().tqfind( TQRegExp("\\&"), 0 ); // i == 1 + int i = btnHibernate->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 btnHibernate->setAccel( "ALT+" + btnHibernate->textLabel().lower()[i+1] ) ; hbuttonbox->addWidget ( btnHibernate); connect(btnHibernate, TQT_SIGNAL(clicked()), TQT_SLOT(slotHibernate())); @@ -460,7 +460,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, FlatButton* btnReboot = new FlatButton( frame ); btnReboot->setTextLabel( i18n("&Restart"), false ); btnReboot->setPixmap( DesktopIcon( "reload") ); - int i = btnReboot->textLabel().tqfind( TQRegExp("\\&"), 0 ); // i == 1 + int i = btnReboot->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 btnReboot->setAccel( "ALT+" + btnReboot->textLabel().lower()[i+1] ) ; hbuttonbox2->addWidget ( btnReboot); connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot())); @@ -479,7 +479,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, for (TQStringList::ConstIterator it = rebootOptions.begin(); it != rebootOptions.end(); ++it, ++index) { TQString label = (*it); - label=label.tqreplace('&',"&&"); + label=label.replace('&',"&&"); if (index == cur) targets->insertItem( label + i18n("current option in boot loader", " (current)"), index); else @@ -495,7 +495,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, FlatButton* btnHalt = new FlatButton( frame ); btnHalt->setTextLabel( i18n("&Turn Off"), false ); btnHalt->setPixmap( DesktopIcon( "exit") ); - i = btnHalt->textLabel().tqfind( TQRegExp("\\&"), 0 ); // i == 1 + i = btnHalt->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ; hbuttonbox2->addWidget ( btnHalt ); connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt())); @@ -544,7 +544,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, for (TQStringList::ConstIterator it = rebootOptions.begin(); it != rebootOptions.end(); ++it, ++index) { TQString label = (*it); - label=label.tqreplace('&',"&&"); + label=label.replace('&',"&&"); if (index == cur) targets->insertItem( label + i18n("current option in boot loader", " (current)"), index); else diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp index e74083de6..2778b9dd9 100644 --- a/ksmserver/startup.cpp +++ b/ksmserver/startup.cpp @@ -363,14 +363,14 @@ bool KSMServer::checkStartupSuspend() void KSMServer::suspendStartup( TQCString app ) { - if( !startupSuspendCount.tqcontains( app )) + if( !startupSuspendCount.contains( app )) startupSuspendCount[ app ] = 0; ++startupSuspendCount[ app ]; } void KSMServer::resumeStartup( TQCString app ) { - if( !startupSuspendCount.tqcontains( app )) + if( !startupSuspendCount.contains( app )) return; if( --startupSuspendCount[ app ] == 0 ) { startupSuspendCount.remove( app ); -- cgit v1.2.1