Further cleanup to prepare the move.

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index bb84d32c01fe34c21152439cb6b27d1d93e77bbf..1aa7e0ff8055f85fe95f92528fd225d484a90dbf 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -31,6 +31,7 @@
 
 #include <kdirmodel.h>
 #include <kfileitemdelegate.h>
 
 #include <kdirmodel.h>
 #include <kfileitemdelegate.h>

+#include <kfileplacesmodel.h>

 #include <klocale.h>
 #include <kiconeffect.h>
 #include <kio/netaccess.h>
 #include <klocale.h>
 #include <kiconeffect.h>
 #include <kio/netaccess.h>


@@ -52,7 +53,7 @@
 #include "dolphincontextmenu.h"
 #include "filterbar.h"
 #include "renamedialog.h"
 #include "dolphincontextmenu.h"
 #include "filterbar.h"
 #include "renamedialog.h"

-#include "urlnavigator.h"
+#include "kurlnavigator.h"

 #include "viewproperties.h"
 #include "dolphinsettings.h"
 #include "dolphin_generalsettings.h"
 #include "viewproperties.h"
 #include "dolphinsettings.h"
 #include "dolphin_generalsettings.h"


@@ -96,7 +97,7 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
     connect(clipboard, SIGNAL(dataChanged()),
             this, SLOT(updateCutItems()));
 
     connect(clipboard, SIGNAL(dataChanged()),
             this, SLOT(updateCutItems()));
 

-    m_urlNavigator = new UrlNavigator(DolphinSettings::instance().bookmarkManager(), url, this);
+    m_urlNavigator = new KUrlNavigator(new KFilePlacesModel(this), url, this);

     m_urlNavigator->setUrlEditable(DolphinSettings::instance().generalSettings()->editableUrl());
     m_urlNavigator->setHomeUrl(DolphinSettings::instance().generalSettings()->homeUrl());
     m_urlNavigator->setShowHiddenFiles(showHiddenFiles);
     m_urlNavigator->setUrlEditable(DolphinSettings::instance().generalSettings()->editableUrl());
     m_urlNavigator->setHomeUrl(DolphinSettings::instance().generalSettings()->homeUrl());
     m_urlNavigator->setShowHiddenFiles(showHiddenFiles);