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 | |
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')
-rw-r--r-- | kopete/protocols/irc/ircaccount.cpp | 2 | ||||
-rw-r--r-- | kopete/protocols/irc/ircchannelcontact.cpp | 2 | ||||
-rw-r--r-- | kopete/protocols/irc/ircusercontact.cpp | 2 | ||||
-rw-r--r-- | kopete/protocols/irc/kcodecaction.cpp | 16 | ||||
-rw-r--r-- | kopete/protocols/irc/ui/irceditaccountwidget.cpp | 8 |
5 files changed, 15 insertions, 15 deletions
diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp index 318a8f20..ffede29f 100644 --- a/kopete/protocols/irc/ircaccount.cpp +++ b/kopete/protocols/irc/ircaccount.cpp @@ -757,7 +757,7 @@ void IRCAccount::slotJoinChannel() comp.insertItems( chans ); dlg.lineEdit()->setCompletionObject( &comp ); - dlg.lineEdit()->setCompletionMode( KGlobalSettings::CompletionPopup ); + dlg.lineEdit()->setCompletionMode( TDEGlobalSettings::CompletionPopup ); while( true ) { diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp index 94d67d3a..cab34817 100644 --- a/kopete/protocols/irc/ircchannelcontact.cpp +++ b/kopete/protocols/irc/ircchannelcontact.cpp @@ -495,7 +495,7 @@ void IRCChannelContact::topicUser(const TQString &nick, const TQDateTime &time) Kopete::Message msg(account->myServer(), mMyself, i18n("Topic set by %1 at %2").arg(nick).arg( - KGlobal::locale()->formatDateTime(time, true) + TDEGlobal::locale()->formatDateTime(time, true) ), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW); msg.setImportance(Kopete::Message::Low); //set the importance manualy to low appendMessage(msg); diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp index c4607cb9..54c40132 100644 --- a/kopete/protocols/irc/ircusercontact.cpp +++ b/kopete/protocols/irc/ircusercontact.cpp @@ -472,7 +472,7 @@ void IRCUserContact::whoWasComplete() .arg(mInfo.realName); msg += i18n("Last Online: %1\n").arg( - KGlobal::locale()->formatDateTime( + TDEGlobal::locale()->formatDateTime( property( m_protocol->propLastSeen ).value().toDateTime() ) ); diff --git a/kopete/protocols/irc/kcodecaction.cpp b/kopete/protocols/irc/kcodecaction.cpp index 5dca8771..97964885 100644 --- a/kopete/protocols/irc/kcodecaction.cpp +++ b/kopete/protocols/irc/kcodecaction.cpp @@ -34,9 +34,9 @@ void KCodecAction::slotActivated( const TQString & text ) /* text is something like "Western European ( iso-8859-1 )", but we must give * codecForName() only the "iso-8859-1" part. */ - TQString encoding = KGlobal::charsets()->encodingForName(text); + TQString encoding = TDEGlobal::charsets()->encodingForName(text); - emit activated( KGlobal::charsets()->codecForName(encoding) ); + emit activated( TDEGlobal::charsets()->codecForName(encoding) ); } void KCodecAction::setCodec( const TQTextCodec *codec ) @@ -44,9 +44,9 @@ void KCodecAction::setCodec( const TQTextCodec *codec ) TQStringList items = this->items(); int i = 0; for (TQStringList::ConstIterator it = items.begin(), end = items.end(); it != end; ++it, ++i) { - TQString encoding = KGlobal::charsets()->encodingForName(*it); + TQString encoding = TDEGlobal::charsets()->encodingForName(*it); - if (KGlobal::charsets()->codecForName(encoding)->mibEnum() == codec->mibEnum()) { + if (TDEGlobal::charsets()->codecForName(encoding)->mibEnum() == codec->mibEnum()) { setCurrentItem(i); break; } @@ -61,25 +61,25 @@ void KCodecAction::setCodec( const TQTextCodec *codec ) TQStringList KCodecAction::supportedEncodings(bool usAscii) { - TQStringList encodingNames = KGlobal::charsets()->availableEncodingNames(); + TQStringList encodingNames = TDEGlobal::charsets()->availableEncodingNames(); TQStringList encodings; TQMap<TQString, bool> mimeNames; for (TQStringList::ConstIterator it = encodingNames.begin(); it != encodingNames.end(); ++it) { - TQTextCodec *codec = KGlobal::charsets()->codecForName(*it); + TQTextCodec *codec = TDEGlobal::charsets()->codecForName(*it); TQString mimeName = (codec) ? TQString(codec->mimeName()).lower() : (*it); if (mimeNames.find(mimeName) == mimeNames.end()) { - encodings.append(KGlobal::charsets()->languageForEncoding(*it) + encodings.append(TDEGlobal::charsets()->languageForEncoding(*it) + " ( " + mimeName + " )"); mimeNames.insert(mimeName, true); } } encodings.sort(); - if (usAscii) encodings.prepend(KGlobal::charsets() + if (usAscii) encodings.prepend(TDEGlobal::charsets() ->languageForEncoding("us-ascii") + " ( us-ascii )"); return encodings; } 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(); |