diff options
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/bookmarkssettingspage.cpp | 2 | ||||
| -rw-r--r-- | src/bookmartdeselector.cpp | 4 | ||||
| -rw-r--r-- | src/detailsviewsettingspage.cpp | 2 | ||||
| -rw-r--r-- | src/dolphin.cpp | 10 | ||||
| -rw-r--r-- | src/dolphin.h | 2 | ||||
| -rw-r--r-- | src/dolphincontextmenu.cpp | 4 | ||||
| -rw-r--r-- | src/dolphincontextmenu.h | 2 | ||||
| -rw-r--r-- | src/dolphiniconsview.cpp | 2 | ||||
| -rw-r--r-- | src/iconsviewsettingspage.cpp | 2 | ||||
| -rw-r--r-- | src/urlbutton.cpp | 2 | ||||
| -rw-r--r-- | src/urlnavigator.cpp | 2 | ||||
| -rw-r--r-- | src/urlnavigatorbutton.cpp | 2 |
14 files changed, 21 insertions, 21 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c0748eb..c6c2848 100644 --- a/src/CMakeLists.txt +++ b/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 diff --git a/src/Makefile.am b/src/Makefile.am index 6c17e39..edb47b2 100644 --- a/src/Makefile.am +++ b/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 \ diff --git a/src/bookmarkssettingspage.cpp b/src/bookmarkssettingspage.cpp index 5f773fd..3b465ba 100644 --- a/src/bookmarkssettingspage.cpp +++ b/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> diff --git a/src/bookmartdeselector.cpp b/src/bookmartdeselector.cpp index c9fee79..4f2ea73 100644 --- a/src/bookmartdeselector.cpp +++ b/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" diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp index f99478a..deb7339 100644 --- a/src/detailsviewsettingspage.cpp +++ b/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> diff --git a/src/dolphin.cpp b/src/dolphin.cpp index 98abe71..505e7ea 100644 --- a/src/dolphin.cpp +++ b/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> diff --git a/src/dolphin.h b/src/dolphin.h index ea7d081..d854df2 100644 --- a/src/dolphin.h +++ b/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> diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 6589962..a47d1ed 100644 --- a/src/dolphincontextmenu.cpp +++ b/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> diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h index 8ca0bc7..a677cce 100644 --- a/src/dolphincontextmenu.h +++ b/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> diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index 98c1d3d..6040b7c 100644 --- a/src/dolphiniconsview.cpp +++ b/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> diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp index 9614042..7c453cf 100644 --- a/src/iconsviewsettingspage.cpp +++ b/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> diff --git a/src/urlbutton.cpp b/src/urlbutton.cpp index a9cc644..10b0543 100644 --- a/src/urlbutton.cpp +++ b/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> diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp index 630e033..155853c 100644 --- a/src/urlnavigator.cpp +++ b/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" diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp index 2b5f38d..04094e7 100644 --- a/src/urlnavigatorbutton.cpp +++ b/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> |