diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:38:54 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:38:54 -0600 |
commit | da1522385e5367bae56b90fac55c4355e475905b (patch) | |
tree | bfa432864dbf322feb4ed3a878f1222ee8ea7727 /lib/util | |
parent | b9e542d0c805e9adee3a67e44532d5321032e21e (diff) | |
download | tdevelop-da1522385e5367bae56b90fac55c4355e475905b.tar.gz tdevelop-da1522385e5367bae56b90fac55c4355e475905b.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'lib/util')
-rw-r--r-- | lib/util/settings.cpp | 6 | ||||
-rw-r--r-- | lib/util/settings.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp index 90af2b1c..f7895145 100644 --- a/lib/util/settings.cpp +++ b/lib/util/settings.cpp @@ -15,7 +15,7 @@ #include "settings.h" -TQString Settings::terminalEmulatorName( KConfig & config ) +TQString Settings::terminalEmulatorName( TDEConfig & config ) { config.setGroup("TerminalEmulator"); bool useKDESetting = config.readBoolEntry( "UseKDESetting", true ); @@ -23,7 +23,7 @@ TQString Settings::terminalEmulatorName( KConfig & config ) if ( useKDESetting ) { - KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); + TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); terminal = confGroup.readEntry("TerminalApplication", TQString::fromLatin1("konsole")); } else @@ -35,7 +35,7 @@ TQString Settings::terminalEmulatorName( KConfig & config ) TQString Settings::profileByAttributes(const TQString &language, const TQStringList &keywords) { - KConfig config(locate("data", "tdevelop/profiles/projectprofiles")); + TDEConfig config(locate("data", "tdevelop/profiles/projectprofiles")); config.setGroup(language); TQStringList profileKeywords = TQStringList::split("/", "Empty"); diff --git a/lib/util/settings.h b/lib/util/settings.h index ad92805d..65888357 100644 --- a/lib/util/settings.h +++ b/lib/util/settings.h @@ -12,13 +12,13 @@ #ifndef SETTINGS_H #define SETTINGS_H -class KConfig; +class TDEConfig; /// Utility functions for settings class Settings { public: - static TQString terminalEmulatorName( KConfig & config ); + static TQString terminalEmulatorName( TDEConfig & config ); static TQString profileByAttributes(const TQString &language, const TQStringList &keywords); }; |