From c20f14478a527ec3a4169396d2c1472a8f4020af Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Tue, 21 Nov 2006 21:10:33 +0000 Subject: compile++ Welcome to Dolphin! Trying to help a bit with the porting. If I did something wrong, feel free to blame me. :-) CCMAIL: peter.penz@gmx.at svn path=/trunk/playground/utils/dolphin/; revision=606802 --- src/viewproperties.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/viewproperties.cpp') diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp index 52129bd80..a3a8ec46b 100644 --- a/src/viewproperties.cpp +++ b/src/viewproperties.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include "viewproperties.h" @@ -40,7 +41,7 @@ ViewProperties::ViewProperties(KUrl url) : m_subDirValidityHidden(false), m_node(0) { - url.cleanPath(true); + url.cleanPath(); m_filepath = url.path(); if ((m_filepath.length() < 1) || (m_filepath.at(0) != QChar('/'))) { @@ -58,14 +59,14 @@ ViewProperties::ViewProperties(KUrl url) : if (!info.isWritable()) { QString basePath = KGlobal::instance()->instanceName(); basePath.append("/view_properties/local"); - rootDir = locateLocal("data", basePath); + rootDir = KStandardDirs::locateLocal("data", basePath); m_filepath = rootDir + m_filepath; } } else { QString basePath = KGlobal::instance()->instanceName(); basePath.append("/view_properties/remote/").append(url.host()); - rootDir = locateLocal("data", basePath); + rootDir = KStandardDirs::locateLocal("data", basePath); m_filepath = rootDir + m_filepath; } @@ -86,7 +87,8 @@ ViewProperties::ViewProperties(KUrl url) : (parentNode.timestamp() > m_node->timestamp()); if (inheritProps) { - *m_node = parentNode; + delete m_node; + m_node = new ViewPropertySettings(KSharedConfig::openConfig(dir.path() + FILE_NAME)); break; } } -- cgit v1.3