X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/3316903fe8a9a3c95dad18d19d795cdb55208473..ad01ddac1a104b8f372a98db84f123fbba65e2da:/src/viewproperties.cpp

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index fd4dfd8dd..cf675f30a 100644
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -31,7 +31,7 @@
 
 #include "viewproperties.h"
 #include "dolphinsettings.h"
-#include "generalsettings.h"
+#include "dolphin_generalsettings.h"
 
 #define FILE_NAME "/.directory"
 
@@ -70,8 +70,6 @@ ViewProperties::ViewProperties(const KUrl& url) :
     const QString file(m_filepath + FILE_NAME);
     m_node = new ViewPropertySettings(KSharedConfig::openConfig(file));
 
-    kDebug() << "------------------ global timestamp: " << settings->viewPropsTimestamp() << endl;
-
     const bool useDefaultProps = !useGlobalViewProps &&
                                  (!QFileInfo(file).exists() ||
                                   (m_node->timestamp() < settings->viewPropsTimestamp()));
@@ -197,19 +195,16 @@ void ViewProperties::save()
     m_changedProps = false;
 }
 
-QString ViewProperties::destinationDir(const QString& subDir) const
+KUrl ViewProperties::mirroredDirectory()
 {
     QString basePath = KGlobal::mainComponent().componentName();
-    basePath.append("/view_properties/").append(subDir);
-    return KStandardDirs::locateLocal("data", basePath);
+    basePath.append("/view_properties/");
+    return KUrl(KStandardDirs::locateLocal("data", basePath));
 }
 
-ViewProperties::ViewProperties(const ViewProperties& /*props*/)
-{
-    assert(false);
-}
-
-ViewProperties& ViewProperties::operator = (const ViewProperties& /*props*/)
+QString ViewProperties::destinationDir(const QString& subDir) const
 {
-    assert(false);
+    QString basePath = KGlobal::mainComponent().componentName();
+    basePath.append("/view_properties/").append(subDir);
+    return KStandardDirs::locateLocal("data", basePath);
 }