From da1522385e5367bae56b90fac55c4355e475905b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:38:54 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- buildtools/pascal/pascalglobaloptionsdlg.cpp | 6 +++--- buildtools/pascal/pascalproject_part.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'buildtools/pascal') diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp index 327ecc67..62facc8d 100644 --- a/buildtools/pascal/pascalglobaloptionsdlg.cpp +++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp @@ -101,7 +101,7 @@ void PascalGlobalOptionsDlg::readCompilerOpts( TQString compiler ) TQString settings = configCache[compiler]; if (settings.isEmpty()) { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Pascal Compiler"); settings = config->readPathEntry(compiler); } @@ -111,7 +111,7 @@ void PascalGlobalOptionsDlg::readCompilerOpts( TQString compiler ) void PascalGlobalOptionsDlg::readConfigCache( ) { -/* KConfig *config = TDEGlobal::config(); +/* TDEConfig *config = TDEGlobal::config(); config->setGroup("Pascal Compiler"); TQMap settings = config->entryMap("Pascal Compiler"); @@ -120,7 +120,7 @@ void PascalGlobalOptionsDlg::readConfigCache( ) void PascalGlobalOptionsDlg::saveConfigCache( ) { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Pascal Compiler"); for (TQMap::iterator it = configCache.begin(); it != configCache.end(); ++it) diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index e8fd8a65..a2cb5723 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -471,7 +471,7 @@ KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &na TQString PascalProjectPart::defaultOptions( const TQString compiler ) const { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Pascal Compiler"); return config->readPathEntry(compiler); } -- cgit v1.2.1