diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:10:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:10:32 -0600 |
| commit | 3fe437def8063926892bddf2dcc733861308836d (patch) | |
| tree | 021d66ad023a32bc8ea0074a1ab3d01316aff8b0 /kexi/core | |
| parent | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (diff) | |
| download | koffice-3fe437def8063926892bddf2dcc733861308836d.tar.gz koffice-3fe437def8063926892bddf2dcc733861308836d.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kexi/core')
| -rw-r--r-- | kexi/core/kexidbshortcutfile.cpp | 4 | ||||
| -rw-r--r-- | kexi/core/kexipartmanager.cpp | 2 | ||||
| -rw-r--r-- | kexi/core/kexitemplateloader.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kexi/core/kexidbshortcutfile.cpp b/kexi/core/kexidbshortcutfile.cpp index 1969caf5..dbea9737 100644 --- a/kexi/core/kexidbshortcutfile.cpp +++ b/kexi/core/kexidbshortcutfile.cpp @@ -62,7 +62,7 @@ KexiDBShortcutFile::~KexiDBShortcutFile() bool KexiDBShortcutFile::loadProjectData(KexiProjectData& data, TQString* _groupKey) { - KConfig config(d->fileName, true /* readOnly */, false /* local */ ); + TDEConfig config(d->fileName, true /* readOnly */, false /* local */ ); config.setGroup("File Information"); data.formatVersion = config.readNumEntry("version", KexiDBShortcutFile_version); @@ -158,7 +158,7 @@ bool KexiDBShortcutFile::loadProjectData(KexiProjectData& data, TQString* _group bool KexiDBShortcutFile::saveProjectData(const KexiProjectData& data, bool savePassword, TQString* _groupKey, bool overwriteFirstGroup) { - KConfig config(d->fileName, false /*rw*/, false /* local */); + TDEConfig config(d->fileName, false /*rw*/, false /* local */); config.setGroup("File Information"); uint realFormatVersion = data.formatVersion; diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp index d651f8d0..1247c9c0 100644 --- a/kexi/core/kexipartmanager.cpp +++ b/kexi/core/kexipartmanager.cpp @@ -58,7 +58,7 @@ Manager::lookup() KTrader::OfferList tlist = KTrader::self()->query("Kexi/Handler", "[X-Kexi-PartVersion] == " + TQString::number(KEXI_PART_VERSION)); - KConfig conf("kexirc", true); + TDEConfig conf("kexirc", true); conf.setGroup("Parts"); TQStringList sl_order = TQStringList::split( ",", conf.readEntry("Order") );//we'll set parts in defined order const int size = TQMAX( tlist.count(), sl_order.count() ); diff --git a/kexi/core/kexitemplateloader.cpp b/kexi/core/kexitemplateloader.cpp index 0defda8c..f8708b33 100644 --- a/kexi/core/kexitemplateloader.cpp +++ b/kexi/core/kexitemplateloader.cpp @@ -74,7 +74,7 @@ KexiTemplateInfo KexiTemplateLoader::loadInfo(const TQString& directory) } if (!TQFileInfo(directory+"/info.txt").isReadable()) return KexiTemplateInfo(); - KConfig infoTxt(directory+"/info.txt", true/*readonly*/, false/*local*/); + TDEConfig infoTxt(directory+"/info.txt", true/*readonly*/, false/*local*/); KexiTemplateInfo info; info.name = infoTxt.readEntry("Name"); if (info.name.isEmpty()) { |