summaryrefslogtreecommitdiffstats
path: root/kopete/libkopete/kopeteaccountmanager.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:33:51 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:33:51 -0600
commit089118c18533dfa3e6ce5065dbebdd4db94051f1 (patch)
treece014fb2326a80fcfafa2362b7ff88486aa17c96 /kopete/libkopete/kopeteaccountmanager.cpp
parent83677e35509b4dafac63b76995652bdf3b49f209 (diff)
downloadtdenetwork-089118c18533dfa3e6ce5065dbebdd4db94051f1.tar.gz
tdenetwork-089118c18533dfa3e6ce5065dbebdd4db94051f1.zip
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'kopete/libkopete/kopeteaccountmanager.cpp')
-rw-r--r--kopete/libkopete/kopeteaccountmanager.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/kopete/libkopete/kopeteaccountmanager.cpp b/kopete/libkopete/kopeteaccountmanager.cpp
index 69bf272a..7f014519 100644
--- a/kopete/libkopete/kopeteaccountmanager.cpp
+++ b/kopete/libkopete/kopeteaccountmanager.cpp
@@ -138,7 +138,7 @@ void AccountManager::setAwayAll( const TQString &awayReason, bool away )
{
// FIXME: ICQ's invisible online should be set to invisible away
Contact *self = it.current()->myself();
- bool isInvisible = self && self->onlinetqStatus().status() == OnlineStatus::Invisible;
+ bool isInvisible = self && self->onlineStatus().status() == OnlineStatus::Invisible;
if ( anyConnected )
{
if ( it.current()->isConnected() && !isInvisible )
@@ -160,7 +160,7 @@ void AccountManager::setOnlineStatus( uint category , const TQString& awayMessag
for ( TQPtrListIterator<Account> it( d->accounts ); it.current(); ++it )
{
Account *account = it.current();
- Kopete::OnlineStatus status = OnlineStatusManager::self()->onlinetqStatus(account->protocol() , katgor);
+ Kopete::OnlineStatus status = OnlineStatusManager::self()->onlineStatus(account->protocol() , katgor);
if ( anyConnected )
{
if ( account->isConnected() || ( (flags & ConnectIfOffline) && !account->excludeConnect() ) )
@@ -332,7 +332,7 @@ void AccountManager::removeAccount( Account *account )
{
// FIXME: pluginId() should return the internal name and not the class name, so
// we can get rid of this hack - Olivier/Martijn
- TQString protocolName = protocol->pluginId().remove( TQString::tqfromLatin1( "Protocol" ) ).lower();
+ TQString protocolName = protocol->pluginId().remove( TQString::fromLatin1( "Protocol" ) ).lower();
PluginManager::self()->setPluginEnabled( protocolName, false );
PluginManager::self()->unloadPlugin( protocolName );
@@ -365,14 +365,14 @@ void AccountManager::load()
// Don't try to optimize duplicate calls out, the plugin queue is smart enough
// (and fast enough) to handle that without adding complexity here
KConfig *config = KGlobal::config();
- TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::tqfromLatin1( "^Account_" ) ) );
+ TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::fromLatin1( "^Account_" ) ) );
for ( TQStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it )
{
config->setGroup( *it );
TQString protocol = config->readEntry( "Protocol" );
- if ( protocol.endsWith( TQString::tqfromLatin1( "Protocol" ) ) )
- protocol = TQString::tqfromLatin1( "kopete_" ) + protocol.lower().remove( TQString::tqfromLatin1( "protocol" ) );
+ if ( protocol.endsWith( TQString::fromLatin1( "Protocol" ) ) )
+ protocol = TQString::fromLatin1( "kopete_" ) + protocol.lower().remove( TQString::fromLatin1( "protocol" ) );
if ( config->readBoolEntry( "Enabled", true ) )
PluginManager::self()->loadPlugin( protocol, PluginManager::LoadAsync );
@@ -388,7 +388,7 @@ void AccountManager::slotPluginLoaded( Plugin *plugin )
// Iterate over all groups that start with "Account_" as those are accounts
// and parse them if they are from this protocol
KConfig *config = KGlobal::config();
- TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::tqfromLatin1( "^Account_" ) ) );
+ TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::fromLatin1( "^Account_" ) ) );
for ( TQStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it )
{
config->setGroup( *it );
@@ -423,14 +423,14 @@ void AccountManager::slotPluginLoaded( Plugin *plugin )
}
void AccountManager::slotAccountOnlineStatusChanged(Contact *c,
- const OnlineStatus &oldtqStatus, const OnlineStatus &newtqStatus)
+ const OnlineStatus &oldStatus, const OnlineStatus &newStatus)
{
Account *account = c->account();
if (!account)
return;
//kdDebug(14010) << k_funcinfo << endl;
- emit accountOnlineStatusChanged(account, oldtqStatus, newtqStatus);
+ emit accountOnlineStatusChanged(account, oldStatus, newStatus);
}
} //END namespace Kopete