summaryrefslogtreecommitdiffstats
path: root/buildtools/ada
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
commitb9e542d0c805e9adee3a67e44532d5321032e21e (patch)
treee82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /buildtools/ada
parent7a392a04059bd904dab4c78910a6d34aa0b37798 (diff)
downloadtdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz
tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'buildtools/ada')
-rw-r--r--buildtools/ada/adaglobaloptionsdlg.cpp6
-rw-r--r--buildtools/ada/adaproject_part.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp
index 32d3f257..48493adb 100644
--- a/buildtools/ada/adaglobaloptionsdlg.cpp
+++ b/buildtools/ada/adaglobaloptionsdlg.cpp
@@ -98,7 +98,7 @@ void AdaGlobalOptionsDlg::readCompilerOpts( TQString compiler )
TQString settings = configCache[compiler];
if (settings.isEmpty())
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("Ada Compiler");
settings = config->readPathEntry(compiler);
}
@@ -108,7 +108,7 @@ void AdaGlobalOptionsDlg::readCompilerOpts( TQString compiler )
void AdaGlobalOptionsDlg::readConfigCache( )
{
-/* KConfig *config = KGlobal::config();
+/* KConfig *config = TDEGlobal::config();
config->setGroup("Ada Compiler");
TQMap<TQString, TQString> settings = config->entryMap("Ada Compiler");
@@ -117,7 +117,7 @@ void AdaGlobalOptionsDlg::readConfigCache( )
void AdaGlobalOptionsDlg::saveConfigCache( )
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("Ada Compiler");
for (TQMap<TQString, TQString>::iterator it = configCache.begin(); it != configCache.end(); ++it)
diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp
index f487fcb0..02c894cd 100644
--- a/buildtools/ada/adaproject_part.cpp
+++ b/buildtools/ada/adaproject_part.cpp
@@ -346,7 +346,7 @@ void AdaProjectPart::slotBuild()
cmdline += fi.fileName();
TQString dircmd = "cd ";
- dircmd += KProcess::quote(buildDirectory());
+ dircmd += TDEProcess::quote(buildDirectory());
dircmd += " && ";
makeFrontend()->queueCommand(buildDirectory(), dircmd + cmdline);
@@ -443,7 +443,7 @@ KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name)
TQString AdaProjectPart::defaultOptions( const TQString compiler )
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("Ada Compiler");
return config->readPathEntry(compiler);
}