Rename many classes and header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 6b97d88a5a
commit 32932d14f9

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save