Rename many classes and header files to avoid conflicts with KDE4

7 files changed, 13 insertions, 13 deletions

diff --git a/tdecachegrind/tdecachegrind/CMakeLists.txt b/tdecachegrind/tdecachegrind/CMakeLists.txt
index 3906452e..10d9b1ae 100644
--- a/tdecachegrind/tdecachegrind/CMakeLists.txt
+++ b/tdecachegrind/tdecachegrind/CMakeLists.txt
@@ -34,10 +34,10 @@ install( FILES x-tdecachegrind.desktop DESTINATION ${MIME_INSTALL_DIR}/applicati
 
 tde_add_executable( tdecachegrind AUTOMOC
   SOURCES
-    functionselectionbase.ui stackselectionbase.ui partselectionbase.ui
+    functionselectionbase.ui stactdeselectionbase.ui partselectionbase.ui
     configdlgbase.ui loader.cpp cachegrindloader.cpp treemap.cpp pool.cpp
     main.cpp configuration.cpp functionselection.cpp coverage.cpp
-    partgraph.cpp toplevel.cpp stackselection.cpp stackbrowser.cpp
+    partgraph.cpp toplevel.cpp stactdeselection.cpp stackbrowser.cpp
     subcost.cpp tracedata.cpp partselection.cpp configdlg.cpp
     utils.cpp fixcost.cpp traceitemview.cpp instrview.cpp tabview.cpp
     sourceview.cpp callmapview.cpp callview.cpp coverageview.cpp
diff --git a/tdecachegrind/tdecachegrind/Makefile.am b/tdecachegrind/tdecachegrind/Makefile.am
index f7c1bf8c..a09f8ce9 100644
--- a/tdecachegrind/tdecachegrind/Makefile.am
+++ b/tdecachegrind/tdecachegrind/Makefile.am
@@ -2,13 +2,13 @@ bin_PROGRAMS = tdecachegrind
 
 tdecachegrind_SOURCES = \
  functionselectionbase.ui \
- stackselectionbase.ui \
+ stactdeselectionbase.ui \
  partselectionbase.ui \
  configdlgbase.ui \
  loader.cpp cachegrindloader.cpp treemap.cpp pool.cpp \
  main.cpp configuration.cpp \
  functionselection.cpp coverage.cpp partgraph.cpp \
- toplevel.cpp stackselection.cpp stackbrowser.cpp \
+ toplevel.cpp stactdeselection.cpp stackbrowser.cpp \
  subcost.cpp tracedata.cpp partselection.cpp configdlg.cpp \
  utils.cpp fixcost.cpp \
  traceitemview.cpp instrview.cpp tabview.cpp \
diff --git a/tdecachegrind/tdecachegrind/stackitem.cpp b/tdecachegrind/tdecachegrind/stackitem.cpp
index e3763ab4..412781de 100644
--- a/tdecachegrind/tdecachegrind/stackitem.cpp
+++ b/tdecachegrind/tdecachegrind/stackitem.cpp
@@ -26,7 +26,7 @@
 #include "configuration.h"
 #include "listutils.h"
 #include "stackitem.h"
-#include "stackselection.h"
+#include "stactdeselection.h"
 
 // StackItem
 
diff --git a/tdecachegrind/tdecachegrind/stactdeselection.cpp b/tdecachegrind/tdecachegrind/stactdeselection.cpp
index 59094754..29c45d2b 100644
--- a/tdecachegrind/tdecachegrind/stactdeselection.cpp
+++ b/tdecachegrind/tdecachegrind/stactdeselection.cpp
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 
 #include "stackbrowser.h"
-#include "stackselection.h"
+#include "stactdeselection.h"
 #include "stackitem.h"
 
 StackSelection::StackSelection( TQWidget* parent, const char* name)
@@ -227,4 +227,4 @@ void StackSelection::setGroupType(TraceItem::CostType gt)
     ((StackItem*)item)->updateGroup();
 }
 
-#include "stackselection.moc"
+#include "stactdeselection.moc"
diff --git a/tdecachegrind/tdecachegrind/stactdeselection.h b/tdecachegrind/tdecachegrind/stactdeselection.h
index 8a826495..5e25a5d8 100644
--- a/tdecachegrind/tdecachegrind/stactdeselection.h
+++ b/tdecachegrind/tdecachegrind/stactdeselection.h
@@ -25,7 +25,7 @@
 #ifndef STACKSELECTION_H
 #define STACKSELECTION_H
 
-#include "stackselectionbase.h"
+#include "stactdeselectionbase.h"
 #include "tracedata.h"
 
 class TraceFunction;
diff --git a/tdecachegrind/tdecachegrind/toplevel.cpp b/tdecachegrind/tdecachegrind/toplevel.cpp
index c8ac689b..5c1bd609 100644
--- a/tdecachegrind/tdecachegrind/toplevel.cpp
+++ b/tdecachegrind/tdecachegrind/toplevel.cpp
@@ -38,16 +38,16 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kstatusbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurl.h>
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
 #include <ktip.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 
 #if ENABLE_DUMPDOCK
@@ -57,7 +57,7 @@
 #include "toplevel.h"
 #include "partselection.h"
 #include "functionselection.h"
-#include "stackselection.h"
+#include "stactdeselection.h"
 #include "stackbrowser.h"
 #include "tracedata.h"
 #include "configuration.h"
diff --git a/tdecachegrind/tdecachegrind/toplevel.h b/tdecachegrind/tdecachegrind/toplevel.h
index 69b3079b..0880fd47 100644
--- a/tdecachegrind/tdecachegrind/toplevel.h
+++ b/tdecachegrind/tdecachegrind/toplevel.h
@@ -26,7 +26,7 @@
 #include <tqdatetime.h>
 
 #include <dcopobject.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "traceitemview.h"
 #include "tracedata.h"