summaryrefslogtreecommitdiffstats
path: root/kreadconfig
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kreadconfig
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kreadconfig')
-rw-r--r--kreadconfig/kreadconfig.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kreadconfig/kreadconfig.cpp b/kreadconfig/kreadconfig.cpp
index 4be41ccec..2748e3bfe 100644
--- a/kreadconfig/kreadconfig.cpp
+++ b/kreadconfig/kreadconfig.cpp
@@ -65,12 +65,12 @@ int main(int argc, char **argv)
}
TDEInstance inst(&aboutData);
- KGlobal::config();
+ TDEGlobal::config();
KConfig *konfig;
bool configMustDeleted = false;
if (file.isEmpty())
- konfig = KGlobal::config();
+ konfig = TDEGlobal::config();
else
{
konfig = new KConfig(file, true, false);