From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:35:07 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- tdecore/kdesktopfile.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tdecore/kdesktopfile.cpp') diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp index 29c30f9d9..1b9a49890 100644 --- a/tdecore/kdesktopfile.cpp +++ b/tdecore/kdesktopfile.cpp @@ -42,9 +42,9 @@ KDesktopFile::KDesktopFile(const TQString &fileName, bool bReadOnly, const char * resType) - : KConfig(TQString::fromLatin1(""), bReadOnly, false) + : TDEConfig(TQString::fromLatin1(""), bReadOnly, false) { - // KConfigBackEnd will try to locate the filename that is provided + // TDEConfigBackEnd will try to locate the filename that is provided // based on the resource type specified, _only_ if the filename // is not an absolute path. backEnd->changeFileName(fileName, resType, false); @@ -346,7 +346,7 @@ KDesktopFile::sortOrder() const } void KDesktopFile::virtual_hook( int id, void* data ) -{ KConfig::virtual_hook( id, data ); } +{ TDEConfig::virtual_hook( id, data ); } TQString KDesktopFile::readDocPath() const { @@ -361,7 +361,7 @@ TQString KDesktopFile::readDocPath() const KDesktopFile* KDesktopFile::copyTo(const TQString &file) const { KDesktopFile *config = new KDesktopFile(TQString::null, false); - KConfig::copyTo(file, config); + TDEConfig::copyTo(file, config); config->setDesktopGroup(); return config; } -- cgit v1.2.1