diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
commit | 937b2991d8e78166eea904c80ad04d34607017a4 (patch) | |
tree | 2accb8161eab09df5d7a5484ea9ea080ad123168 /kopete/protocols/sms/services | |
parent | dba26cb985af370c33d1767037851705cc561726 (diff) | |
download | tdenetwork-937b2991d8e78166eea904c80ad04d34607017a4.tar.gz tdenetwork-937b2991d8e78166eea904c80ad04d34607017a4.zip |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols/sms/services')
-rw-r--r-- | kopete/protocols/sms/services/gsmlib.cpp | 2 | ||||
-rw-r--r-- | kopete/protocols/sms/services/kopete_unix_serial.cpp | 10 | ||||
-rw-r--r-- | kopete/protocols/sms/services/smssendprovider.cpp | 16 |
3 files changed, 14 insertions, 14 deletions
diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp index 35d7c274..82bd0017 100644 --- a/kopete/protocols/sms/services/gsmlib.cpp +++ b/kopete/protocols/sms/services/gsmlib.cpp @@ -419,7 +419,7 @@ void GSMLib::customEvent(TQCustomEvent* e) TQString text = ge->Text; // Locate a contact - SMSContact* contact = static_cast<SMSContact*>( m_account->contacts().tqfind( nr )); + SMSContact* contact = static_cast<SMSContact*>( m_account->contacts().find( nr )); if ( contact==NULL ) { // No contact found, make a new one diff --git a/kopete/protocols/sms/services/kopete_unix_serial.cpp b/kopete/protocols/sms/services/kopete_unix_serial.cpp index e8650de0..c40f831b 100644 --- a/kopete/protocols/sms/services/kopete_unix_serial.cpp +++ b/kopete/protocols/sms/services/kopete_unix_serial.cpp @@ -280,13 +280,13 @@ KopeteUnixSerialPort::KopeteUnixSerialPort(string device, speed_t lineSpeed, // for the first call getLine() waits only 3 seconds // because of _timeoutVal = 3 string s = getLine(); - if (s.tqfind("OK") != string::npos || - s.tqfind("CABLE: GSM") != string::npos) + if (s.find("OK") != string::npos || + s.find("CABLE: GSM") != string::npos) { foundOK = true; readTries = 0; // found OK, exit loop } - else if (s.tqfind("ERROR") != string::npos) + else if (s.find("ERROR") != string::npos) readTries = 0; // error, exit loop } @@ -301,8 +301,8 @@ KopeteUnixSerialPort::KopeteUnixSerialPort(string device, speed_t lineSpeed, while (readTries-- > 0) { string s = getLine(); - if (s.tqfind("OK") != string::npos || - s.tqfind("CABLE: GSM") != string::npos) + if (s.find("OK") != string::npos || + s.find("CABLE: GSM") != string::npos) { _readNotifier = new TQSocketNotifier(_fd, TQSocketNotifier::Read); connect( _readNotifier, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated())); diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp index c886cb3d..e2f607aa 100644 --- a/kopete/protocols/sms/services/smssendprovider.cpp +++ b/kopete/protocols/sms/services/smssendprovider.cpp @@ -71,7 +71,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p TQStringList args = TQStringList::split(':',s); TQStringList options = TQStringList::split(' ', args[0]); - names.append(options[0].tqreplace(0,1,"")); + names.append(options[0].replace(0,1,"")); bool hidden = false; for(unsigned i = 1; i < options.count(); i++) @@ -92,16 +92,16 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p else values.append(""); - if( args[0].tqcontains("Message") || args[0].tqcontains("message") - || args[0].tqcontains("message") || args[0].tqcontains("nachricht") - || args[0].tqcontains("Msg") || args[0].tqcontains("Mensagem") ) + if( args[0].contains("Message") || args[0].contains("message") + || args[0].contains("message") || args[0].contains("nachricht") + || args[0].contains("Msg") || args[0].contains("Mensagem") ) { for( unsigned i = 0; i < options.count(); i++) { - if (options[i].tqcontains("Size=")) + if (options[i].contains("Size=")) { TQString option = options[i]; - option.tqreplace(0,5,""); + option.replace(0,5,""); m_maxSize = option.toInt(); } } @@ -111,7 +111,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p { for (TQStringList::Iterator it=numberWords.begin(); it != numberWords.end(); ++it) { - if (args[0].tqcontains(*it)) + if (args[0].contains(*it)) { telPos = names.count() - 1; if (args[0] == *it) @@ -119,7 +119,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p // kdDebug(14160) << "Exact match for " << args[0] << endl; exactNumberMatch = true; } -// kdDebug(14160) << "args[0] (" << args[0] << ") tqcontains " << *it << endl; +// kdDebug(14160) << "args[0] (" << args[0] << ") contains " << *it << endl; } } } |