move the QT3_SUPPORT definition only where it's needed

[dolphin.git] / src / viewproperties.cpp

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index fd4dfd8dd5ba1204513dabe132fece8062723149..5d652281a14c8e9c1f55ef4a50325a71c7bbc226 100644 (file)
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -22,6 +22,7 @@
 
 #include <QDateTime>
 #include <QFile>
+#include <QFileInfo>
 
 #include <kcomponentdata.h>
 #include <klocale.h>
@@ -31,7 +32,7 @@
 
 #include "viewproperties.h"
 #include "dolphinsettings.h"
-#include "generalsettings.h"
+#include "dolphin_generalsettings.h"
 
 #define FILE_NAME "/.directory"
 
@@ -70,8 +71,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()));
@@ -165,6 +164,20 @@ Qt::SortOrder ViewProperties::sortOrder() const
     return static_cast<Qt::SortOrder>(m_node->sortOrder());
 }
 
+void ViewProperties::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info)
+{
+    if (m_node->additionalInfo() != info) {
+        m_node->setAdditionalInfo(info);
+        updateTimeStamp();
+    }
+}
+
+KFileItemDelegate::AdditionalInformation ViewProperties::additionalInfo() const
+{
+    return static_cast<KFileItemDelegate::AdditionalInformation>(m_node->additionalInfo());
+}
+
+
 void ViewProperties::setDirProperties(const ViewProperties& props)
 {
     setViewMode(props.viewMode());
@@ -172,6 +185,7 @@ void ViewProperties::setDirProperties(const ViewProperties& props)
     setShowHiddenFiles(props.showHiddenFiles());
     setSorting(props.sorting());
     setSortOrder(props.sortOrder());
+    setAdditionalInfo(props.additionalInfo());
 }
 
 void ViewProperties::setAutoSaveEnabled(bool autoSave)
@@ -197,19 +211,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);
-}
-
-ViewProperties::ViewProperties(const ViewProperties& /*props*/)
-{
-    assert(false);
+    basePath.append("/view_properties/");
+    return KUrl(KStandardDirs::locateLocal("data", basePath));
 }
 
-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);
 }