X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e1816544942d72f5228555adcd13a4ada0a712ed..85bc196887fbed01187e3830cd28c2500cb01cb2:/src/dolphinsettings.cpp diff --git a/src/dolphinsettings.cpp b/src/dolphinsettings.cpp index 1b7bd9d59..3d187d40d 100644 --- a/src/dolphinsettings.cpp +++ b/src/dolphinsettings.cpp @@ -20,22 +20,15 @@ #include "dolphinsettings.h" -#include -#include - #include #include #include -#include -#include #include #include -#include "generalsettings.h" -#include "iconsmodesettings.h" -#include "detailsmodesettings.h" - -#include +#include "dolphin_generalsettings.h" +#include "dolphin_iconsmodesettings.h" +#include "dolphin_detailsmodesettings.h" DolphinSettings& DolphinSettings::instance() { @@ -48,18 +41,7 @@ DolphinSettings& DolphinSettings::instance() KBookmark DolphinSettings::bookmark(int index) const { - int i = 0; - KBookmarkGroup root = bookmarkManager()->root(); - KBookmark bookmark = root.first(); - while (!bookmark.isNull()) { - if (i == index) { - return bookmark; - } - ++i; - bookmark = root.next(bookmark); - } - - return KBookmark(); + return bookmarkManager()->findByAddress( QString('/')+QString::number(index) ); } KBookmarkManager* DolphinSettings::bookmarkManager() const