diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:44:46 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:44:46 -0600 |
commit | cee429821aa6f1acc97fb482d325fb4eb37376ca (patch) | |
tree | 4f55e04b7f000c854fe2b8347dcdb62d97de3c73 /keduca/keducabuilder/kcontrolheader.cpp | |
parent | ab801f72ab45e8066a8ec6c533ef13c2da67e559 (diff) | |
download | tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.tar.gz tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'keduca/keducabuilder/kcontrolheader.cpp')
-rw-r--r-- | keduca/keducabuilder/kcontrolheader.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp index 5c323c3c..bcd1eaa0 100644 --- a/keduca/keducabuilder/kcontrolheader.cpp +++ b/keduca/keducabuilder/kcontrolheader.cpp @@ -226,7 +226,7 @@ void KControlHeader::insertHeader() TQStringList tmpResult = _defaultCategories.grep( _headerCategory->currentText() ); if( tmpResult.count() == 0 ) { - KConfig *appconfig = KGlobal::config(); + KConfig *appconfig = TDEGlobal::config(); _defaultCategories.append( _headerCategory->currentText() ); appconfig->setGroup("General"); appconfig->writeEntry( "Categories", _defaultCategories); @@ -251,7 +251,7 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo) // clear the list combo->clear(); - TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop")); + TQStringList regionlist = TDEGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop")); regionlist.sort(); for ( TQStringList::ConstIterator it = regionlist.begin(); @@ -275,7 +275,7 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo) } // add all languages to the list - TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop")); + TQStringList countrylist = TDEGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop")); countrylist.sort(); for ( TQStringList::ConstIterator it = countrylist.begin(); @@ -307,7 +307,7 @@ void KControlHeader::slotOk() void KControlHeader::configRead() { KConfig *config = new KConfig("emaildefaults"); - KConfig *appconfig = KGlobal::config(); + KConfig *appconfig = TDEGlobal::config(); config->setGroup("UserInfo"); @@ -369,7 +369,7 @@ void KControlHeader::configRead() /** Write settings */ void KControlHeader::configWrite() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("kcontrolheader"); config->writeEntry("Geometry", size() ); config->sync(); |