Convert hard coded shortcuts to standard keys

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 2b829f4e09c7d4e398e16932454703084916802f..dc9b4538fcd13d56d5d3c4d6818f7f69c3d64e69 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -20,6 +20,7 @@
 #include "dolphinviewcontainer.h"
 
 #include "dolphin_generalsettings.h"
 #include "dolphinviewcontainer.h"
 
 #include "dolphin_generalsettings.h"

+#include "dolphinplacesmodelsingleton.h"

 #include "dolphindebug.h"
 #include "filterbar/filterbar.h"
 #include "global.h"
 #include "dolphindebug.h"
 #include "filterbar/filterbar.h"
 #include "global.h"


@@ -30,7 +31,6 @@
 #include "views/viewproperties.h"
 
 #include <KFileItemActions>
 #include "views/viewproperties.h"
 
 #include <KFileItemActions>

-#include <KFilePlacesModel>

 #include <KIO/PreviewJob>
 #include <KLocalizedString>
 #include <KMessageWidget>
 #include <KIO/PreviewJob>
 #include <KLocalizedString>
 #include <KMessageWidget>


@@ -77,7 +77,7 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
     navigatorLayout->setSpacing(0);
     navigatorLayout->setMargin(0);
 
     navigatorLayout->setSpacing(0);
     navigatorLayout->setMargin(0);
 

-    m_urlNavigator = new KUrlNavigator(new KFilePlacesModel(this), url, this);
+    m_urlNavigator = new KUrlNavigator(DolphinPlacesModelSingleton::instance().placesModel(), url, this);

     connect(m_urlNavigator, &KUrlNavigator::activated,
             this, &DolphinViewContainer::activate);
     connect(m_urlNavigator->editor(), &KUrlComboBox::completionModeChanged,
     connect(m_urlNavigator, &KUrlNavigator::activated,
             this, &DolphinViewContainer::activate);
     connect(m_urlNavigator->editor(), &KUrlComboBox::completionModeChanged,