From b9e542d0c805e9adee3a67e44532d5321032e21e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:51:01 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- buildtools/pascal/pascalglobaloptionsdlg.cpp | 6 +++--- buildtools/pascal/pascalproject_part.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'buildtools/pascal') diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp index 79fe9167..327ecc67 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 = KGlobal::config(); + KConfig *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 = KGlobal::config(); +/* KConfig *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 = KGlobal::config(); + KConfig *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 c0d53c89..e8fd8a65 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -346,7 +346,7 @@ void PascalProjectPart::slotBuild() cmdline += fi.fileName(); TQString dircmd = "cd "; - dircmd += KProcess::quote(buildDirectory()); + dircmd += TDEProcess::quote(buildDirectory()); dircmd += " && "; makeFrontend()->queueCommand(buildDirectory(), dircmd + cmdline); @@ -471,7 +471,7 @@ KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &na TQString PascalProjectPart::defaultOptions( const TQString compiler ) const { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Pascal Compiler"); return config->readPathEntry(compiler); } -- cgit v1.2.1