Merge branch 'master' into frameworks

[dolphin.git] / src / views / viewproperties.cpp

diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp
index 018f42d2b65c70ed8eb1c46017cfcb64c7e028c1..05c9935858aeecba142a7224ae16944de0900b92 100644 (file)
--- a/src/views/viewproperties.cpp
+++ b/src/views/viewproperties.cpp
@@ -24,10 +24,8 @@
 #include "dolphin_generalsettings.h"
 
 #include <QUrl>
 #include "dolphin_generalsettings.h"
 
 #include <QUrl>

-#include <KDebug>
-#include <KGlobal>
+#include "dolphindebug.h"

 
 

-#include <KComponentData>

 #include <QCryptographicHash>
 #include <QDate>
 #include <QFile>
 #include <QCryptographicHash>
 #include <QDate>
 #include <QFile>


@@ -98,7 +96,7 @@ ViewProperties::ViewProperties(const QUrl& url) :
     if (useDefaultProps) {
         if (useDetailsViewWithPath) {
             setViewMode(DolphinView::DetailsView);
     if (useDefaultProps) {
         if (useDetailsViewWithPath) {
             setViewMode(DolphinView::DetailsView);

-            setVisibleRoles(QList<QByteArray>() << "path");
+            setVisibleRoles({"path"});

         } else {
             // The global view-properties act as default for directories without
             // any view-property configuration. Constructing a ViewProperties 
         } else {
             // The global view-properties act as default for directories without
             // any view-property configuration. Constructing a ViewProperties 


@@ -286,8 +284,7 @@ QList<QByteArray> ViewProperties::visibleRoles() const
     // by "CustomizedDetails"), also a details-view with no additional information
     // is accepted.
 
     // by "CustomizedDetails"), also a details-view with no additional information
     // is accepted.
 

-    QList<QByteArray> roles;
-    roles.append("text");
+    QList<QByteArray> roles{"text"};

 
     // Iterate through all stored keys and append all roles that match to
     // the current view mode.
 
     // Iterate through all stored keys and append all roles that match to
     // the current view mode.


@@ -362,11 +359,11 @@ void ViewProperties::update()
 
 void ViewProperties::save()
 {
 
 void ViewProperties::save()
 {

-    kDebug() << "Saving view-properties to" << m_filePath;
+    qCDebug(DolphinDebug) << "Saving view-properties to" << m_filePath;

     QDir dir;
     dir.mkpath(m_filePath);
     m_node->setVersion(CurrentViewPropertiesVersion);
     QDir dir;
     dir.mkpath(m_filePath);
     m_node->setVersion(CurrentViewPropertiesVersion);

-    m_node->writeConfig();
+    m_node->save();

     m_changedProps = false;
 }
 
     m_changedProps = false;
 }
 


@@ -379,7 +376,6 @@ bool ViewProperties::exist() const
 QString ViewProperties::destinationDir(const QString& subDir) const
 {
     QString path = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
 QString ViewProperties::destinationDir(const QString& subDir) const
 {
     QString path = QStandardPaths::writableLocation(QStandardPaths::DataLocation);

-    path.append(KGlobal::mainComponent().componentName());

     path.append("/view_properties/").append(subDir);
     return path;
 }
     path.append("/view_properties/").append(subDir);
     return path;
 }


@@ -392,7 +388,7 @@ QString ViewProperties::viewModePrefix() const
     case DolphinView::IconsView:   prefix = "Icons_"; break;
     case DolphinView::CompactView: prefix = "Compact_"; break;
     case DolphinView::DetailsView: prefix = "Details_"; break;
     case DolphinView::IconsView:   prefix = "Icons_"; break;
     case DolphinView::CompactView: prefix = "Compact_"; break;
     case DolphinView::DetailsView: prefix = "Details_"; break;

-    default: kWarning() << "Unknown view-mode of the view properties";
+    default: qCWarning(DolphinDebug) << "Unknown view-mode of the view properties";

     }
 
     return prefix;
     }
 
     return prefix;