From 3c77ffe832a00f405e474f11da7b39d37a410a5b Mon Sep 17 00:00:00 2001
From: Peter Penz <peter.penz19@gmail.com>
Date: Sun, 6 Nov 2011 11:58:48 +0100
Subject: Delete obsolete class DolphinSettings

---
 src/panels/folders/folderspanel.cpp                | 5 ++---
 src/panels/information/informationpanelcontent.cpp | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/panels')

diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index 340e79d30..76a4b4e08 100644
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -19,13 +19,11 @@
 
 #include "folderspanel.h"
 
-#include "settings/dolphinsettings.h"
 #include "dolphin_folderspanelsettings.h"
 #include "dolphin_generalsettings.h"
 #include "paneltreeview.h"
 #include "treeviewcontextmenu.h"
 
-#include <KFilePlacesModel>
 #include <KDirLister>
 #include <KFileItem>
 #include <konq_operations.h>
@@ -95,7 +93,8 @@ bool FoldersPanel::autoScrolling() const
 
 void FoldersPanel::rename(const KFileItem& item)
 {
-    if (DolphinSettings::instance().generalSettings()->renameInline()) {
+    // TODO: Inline renaming is not supported anymore in Dolphin 2.0
+    if (false /* GeneralSettings::renameInline() */) {
         //const QModelIndex dirIndex = m_dolphinModel->indexForItem(item);
         //const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
         //m_treeView->edit(proxyIndex);
diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 101473172..7de6052e0 100644
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -50,9 +50,9 @@
 
 #include "dolphin_informationpanelsettings.h"
 #include "filemetadataconfigurationdialog.h"
-#include "settings/dolphinsettings.h"
 #include "phononwidget.h"
 #include "pixmapviewer.h"
+#include "views/dolphinplacesmodel.h"
 
 InformationPanelContent::InformationPanelContent(QWidget* parent) :
     QWidget(parent),
@@ -352,8 +352,8 @@ void InformationPanelContent::refreshMetaData()
 
 bool InformationPanelContent::applyPlace(const KUrl& url)
 {
-    KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
-    int count = placesModel->rowCount();
+    KFilePlacesModel* placesModel = DolphinPlacesModel::instance();
+    const int count = placesModel->rowCount();
 
     for (int i = 0; i < count; ++i) {
         QModelIndex index = placesModel->index(i, 0);
-- 
cgit v1.3