summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-02-19 19:27:06 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-02-19 19:27:06 +0100
commit36752706bbaa1e793e9b215216bac0a76b531410 (patch)
treede2584aed8e5ea2145bb6c2d00e2f5ca3ebc5e77
parent3abb50353477ace087880978098aaae38f6a896d (diff)
downloaddolphin-36752706bbaa1e793e9b215216bac0a76b531410.tar.gz
dolphin-36752706bbaa1e793e9b215216bac0a76b531410.zip
Fix unintended rename of bookmark*, mark*
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am4
-rw-r--r--src/bookmarkselector.cpp (renamed from src/bookmartdeselector.cpp)4
-rw-r--r--src/bookmarkselector.h (renamed from src/bookmartdeselector.h)0
-rw-r--r--src/urlnavigator.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c6c2848..c0748eb 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
- bookmartdeselector.cpp bookmarkssettingspage.cpp
+ bookmarkselector.cpp bookmarkssettingspage.cpp
bookmarkssidebarpage.cpp
detailsviewsettingspage.cpp dolphin.cpp
dolphincontextmenu.cpp dolphindetailsview.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index edb47b2..6c17e39 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 = bookmartdeselector.cpp bookmarkssettingspage.cpp \
+d3lphin_SOURCES = bookmarkselector.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 = bookmartdeselector.cpp bookmarkssettingspage.cpp \
# these are the headers for your project
-noinst_HEADERS = bookmartdeselector.h bookmarkssettingspage.h \
+noinst_HEADERS = bookmarkselector.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/bookmartdeselector.cpp b/src/bookmarkselector.cpp
index 6de63b3..8ea1505 100644
--- a/src/bookmartdeselector.cpp
+++ b/src/bookmarkselector.cpp
@@ -28,7 +28,7 @@
#include <tdeglobalsettings.h>
#include <kbookmarkmanager.h>
-#include "bookmartdeselector.h"
+#include "bookmarkselector.h"
#include "dolphinsettings.h"
#include "dolphinview.h"
#include "dolphin.h"
@@ -179,5 +179,5 @@ void BookmarkSelector::slotBookmarkActivated(int index)
emit bookmarkActivated(index);
}
-#include "bookmartdeselector.moc"
+#include "bookmarkselector.moc"
diff --git a/src/bookmartdeselector.h b/src/bookmarkselector.h
index 74d1138..74d1138 100644
--- a/src/bookmartdeselector.h
+++ b/src/bookmarkselector.h
diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp
index 5e61955..6a3688c 100644
--- a/src/urlnavigator.cpp
+++ b/src/urlnavigator.cpp
@@ -42,7 +42,7 @@
#include "dolphin.h"
#include "dolphinsettings.h"
-#include "bookmartdeselector.h"
+#include "bookmarkselector.h"
#include "dolphinstatusbar.h"
#include "urlnavigatorbutton.h"
#include "dolphinview.h"