Rename a number of libraries and executables to avoid conflicts with KDE4

1 files changed, 11 insertions, 11 deletions

diff --git a/tdecachegrind/tdecachegrind/configuration.cpp b/tdecachegrind/tdecachegrind/configuration.cpp
index b18440d2..78736b66 100644
--- a/tdecachegrind/tdecachegrind/configuration.cpp
+++ b/tdecachegrind/tdecachegrind/configuration.cpp
@@ -20,7 +20,7 @@
  * Configuration for KCachegrind
  */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 
@@ -130,12 +130,12 @@ Configuration* Configuration::config()
 }
 
 
-void Configuration::saveOptions(TDEConfig* kconfig)
+void Configuration::saveOptions(TDEConfig* tdeconfig)
 {
   Configuration* c = config();
 
   // color options
-  TDEConfigGroup colorConfig(kconfig, TQCString("CostColors"));
+  TDEConfigGroup colorConfig(tdeconfig, TQCString("CostColors"));
   TQDictIterator<ColorSetting> it( c->_colors );
   int count = 1;
   for( ; it.current(); ++it ) {
@@ -152,7 +152,7 @@ void Configuration::saveOptions(TDEConfig* kconfig)
   colorConfig.writeEntry( "Count", count-1);
 
   // source options
-  TDEConfigGroup sourceConfig(kconfig, TQCString("Source"));
+  TDEConfigGroup sourceConfig(tdeconfig, TQCString("Source"));
   sourceConfig.writeEntry("Dirs", c->_generalSourceDirs, ':');
   TQDictIterator<TQStringList> it2( c->_objectSourceDirs );
   count = 1;
@@ -166,7 +166,7 @@ void Configuration::saveOptions(TDEConfig* kconfig)
   sourceConfig.writeEntry( "Count", count-1);
 
   // general options
-  TDEConfigGroup generalConfig(kconfig, TQCString("General"));
+  TDEConfigGroup generalConfig(tdeconfig, TQCString("General"));
   generalConfig.writeEntry("ShowPercentage", c->_showPercentage);
   generalConfig.writeEntry("ShowExpanded", c->_showExpanded);
   generalConfig.writeEntry("ShowCycles", c->_showCycles);
@@ -179,7 +179,7 @@ void Configuration::saveOptions(TDEConfig* kconfig)
   generalConfig.writeEntry("Context", c->_context);
   generalConfig.writeEntry("NoCostInside", c->_noCostInside);
 
-  TDEConfigGroup ctConfig(kconfig, TQCString("CostTypes"));
+  TDEConfigGroup ctConfig(tdeconfig, TQCString("CostTypes"));
   int ctCount = TraceCostType::knownTypeCount();
   ctConfig.writeEntry( "Count", ctCount);
   for (int i=0; i<ctCount; i++) {
@@ -200,7 +200,7 @@ void Configuration::saveOptions(TDEConfig* kconfig)
 
 
 
-void Configuration::readOptions(TDEConfig* kconfig)
+void Configuration::readOptions(TDEConfig* tdeconfig)
 {
   int i, count;
   Configuration* c = config();
@@ -226,7 +226,7 @@ void Configuration::readOptions(TDEConfig* kconfig)
   c->color("CostType-Dr")->color = TQColor(40,40,180);
   c->color("CostType-Dw")->color = TQColor(80,80,120);
 
-  TDEConfigGroup colorConfig(kconfig, TQCString("CostColors"));
+  TDEConfigGroup colorConfig(tdeconfig, TQCString("CostColors"));
   count = colorConfig.readNumEntry("Count", 0);
   for (i=1;i<=count;i++) {
     TQString n = colorConfig.readEntry(TQString("Name%1").arg(i));
@@ -245,7 +245,7 @@ void Configuration::readOptions(TDEConfig* kconfig)
   }
 
   // source options
-  TDEConfigGroup sourceConfig(kconfig, TQCString("Source"));
+  TDEConfigGroup sourceConfig(tdeconfig, TQCString("Source"));
   TQStringList dirs;
   dirs = sourceConfig.readListEntry("Dirs", ':');
   if (dirs.count()>0) c->_generalSourceDirs = dirs;
@@ -263,7 +263,7 @@ void Configuration::readOptions(TDEConfig* kconfig)
 
 
   // general options
-  TDEConfigGroup generalConfig(kconfig, TQCString("General"));
+  TDEConfigGroup generalConfig(tdeconfig, TQCString("General"));
   c->_showPercentage = generalConfig.readBoolEntry("ShowPercentage", true);
   c->_showExpanded = generalConfig.readBoolEntry("ShowExpanded", false);
   c->_showCycles = generalConfig.readBoolEntry("ShowCycles", true);
@@ -279,7 +279,7 @@ void Configuration::readOptions(TDEConfig* kconfig)
   // known cost types
   if (TraceCostType::knownTypeCount()==0) {
 
-    TDEConfigGroup ctConfig(kconfig, TQCString("CostTypes"));
+    TDEConfigGroup ctConfig(tdeconfig, TQCString("CostTypes"));
     int ctCount = ctConfig.readNumEntry("Count", 0);
     if (ctCount>0) {
       for (int i=1;i<=ctCount;i++) {