diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
| commit | c48e769eb275917717e2b55eb869f7e559293ac8 (patch) | |
| tree | 8f650b907e21c918b826f854dbe1c8174cc2c0c6 /ksirc/toplevel.cpp | |
| parent | 8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff) | |
| download | tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'ksirc/toplevel.cpp')
| -rw-r--r-- | ksirc/toplevel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp index 34e63182..264eecf3 100644 --- a/ksirc/toplevel.cpp +++ b/ksirc/toplevel.cpp @@ -174,7 +174,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf encodingAction = new KSelectAction( i18n( "&Encoding" ), 0, TQT_TQOBJECT(this) ); connect( encodingAction, TQT_SIGNAL( activated() ), this, TQT_SLOT( setEncoding() ) ); - TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames(); topicitem = file->insertItem(i18n("S&how Topic"), this, TQT_SLOT(toggleTopic()), CTRL + Key_O); if (isPrivateChat() || m_channelInfo.channel().startsWith("!no_channel")) { @@ -238,7 +238,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf pan = new TQSplitter(Qt::Horizontal, top, kstn + "splitter"); #if KDE_IS_VERSION(3,1,92) - pan->setOpaqueResize( KGlobalSettings::opaqueResize() ); + pan->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); #else pan->setOpaqueResize( true ); #endif @@ -603,7 +603,7 @@ void KSircTopLevel::setEncoding() } else { ksopts->chan(m_channelInfo).encoding = encodingAction->currentText(); - UnicodeMessageReceiver::setEncoding( KGlobal::charsets()->encodingForName( encodingAction->currentText() ) ); + UnicodeMessageReceiver::setEncoding( TDEGlobal::charsets()->encodingForName( encodingAction->currentText() ) ); } ksopts->save(KSOptions::Channels); } |