Rename many classes and header files to avoid conflicts with KDE4

src/CMakeLists.txt

@@ -40,7 +40,7 @@ install( FILES d3lphinui.rc DESTINATION ${DATA_INSTALL_DIR}/d3lphin )
 
 tde_add_executable( d3lphin AUTOMOC
   SOURCES
-    bookmarkselector.cpp bookmarkssettingspage.cpp
+    bookmartdeselector.cpp bookmarkssettingspage.cpp
     bookmarkssidebarpage.cpp
     detailsviewsettingspage.cpp dolphin.cpp
     dolphincontextmenu.cpp dolphindetailsview.cpp

src/Makefile.am

@@ -16,7 +16,7 @@ d3lphin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE)
 d3lphin_LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT) -lkonq
 
 # which sources should be compiled for d3lphin
-d3lphin_SOURCES = bookmarkselector.cpp bookmarkssettingspage.cpp \
+d3lphin_SOURCES = bookmartdeselector.cpp bookmarkssettingspage.cpp \
 	bookmarkssidebarpage.cpp detailsviewsettingspage.cpp dolphin.cpp dolphincontextmenu.cpp \
 	dolphindetailsview.cpp dolphindetailsviewsettings.cpp dolphindirlister.cpp \
 	dolphiniconsview.cpp dolphiniconsviewsettings.cpp dolphinsettings.cpp \
@@ -29,7 +29,7 @@ d3lphin_SOURCES = bookmarkselector.cpp bookmarkssettingspage.cpp \
 
 
 # these are the headers for your project
-noinst_HEADERS = bookmarkselector.h bookmarkssettingspage.h \
+noinst_HEADERS = bookmartdeselector.h bookmarkssettingspage.h \
 	bookmarkssidebarpage.h detailsviewsettingspage.h dolphin.h dolphincontextmenu.h \
 	dolphindetailsview.h dolphindetailsviewsettings.h dolphindirlister.h dolphiniconsview.h \
 	dolphiniconsviewsettings.h dolphiniconsviewsettings.h	iconsviewsettingspage.h dolphinsettings.h \

src/bookmarkssettingspage.cpp

@@ -30,7 +30,7 @@
 #include <kbookmark.h>
 #include <kbookmarkmanager.h>
 #include <kdialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 

src/bookmartdeselector.cpp

@@ -28,7 +28,7 @@
 #include <kglobalsettings.h>
 #include <kbookmarkmanager.h>
 
-#include "bookmarkselector.h"
+#include "bookmartdeselector.h"
 #include "dolphinsettings.h"
 #include "dolphinview.h"
 #include "dolphin.h"
@@ -179,5 +179,5 @@ void BookmarkSelector::slotBookmarkActivated(int index)
     emit bookmarkActivated(index);
 }
 
-#include "bookmarkselector.moc"
+#include "bookmartdeselector.moc"
 

src/detailsviewsettingspage.cpp

@@ -22,7 +22,7 @@
 #include <tqcheckbox.h>
 #include <klocale.h>
 #include <kdialog.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
 #include <tqspinbox.h>
 #include <tqlabel.h>
 #include <tqgrid.h>

src/dolphin.cpp

@@ -30,17 +30,17 @@
 #include <kiconloader.h>
 #include <tdeversion.h>
 #include <kstatusbar.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
 #include <tdeconfig.h>
 #include <kurl.h>
 #include <kurldrag.h>
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
-#include <kactionclasses.h>
-#include <kpopupmenu.h>
+#include <tdeactionclasses.h>
+#include <tdepopupmenu.h>
 #include <tdeio/renamedlg.h>
 #include <kinputdialog.h>
 #include <kshell.h>

src/dolphin.h

@@ -27,7 +27,7 @@
 #endif
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqvaluelist.h>
 #include <tqptrlist.h>
 #include <tqstring.h>

src/dolphincontextmenu.cpp

@@ -20,7 +20,7 @@
 
 #include "dolphincontextmenu.h"
 
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kbookmarkmanager.h>
 #include <kbookmark.h>
 #include <ktrader.h>
@@ -30,7 +30,7 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kpropertiesdialog.h>
 #include <kdesktopfile.h>
 #include <assert.h>

src/dolphincontextmenu.h

@@ -21,7 +21,7 @@
 #ifndef DOLPHINCONTEXTMENU_H
 #define DOLPHINCONTEXTMENU_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqpoint.h>
 #include <tqstring.h>
 #include <tqvaluelist.h>

src/dolphiniconsview.cpp

@@ -27,7 +27,7 @@
 #include <kurldrag.h>
 #include <tqclipboard.h>
 #include <assert.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdefileitem.h>
 

src/iconsviewsettingspage.cpp

@@ -26,7 +26,7 @@
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
 #include <kiconloader.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <assert.h>

src/urlbutton.cpp

@@ -24,7 +24,7 @@
 #include <tqcursor.h>
 #include <tqfontmetrics.h>
 #include <kurldrag.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <klocale.h>
 

src/urlnavigator.cpp

@@ -42,7 +42,7 @@
 
 #include "dolphin.h"
 #include "dolphinsettings.h"
-#include "bookmarkselector.h"
+#include "bookmartdeselector.h"
 #include "dolphinstatusbar.h"
 #include "urlnavigatorbutton.h"
 #include "dolphinview.h"

src/urlnavigatorbutton.cpp

@@ -29,7 +29,7 @@
 #include <kiconloader.h>
 #include <tdeio/jobclasses.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurl.h>
 #include <kurldrag.h>
 #include <assert.h>