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/KSPrefs | |
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/KSPrefs')
-rw-r--r-- | ksirc/KSPrefs/page_general.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ksirc/KSPrefs/page_general.cpp b/ksirc/KSPrefs/page_general.cpp index 51a78ec3..6bf8d476 100644 --- a/ksirc/KSPrefs/page_general.cpp +++ b/ksirc/KSPrefs/page_general.cpp @@ -82,7 +82,7 @@ void PageGeneral::readConfig( const KSOGeneral *opts ) encodingsCB->clear(); - TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames(); // remove utf16/ucs2 as it just doesn't work for IRC TQStringList::Iterator encodingIt = encodings.begin(); |