Merge branch 'frameworks'

1 files changed, 6 insertions, 15 deletions

diff --git a/src/views/viewproperties.h b/src/views/viewproperties.h
index 69b507f1b..dc118e2d7 100644
--- a/src/views/viewproperties.h
+++ b/src/views/viewproperties.h
@@ -22,8 +22,8 @@
 #define VIEWPROPERTIES_H
 
 #include <views/dolphinview.h>
-#include <KUrl>
-#include <libdolphin_export.h>
+#include <QUrl>
+#include "dolphin_export.h"
 
 class ViewPropertySettings;
 /**
@@ -35,7 +35,7 @@ class ViewPropertySettings;
  * just construct an instance by passing the path of the directory:
  *
  * \code
- * ViewProperties props(KUrl("/home/peter/Documents"));
+ * ViewProperties props(QUrl::fromLocalFile("/home/peter/Documents"));
  * const DolphinView::Mode mode = props.viewMode();
  * const bool hiddenFilesShown = props.hiddenFilesShown();
  * \endcode
@@ -47,10 +47,10 @@ class ViewPropertySettings;
  * (see GeneralSettings::globalViewMode()), the values from the global .directory file
  * are used for initialization.
  */
-class LIBDOLPHINPRIVATE_EXPORT ViewProperties
+class DOLPHIN_EXPORT ViewProperties
 {
 public:
-    explicit ViewProperties(const KUrl& url);
+    explicit ViewProperties(const QUrl& url);
     virtual ~ViewProperties();
 
     void setViewMode(DolphinView::Mode mode);
@@ -162,16 +162,7 @@ private:
      * @return A hash-value for an URL that can be used as directory name.
      *         Is used to be able to remember view-properties for long baloo-URLs.
      */
-    static QString directoryHashForUrl(const KUrl& url);
-
-    /**
-     * Returns the URL of the directory, where the mirrored view properties
-     * are stored into. Mirrored view properties are used if:
-     * - there is no write access for storing the view properties into
-     *   the original directory
-     * - for non local directories
-     */
-    static KUrl mirroredDirectory();
+    static QString directoryHashForUrl(const QUrl &url);
 
     Q_DISABLE_COPY(ViewProperties)