summaryrefslogtreecommitdiffstats
path: root/buildtools/ada
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:38:54 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:38:54 -0600
commitda1522385e5367bae56b90fac55c4355e475905b (patch)
treebfa432864dbf322feb4ed3a878f1222ee8ea7727 /buildtools/ada
parentb9e542d0c805e9adee3a67e44532d5321032e21e (diff)
downloadtdevelop-da1522385e5367bae56b90fac55c4355e475905b.tar.gz
tdevelop-da1522385e5367bae56b90fac55c4355e475905b.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'buildtools/ada')
-rw-r--r--buildtools/ada/adaglobaloptionsdlg.cpp6
-rw-r--r--buildtools/ada/adaproject_part.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp
index 48493adb..33e432cf 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 = TDEGlobal::config();
+ TDEConfig *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 = TDEGlobal::config();
+/* TDEConfig *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 = TDEGlobal::config();
+ TDEConfig *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 02c894cd..96b01a51 100644
--- a/buildtools/ada/adaproject_part.cpp
+++ b/buildtools/ada/adaproject_part.cpp
@@ -443,7 +443,7 @@ KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name)
TQString AdaProjectPart::defaultOptions( const TQString compiler )
{
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("Ada Compiler");
return config->readPathEntry(compiler);
}