Rename many classes and header files to avoid conflicts with KDE4

7 files changed, 16 insertions, 16 deletions

diff --git a/parts/fileselector/CMakeLists.txt b/parts/fileselector/CMakeLists.txt
index 16eaecf3..8f18792e 100644
--- a/parts/fileselector/CMakeLists.txt
+++ b/parts/fileselector/CMakeLists.txt
@@ -35,7 +35,7 @@ install( FILES kdevfileselector.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 tde_add_kpart( libkdevfileselector AUTOMOC
   SOURCES
     fileselector_part.cpp fileselector_widget.cpp
-    kactionselector.cpp kbookmarkhandler.cpp
+    tdeactionselector.cpp kbookmarkhandler.cpp
   LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/fileselector/Makefile.am b/parts/fileselector/Makefile.am
index 6d5f7447..f0c2fc35 100644
--- a/parts/fileselector/Makefile.am
+++ b/parts/fileselector/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = libkdevfileselector.la
 libkdevfileselector_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkdevfileselector_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevfileselector_la_SOURCES = fileselector_part.cpp fileselector_widget.cpp kactionselector.cpp kbookmarkhandler.cpp
+libkdevfileselector_la_SOURCES = fileselector_part.cpp fileselector_widget.cpp tdeactionselector.cpp kbookmarkhandler.cpp
 
 METASOURCES = AUTO
 
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index 295ff957..f19ec2d3 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -23,7 +23,7 @@
 //BEGIN Includes
 #include "fileselector_part.h"
 #include "fileselector_widget.h"
-#include "kactionselector.h"
+#include "tdeactionselector.h"
 #include "kbookmarkhandler.h"
 
 #include <kdevcore.h>
@@ -50,7 +50,7 @@
 
 #include <tdetexteditor/document.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <kurlcombobox.h>
@@ -59,11 +59,11 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kcombobox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <tqtoolbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdialog.h>
 #include <tdeio/netaccess.h>
 
@@ -184,7 +184,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
     connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ),
              filter, TQT_SLOT( addToHistory(const TQString&) ) );
 
-    // kaction for the dir sync method
+    // tdeaction for the dir sync method
     acSyncDir = new TDEAction( i18n("Current Document Directory"), "dirsynch", 0,
                              TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
     toolbar->setIconText( TDEToolBar::IconOnly );
diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h
index c95335a2..e47f00c9 100644
--- a/parts/fileselector/fileselector_widget.h
+++ b/parts/fileselector/fileselector_widget.h
@@ -25,7 +25,7 @@
 #include <tqwidget.h>
 #include <tdefile.h>
 #include <kurl.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <tqframe.h>
 #include <kdiroperator.h>
 
diff --git a/parts/fileselector/kbookmarkhandler.cpp b/parts/fileselector/kbookmarkhandler.cpp
index 4c1c0271..004411ff 100644
--- a/parts/fileselector/kbookmarkhandler.cpp
+++ b/parts/fileselector/kbookmarkhandler.cpp
@@ -25,21 +25,21 @@
 
 #include <kxmlguiclient.h>
 #include <kbookmarkimporter.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kdiroperator.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "kbookmarkhandler.h"
 #include "kbookmarkhandler.moc"
 
 
-KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu* kpopupmenu )
+KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu* tdepopupmenu )
     : TQObject( parent, "KBookmarkHandler" ),
       KBookmarkOwner(),
       mParent( parent ),
-      m_menu( kpopupmenu ),
+      m_menu( tdepopupmenu ),
       m_importStream( 0L )
 {
     if (!m_menu)
diff --git a/parts/fileselector/kbookmarkhandler.h b/parts/fileselector/kbookmarkhandler.h
index 38091e0f..4ec065aa 100644
--- a/parts/fileselector/kbookmarkhandler.h
+++ b/parts/fileselector/kbookmarkhandler.h
@@ -34,7 +34,7 @@ class KBookmarkHandler : public TQObject, public KBookmarkOwner
   
 
 public:
-    KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu *kpopupmenu=0 );
+    KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu *tdepopupmenu=0 );
     ~KBookmarkHandler();
 
     // KBookmarkOwner interface:
diff --git a/parts/fileselector/tdeactionselector.cpp b/parts/fileselector/tdeactionselector.cpp
index 0b5b3801..598fe496 100644
--- a/parts/fileselector/tdeactionselector.cpp
+++ b/parts/fileselector/tdeactionselector.cpp
@@ -17,7 +17,7 @@
 */
 
 
-#include "kactionselector.h"
+#include "tdeactionselector.h"
 
 #include <klocale.h>
 #include <kiconloader.h>
@@ -534,4 +534,4 @@ int TDEActionSelector::insertionIndex( TQListBox *lb, InsertionPolicy policy )
 }
 
 //END Private Methods
-#include "kactionselector.moc"
+#include "tdeactionselector.moc"