From c327636f4934564a4f1f7c7ce3b6ab73eaec230d Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 12 Jul 2025 18:57:41 +0900 Subject: Use TDESimpleConfig Signed-off-by: Michele Calgaro --- akregator/src/akregator_part.cpp | 4 ++-- kaddressbook/xxport/csvimportdialog.cpp | 4 ++-- kmail/configuredialog_p.cpp | 6 +++--- kmail/kmstartup.cpp | 6 +++--- knode/knaccountmanager.cpp | 2 +- knode/knarticlefilter.cpp | 8 ++++---- knode/knconfig.cpp | 6 +++--- knode/knfiltermanager.cpp | 6 +++--- knode/knfolder.cpp | 6 +++--- knode/kngroup.cpp | 6 +++--- knode/knnntpaccount.cpp | 8 ++++---- knode/knrangefilter.cpp | 6 +++--- knode/knrangefilter.h | 6 +++--- knode/knstatusfilter.cpp | 6 +++--- knode/knstatusfilter.h | 6 +++--- knode/knstringfilter.cpp | 6 +++--- knode/knstringfilter.h | 6 +++--- knotes/knotehostdlg.cpp | 2 +- knotes/knotesapp.cpp | 2 +- knotes/knoteslegacy.cpp | 6 +++--- kode/kodemain.cpp | 4 ++-- kode/kxml_compiler/creator.cpp | 2 +- kode/kxml_compiler/creator.h | 2 +- kode/kxml_compiler/kxml_compiler.cpp | 2 +- kode/kxml_compiler/parser.cpp | 2 +- kode/kxml_compiler/parser.h | 2 +- korganizer/docprefs.cpp | 6 +++--- korganizer/docprefs.h | 4 ++-- korganizer/koprefsdialog.cpp | 4 ++-- korganizer/plugins/datenums/configdialog.cpp | 2 +- korganizer/plugins/exchange/exchangedialog.cpp | 2 +- korganizer/plugins/hebrew/configdialog.cpp | 2 +- korganizer/plugins/hebrew/hebrew.cpp | 2 +- korganizer/printing/calprinter.cpp | 4 ++-- libkpimexchange/core/exchangeprogress.cpp | 2 +- libtdepim/kimportdialog.cpp | 6 +++--- libtdepim/komposer/core/pluginmanager.cpp | 2 +- libtdepim/pluginloaderbase.cpp | 4 ++-- tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp | 4 ++-- 39 files changed, 83 insertions(+), 83 deletions(-) diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index 0dcf6b91..bfb03add 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -255,7 +255,7 @@ void Part::slotOnShutdown() m_shuttingDown = true; const TQString lockLocation = locateLocal("data", "akregator/lock"); - KSimpleConfig config(lockLocation); + TDESimpleConfig config(lockLocation); config.writeEntry("pid", -1); config.sync(); @@ -958,7 +958,7 @@ bool Part::tryToLock(const TQString& backendName) programName = i18n("Akregator"); TQString lockLocation = locateLocal("data", "akregator/lock"); - KSimpleConfig config(lockLocation); + TDESimpleConfig config(lockLocation); int oldPid = config.readNumEntry("pid", -1); const TQString oldHostName = config.readEntry("hostname"); const TQString oldAppName = config.readEntry( "appName", appName ); diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 8bcb0ffa..4b0a1c9e 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -797,7 +797,7 @@ void CSVImportDialog::applyTemplate() for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) { - KSimpleConfig config( *it, true ); + TDESimpleConfig config( *it, true ); if ( !config.hasGroup( "csv column map" ) ) continue; @@ -817,7 +817,7 @@ void CSVImportDialog::applyTemplate() if ( !ok ) return; - KSimpleConfig config( fileMap[ tmp ], true ); + TDESimpleConfig config( fileMap[ tmp ], true ); config.setGroup( "General" ); mDatePatternEdit->setText( config.readEntry( "DatePattern", "Y-M-D" ) ); uint numColumns = config.readUnsignedNumEntry( "Columns" ); diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp index f171830e..bd5fdcd1 100644 --- a/kmail/configuredialog_p.cpp +++ b/kmail/configuredialog_p.cpp @@ -20,7 +20,7 @@ // other tdenetwork headers: (none) // other KDE headers: -#include +#include #include #include #include @@ -214,7 +214,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, for ( TQStringList::ConstIterator it = pathList.begin(); it != pathList.end(); ++it ) { - KSimpleConfig entry( *it ); + TDESimpleConfig entry( *it ); entry.setGroup( "KCM Locale" ); // full name: TQString name = entry.readEntry( "Name" ); @@ -252,7 +252,7 @@ LanguageComboBox::LanguageComboBox( bool rw, TQWidget *parent, const char *name int LanguageComboBox::insertLanguage( const TQString & language ) { static TQString entryDesktop = TQString::fromLatin1("/entry.desktop"); - KSimpleConfig entry( locate("locale", language + entryDesktop) ); + TDESimpleConfig entry( locate("locale", language + entryDesktop) ); entry.setGroup( "KCM Locale" ); TQString name = entry.readEntry( "Name" ); TQString output = TQString::fromLatin1("%1 (%2)").arg( name ).arg( language ); diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp index 827f7eb7..7fd0ba4f 100644 --- a/kmail/kmstartup.cpp +++ b/kmail/kmstartup.cpp @@ -24,7 +24,7 @@ #include "kcursorsaver.h" #include -#include +#include #include #include #include @@ -149,7 +149,7 @@ void lockOrDie() { programName = i18n("KMail"); TQString lockLocation = locateLocal("data", "kmail/lock"); - KSimpleConfig config(lockLocation); + TDESimpleConfig config(lockLocation); int oldPid = config.readNumEntry("pid", -1); const TQString oldHostName = config.readEntry("hostname"); const TQString oldAppName = config.readEntry( "appName", appName ); @@ -262,7 +262,7 @@ void insertLibraryCataloguesAndIcons() { void cleanup() { const TQString lockLocation = locateLocal("data", "kmail/lock"); - KSimpleConfig config(lockLocation); + TDESimpleConfig config(lockLocation); config.writeEntry("pid", -1); config.sync(); } diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp index 0fcbe0e8..c3cf7804 100644 --- a/knode/knaccountmanager.cpp +++ b/knode/knaccountmanager.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include diff --git a/knode/knarticlefilter.cpp b/knode/knarticlefilter.cpp index 69c2acee..d55da9dc 100644 --- a/knode/knarticlefilter.cpp +++ b/knode/knarticlefilter.cpp @@ -13,7 +13,7 @@ */ #include -#include +#include #include #include @@ -78,7 +78,7 @@ bool KNArticleFilter::loadInfo() if (fname.isNull()) return false; - KSimpleConfig conf(fname,true); + TDESimpleConfig conf(fname,true); conf.setGroup("GENERAL"); n_ame=conf.readEntry("name"); @@ -98,7 +98,7 @@ void KNArticleFilter::load() if (fname.isNull()) return; - KSimpleConfig conf(fname,true); + TDESimpleConfig conf(fname,true); conf.setGroup("STATUS"); status.load(&conf); @@ -141,7 +141,7 @@ void KNArticleFilter::save() KNHelper::displayInternalFileError(); return; } - KSimpleConfig conf(dir+TQString("%1.fltr").arg(i_d)); + TDESimpleConfig conf(dir+TQString("%1.fltr").arg(i_d)); conf.setGroup("GENERAL"); conf.writeEntry("name", TQString(n_ame)); diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp index a36c188d..f92b0e0d 100644 --- a/knode/knconfig.cpp +++ b/knode/knconfig.cpp @@ -18,7 +18,7 @@ #include -#include +#include #include #include #include @@ -700,7 +700,7 @@ KNConfig::DisplayedHeaders::DisplayedHeaders() TQString fname( locate("data","knode/headers.rc") ); if (!fname.isNull()) { - KSimpleConfig headerConf(fname,true); + TDESimpleConfig headerConf(fname,true); TQStringList headers = headerConf.groupList(); headers.remove(""); headers.sort(); @@ -749,7 +749,7 @@ void KNConfig::DisplayedHeaders::save() KNHelper::displayInternalFileError(); return; } - KSimpleConfig headerConf(dir+"headers.rc"); + TDESimpleConfig headerConf(dir+"headers.rc"); TQStringList oldHeaders = headerConf.groupList(); TQStringList::Iterator oldIt=oldHeaders.begin(); diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp index 80e1fdb8..b5394e28 100644 --- a/knode/knfiltermanager.cpp +++ b/knode/knfiltermanager.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "utilities.h" #include "knglobals.h" @@ -107,7 +107,7 @@ void KNFilterManager::loadFilters() TQString fname(locate("data","knode/filters/filters.rc") ); if (!fname.isNull()) { - KSimpleConfig conf(fname,true); + TDESimpleConfig conf(fname,true); TQValueList activeFilters = conf.readIntListEntry("Active"); menuOrder = conf.readIntListEntry("Menu"); @@ -135,7 +135,7 @@ void KNFilterManager::saveFilterLists() KNHelper::displayInternalFileError(); return; } - KSimpleConfig conf(dir+"filters.rc"); + TDESimpleConfig conf(dir+"filters.rc"); TQValueList activeFilters; for ( TQValueList::Iterator it = mFilterList.begin(); it != mFilterList.end(); ++it ) activeFilters << (*it)->id(); diff --git a/knode/knfolder.cpp b/knode/knfolder.cpp index bad20f6b..d2e90fa4 100644 --- a/knode/knfolder.cpp +++ b/knode/knfolder.cpp @@ -14,7 +14,7 @@ #include -#include +#include #include #include #include @@ -111,7 +111,7 @@ bool KNFolder::readInfo(const TQString &infoPath) i_nfoPath=infoPath; - KSimpleConfig info(i_nfoPath); + TDESimpleConfig info(i_nfoPath); if (!isRootFolder() && !isStandardFolder()) { n_ame=info.readEntry("name"); i_d=info.readNumEntry("id", -1); @@ -143,7 +143,7 @@ bool KNFolder::readInfo() void KNFolder::saveInfo() { if(!i_nfoPath.isEmpty()) { - KSimpleConfig info(i_nfoPath); + TDESimpleConfig info(i_nfoPath); if (!isRootFolder() && !isStandardFolder()) { info.writeEntry("name", n_ame); info.writeEntry("id", i_d); diff --git a/knode/kngroup.cpp b/knode/kngroup.cpp index 95de1a5b..e5f8f2d3 100644 --- a/knode/kngroup.cpp +++ b/knode/kngroup.cpp @@ -13,7 +13,7 @@ */ -#include +#include #include #include @@ -77,7 +77,7 @@ void KNGroup::updateListItem() bool KNGroup::readInfo(const TQString &confPath) { - KSimpleConfig info(confPath); + TDESimpleConfig info(confPath); g_roupname = info.readEntry("groupname"); d_escription = info.readEntry("description"); @@ -122,7 +122,7 @@ void KNGroup::saveInfo() TQString dir(path()); if (!dir.isNull()) { - KSimpleConfig info(dir+g_roupname+".grpinfo"); + TDESimpleConfig info(dir+g_roupname+".grpinfo"); info.writeEntry("groupname", g_roupname); info.writeEntry("description", d_escription); diff --git a/knode/knnntpaccount.cpp b/knode/knnntpaccount.cpp index 2328a137..77ee6ef3 100644 --- a/knode/knnntpaccount.cpp +++ b/knode/knnntpaccount.cpp @@ -12,7 +12,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include +#include #include #include @@ -92,7 +92,7 @@ KNNntpAccount::~KNNntpAccount() // tries to read information, returns false if it fails to do so bool KNNntpAccount::readInfo(const TQString &confPath) { - KSimpleConfig conf(confPath); + TDESimpleConfig conf(confPath); n_ame = conf.readEntry("name"); //u_nsentCount = conf.readNumEntry("unsentCnt", 0); @@ -130,7 +130,7 @@ void KNNntpAccount::saveInfo() if (dir.isNull()) return; - KSimpleConfig conf(dir+"info"); + TDESimpleConfig conf(dir+"info"); conf.writeEntry("name", n_ame); //conf.writeEntry("unsentCnt", u_nsentCount); @@ -167,7 +167,7 @@ void KNNntpAccount::saveInfo() TQString dir(path()); if (dir.isNull()) return; - KSimpleConfig conf(dir+"info"); + TDESimpleConfig conf(dir+"info"); conf.writeEntry("unsentCnt", u_nsentCount); }*/ diff --git a/knode/knrangefilter.cpp b/knode/knrangefilter.cpp index a74a48df..7eb36a55 100644 --- a/knode/knrangefilter.cpp +++ b/knode/knrangefilter.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include "knrangefilter.h" @@ -70,7 +70,7 @@ bool KNRangeFilter::matchesOp(int v1, Op o, int v2) -void KNRangeFilter::load(KSimpleConfig *conf) +void KNRangeFilter::load(TDESimpleConfig *conf) { enabled=conf->readBoolEntry("enabled", false); val1=conf->readNumEntry("val1",0); @@ -81,7 +81,7 @@ void KNRangeFilter::load(KSimpleConfig *conf) -void KNRangeFilter::save(KSimpleConfig *conf) +void KNRangeFilter::save(TDESimpleConfig *conf) { conf->writeEntry("enabled", enabled); conf->writeEntry("val1", val1); diff --git a/knode/knrangefilter.h b/knode/knrangefilter.h index f5c429f3..d9185cd8 100644 --- a/knode/knrangefilter.h +++ b/knode/knrangefilter.h @@ -24,7 +24,7 @@ class KIntSpinBox; class TQComboBox; class TQCheckBox; -class KSimpleConfig; +class TDESimpleConfig; class KNRangeFilter { @@ -41,8 +41,8 @@ class KNRangeFilter { enabled=nr.enabled; return (*this); } - void load(KSimpleConfig *conf); - void save(KSimpleConfig *conf); + void load(TDESimpleConfig *conf); + void save(TDESimpleConfig *conf); bool doFilter(int a); diff --git a/knode/knstatusfilter.cpp b/knode/knstatusfilter.cpp index d770ae22..56572208 100644 --- a/knode/knstatusfilter.cpp +++ b/knode/knstatusfilter.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include "knarticle.h" #include "knstatusfilter.h" @@ -36,7 +36,7 @@ KNStatusFilter::~KNStatusFilter() -void KNStatusFilter::load(KSimpleConfig *conf) +void KNStatusFilter::load(TDESimpleConfig *conf) { data.setBit(EN_R, conf->readBoolEntry("EN_R", false)); data.setBit(DAT_R, conf->readBoolEntry("DAT_R", false)); @@ -54,7 +54,7 @@ void KNStatusFilter::load(KSimpleConfig *conf) -void KNStatusFilter::save(KSimpleConfig *conf) +void KNStatusFilter::save(TDESimpleConfig *conf) { conf->writeEntry("EN_R", data.at(EN_R)); conf->writeEntry("DAT_R", data.at(DAT_R)); diff --git a/knode/knstatusfilter.h b/knode/knstatusfilter.h index 39ad9d91..8a851998 100644 --- a/knode/knstatusfilter.h +++ b/knode/knstatusfilter.h @@ -22,7 +22,7 @@ #include class TQCheckBox; -class KSimpleConfig; +class TDESimpleConfig; class KNRemoteArticle; @@ -37,8 +37,8 @@ class KNStatusFilter { KNStatusFilter& operator=(const KNStatusFilter &sf) { for(int i=0; i<8; i++) data.setBit(i, sf.data.at(i)); return (*this); } - void load(KSimpleConfig *conf); - void save(KSimpleConfig *conf); + void load(TDESimpleConfig *conf); + void save(TDESimpleConfig *conf); bool doFilter(KNRemoteArticle *a); diff --git a/knode/knstringfilter.cpp b/knode/knstringfilter.cpp index 20c62f1d..68ca0b80 100644 --- a/knode/knstringfilter.cpp +++ b/knode/knstringfilter.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include "kngroup.h" @@ -75,7 +75,7 @@ void KNStringFilter::expand(KNGroup *g) -void KNStringFilter::load(KSimpleConfig *conf) +void KNStringFilter::load(TDESimpleConfig *conf) { con=conf->readBoolEntry("contains", true); data=conf->readEntry("Data"); @@ -84,7 +84,7 @@ void KNStringFilter::load(KSimpleConfig *conf) -void KNStringFilter::save(KSimpleConfig *conf) +void KNStringFilter::save(TDESimpleConfig *conf) { conf->writeEntry("contains", con); conf->writeEntry("Data", data); diff --git a/knode/knstringfilter.h b/knode/knstringfilter.h index 64df0340..4c2d0754 100644 --- a/knode/knstringfilter.h +++ b/knode/knstringfilter.h @@ -23,7 +23,7 @@ class TQCheckBox; class TQComboBox; class KLineEdit; -class KSimpleConfig; +class TDESimpleConfig; class KNGroup; @@ -40,8 +40,8 @@ class KNStringFilter { /** replace placeholders */ void expand(KNGroup *g); - void load(KSimpleConfig *conf); - void save(KSimpleConfig *conf); + void load(TDESimpleConfig *conf); + void save(TDESimpleConfig *conf); bool doFilter(const TQString &s); diff --git a/knotes/knotehostdlg.cpp b/knotes/knotehostdlg.cpp index 11abfce1..c840dae4 100644 --- a/knotes/knotehostdlg.cpp +++ b/knotes/knotehostdlg.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include "knotehostdlg.h" diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index e22d4baf..aa322df3 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp index dd08063e..ebe3f3ae 100644 --- a/knotes/knoteslegacy.cpp +++ b/knotes/knoteslegacy.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include @@ -52,7 +52,7 @@ void KNotesLegacy::cleanUp() // remove old (KDE 1.x) local config file if it still exists TQString configfile = TDEGlobal::dirs()->saveLocation( "config" ) + "knotesrc"; if ( TQFile::exists( configfile ) ) { - KSimpleConfig *test = new KSimpleConfig( configfile ); + TDESimpleConfig *test = new TDESimpleConfig( configfile ); test->setGroup( "General" ); double version = test->readDoubleNumEntry( "version", 1.0 ); delete test; @@ -76,7 +76,7 @@ bool KNotesLegacy::convert( CalendarLocal *calendar ) for ( TQStringList::ConstIterator note = notes.constBegin(); note != notes.constEnd(); ++note ) { TQString file = noteDir.absFilePath( *note ); - KSimpleConfig* test = new KSimpleConfig( file ); + TDESimpleConfig* test = new TDESimpleConfig( file ); test->setGroup( "General" ); double version = test->readDoubleNumEntry( "version", 1.0 ); diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp index 1aada535..d82b0565 100644 --- a/kode/kodemain.cpp +++ b/kode/kodemain.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include @@ -591,7 +591,7 @@ int create( TDECmdLineArgs *args ) TQFile::remove( protocolFilename ); - KSimpleConfig protocolFile( protocolFilename ); + TDESimpleConfig protocolFile( protocolFilename ); protocolFile.setGroup( "Protocol" ); protocolFile.writeEntry( "exec", "tdeio_" + protocol ); diff --git a/kode/kxml_compiler/creator.cpp b/kode/kxml_compiler/creator.cpp index 70d2eead..497effbb 100644 --- a/kode/kxml_compiler/creator.cpp +++ b/kode/kxml_compiler/creator.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/kode/kxml_compiler/creator.h b/kode/kxml_compiler/creator.h index 0e0af442..7f51396f 100644 --- a/kode/kxml_compiler/creator.h +++ b/kode/kxml_compiler/creator.h @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include diff --git a/kode/kxml_compiler/kxml_compiler.cpp b/kode/kxml_compiler/kxml_compiler.cpp index f3d557b7..66c0030d 100644 --- a/kode/kxml_compiler/kxml_compiler.cpp +++ b/kode/kxml_compiler/kxml_compiler.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/kode/kxml_compiler/parser.cpp b/kode/kxml_compiler/parser.cpp index 23ca86f2..7a91411b 100644 --- a/kode/kxml_compiler/parser.cpp +++ b/kode/kxml_compiler/parser.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/kode/kxml_compiler/parser.h b/kode/kxml_compiler/parser.h index 2c2e7faf..4747e5b4 100644 --- a/kode/kxml_compiler/parser.h +++ b/kode/kxml_compiler/parser.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/korganizer/docprefs.cpp b/korganizer/docprefs.cpp index 4bea8a8a..f89f9809 100644 --- a/korganizer/docprefs.cpp +++ b/korganizer/docprefs.cpp @@ -22,18 +22,18 @@ without including the source code for TQt in the source distribution. */ -#include +#include #include #include #include "docprefs.h" -KSimpleConfig *DocPrefs::mConfig = 0; +TDESimpleConfig *DocPrefs::mConfig = 0; DocPrefs::DocPrefs( const TQString &type ) { if ( !mConfig ) { - mConfig = new KSimpleConfig( locateLocal( "data", "korganizer/docprefs." + type + ".tdeconfig" ) ); + mConfig = new TDESimpleConfig( locateLocal( "data", "korganizer/docprefs." + type + ".tdeconfig" ) ); } } diff --git a/korganizer/docprefs.h b/korganizer/docprefs.h index 7e6597e4..36ccd82b 100644 --- a/korganizer/docprefs.h +++ b/korganizer/docprefs.h @@ -26,7 +26,7 @@ #include -class KSimpleConfig; +class TDESimpleConfig; class DocPrefs { @@ -41,7 +41,7 @@ class DocPrefs void writeEntry( const TQString &identifier, bool value ); private: - static KSimpleConfig *mConfig; + static TDESimpleConfig *mConfig; TQString mDocId; }; diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 3d89d437..31ad7778 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -57,7 +57,7 @@ #include #include #include -#include +#include #include #include @@ -279,7 +279,7 @@ class KOPrefsDialogTime : public KPrefsModule "l10n/" + (*it) + "/entry.desktop" ); TQString regionName; if ( !countryFile.isEmpty() ) { - KSimpleConfig cfg( countryFile ); + TDESimpleConfig cfg( countryFile ); cfg.setGroup( "KCM Locale" ); regionName = cfg.readEntry( "Name" ); } diff --git a/korganizer/plugins/datenums/configdialog.cpp b/korganizer/plugins/datenums/configdialog.cpp index 7882d6bd..ebff01c7 100644 --- a/korganizer/plugins/datenums/configdialog.cpp +++ b/korganizer/plugins/datenums/configdialog.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include "configdialog.h" #include "configdialog.moc" diff --git a/korganizer/plugins/exchange/exchangedialog.cpp b/korganizer/plugins/exchange/exchangedialog.cpp index 416c86c9..b4dc2dc7 100644 --- a/korganizer/plugins/exchange/exchangedialog.cpp +++ b/korganizer/plugins/exchange/exchangedialog.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "exchangedialog.h" diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp index b90e09de..736308eb 100644 --- a/korganizer/plugins/hebrew/configdialog.cpp +++ b/korganizer/plugins/hebrew/configdialog.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include ConfigDialog::ConfigDialog(TQWidget * parent):KDialogBase(Plain, i18n("Configure Holidays"), Ok|Cancel, Ok, parent) diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp index c3bb5f23..dd734b42 100644 --- a/korganizer/plugins/hebrew/hebrew.cpp +++ b/korganizer/plugins/hebrew/hebrew.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include "hebrew.h" diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp index 8a9a6cb2..596ece08 100644 --- a/korganizer/printing/calprinter.cpp +++ b/korganizer/printing/calprinter.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include @@ -50,7 +50,7 @@ CalPrinter::CalPrinter( TQWidget *parent, Calendar *calendar, KOrg::CoreHelper * : TQObject( parent, "CalPrinter" ) { mParent = parent; - mConfig = new KSimpleConfig( "korganizer_printing.rc" ); + mConfig = new TDESimpleConfig( "korganizer_printing.rc" ); mCoreHelper = helper; init( calendar ); diff --git a/libkpimexchange/core/exchangeprogress.cpp b/libkpimexchange/core/exchangeprogress.cpp index 5106059c..12a4d9c9 100644 --- a/libkpimexchange/core/exchangeprogress.cpp +++ b/libkpimexchange/core/exchangeprogress.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "exchangeprogress.h" using namespace KPIM; diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp index 0043c580..19468ff9 100644 --- a/libtdepim/kimportdialog.cpp +++ b/libtdepim/kimportdialog.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include @@ -577,7 +577,7 @@ void KImportDialog::assignTemplate() for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) { - KSimpleConfig config( *it, true ); + TDESimpleConfig config( *it, true ); if ( !config.hasGroup( "csv column map" ) ) continue; @@ -597,7 +597,7 @@ void KImportDialog::assignTemplate() if ( !ok ) return; - KSimpleConfig config( fileMap[ tmp ], true ); + TDESimpleConfig config( fileMap[ tmp ], true ); config.setGroup( "General" ); uint numColumns = config.readUnsignedNumEntry( "Columns" ); int format = config.readNumEntry( "Format" ); diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp index 293203aa..577baf15 100644 --- a/libtdepim/komposer/core/pluginmanager.cpp +++ b/libtdepim/komposer/core/pluginmanager.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/libtdepim/pluginloaderbase.cpp b/libtdepim/pluginloaderbase.cpp index fc028141..a899dc67 100644 --- a/libtdepim/pluginloaderbase.cpp +++ b/libtdepim/pluginloaderbase.cpp @@ -21,7 +21,7 @@ #include -#include +#include #include #include #include @@ -69,7 +69,7 @@ namespace KPIM { TDEGlobal::dirs()->findAllResources( "data", path, true, true ); for ( TQStringList::const_iterator it = list.begin() ; it != list.end() ; ++it ) { - KSimpleConfig config( *it, true ); + TDESimpleConfig config( *it, true ); if ( config.hasGroup( "Misc" ) && config.hasGroup( "Plugin" ) ) { config.setGroup( "Plugin" ); diff --git a/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp b/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp index 881ce2a2..059c6425 100644 --- a/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp +++ b/tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -38,7 +38,7 @@ static const TDECmdLineOptions options[] = void convertDistributionLists() { - KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) ); + TDESimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) ); const TQMap entryMap = cfg.entryMap( "DistributionLists" ); if ( entryMap.isEmpty() ) // nothing to convert -- cgit v1.2.3