diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /tdeui/ksconfig.cpp | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/ksconfig.cpp')
| -rw-r--r-- | tdeui/ksconfig.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp index 5ca0c2b85..824e92bfc 100644 --- a/tdeui/ksconfig.cpp +++ b/tdeui/ksconfig.cpp @@ -80,7 +80,7 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name, , clientcombo(0) { d = new KSpellConfigPrivate; - kc = KGlobal::config(); + kc = TDEGlobal::config(); if( !_ksc ) { @@ -277,12 +277,12 @@ KSpellConfig::interpret( TQString &fname, TQString &lname, // but since aspell 0.6 also 3-character ISO-codes can be used if ( (dname.length() == 2) || (dname.length() == 3) ) { lname = dname; - hname = KGlobal::locale()->twoAlphaToLanguageName( lname ); + hname = TDEGlobal::locale()->twoAlphaToLanguageName( lname ); } else if ( (dname.length() == 5) && (dname[2] == '_') ) { lname = dname.left(2); - hname = KGlobal::locale()->twoAlphaToLanguageName(lname); - TQString country = KGlobal::locale()->twoAlphaToCountryName( dname.right(2) ); + hname = TDEGlobal::locale()->twoAlphaToLanguageName(lname); + TQString country = TDEGlobal::locale()->twoAlphaToCountryName( dname.right(2) ); if ( extension.isEmpty() ) extension = country; else @@ -363,9 +363,9 @@ KSpellConfig::interpret( TQString &fname, TQString &lname, } //We have explicitly chosen English as the default here. - if ( ( KGlobal::locale()->language() == TQString::fromLatin1("C") && + if ( ( TDEGlobal::locale()->language() == TQString::fromLatin1("C") && lname==TQString::fromLatin1("en") ) || - KGlobal::locale()->language() == lname ) + TDEGlobal::locale()->language() == lname ) return true; return false; |