diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:48:31 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:48:31 -0600 |
commit | c48e769eb275917717e2b55eb869f7e559293ac8 (patch) | |
tree | 8f650b907e21c918b826f854dbe1c8174cc2c0c6 /kopete/protocols/irc/ui | |
parent | 8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff) | |
download | tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols/irc/ui')
-rw-r--r-- | kopete/protocols/irc/ui/irceditaccountwidget.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp index c0d5a87a..1b268027 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp +++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp @@ -98,9 +98,9 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident charset->insertStringList( KCodecAction::supportedEncodings() ); for (int i = 0; i < charset->count(); ++i) { - TQString encoding = KGlobal::charsets()->encodingForName(charset->text(i)); + TQString encoding = TDEGlobal::charsets()->encodingForName(charset->text(i)); - if (KGlobal::charsets()->codecForName(encoding)->mibEnum() == currentCodec) { + if (TDEGlobal::charsets()->codecForName(encoding)->mibEnum() == currentCodec) { charset->setCurrentItem( i ); break; } @@ -208,7 +208,7 @@ void IRCEditAccountWidget::slotAddCtcp() TQString IRCEditAccountWidget::generateAccountId( const TQString &network ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQString nextId = network; uint accountNumber = 1; @@ -262,7 +262,7 @@ Kopete::Account *IRCEditAccountWidget::apply() account()->setCustomCtcpReplies( replies ); account()->setConnectCommands( cmds ); - KCharsets *c = KGlobal::charsets(); + KCharsets *c = TDEGlobal::charsets(); account()->setCodec( c->codecForName( c->encodingForName( charset->currentText() ) ) ); return account(); |