Merge branch 'master' into frameworks

[dolphin.git] / src / views / dolphinremoteencoding.h

diff --git a/src/views/dolphinremoteencoding.h b/src/views/dolphinremoteencoding.h
index 8dec518d0560142c98de1f8fa252497b4cdee9f5..28ff52cb3ff7ab3c8d2a29af11896611cf9318d2 100644 (file)
--- a/src/views/dolphinremoteencoding.h
+++ b/src/views/dolphinremoteencoding.h
@@ -22,8 +22,8 @@
 
 #include <QStringList>
 #include <QAction>
-#include <KUrl>
-#include "libdolphin_export.h"
+#include <QUrl>
+#include "dolphin_export.h"
 
 
 class KActionMenu;
@@ -35,7 +35,7 @@ class DolphinViewActionHandler;
  * When browsing remote url, its possible to change encoding from Tools Menu.
  */
 
-class LIBDOLPHINPRIVATE_EXPORT DolphinRemoteEncoding: public QObject
+class DOLPHIN_EXPORT DolphinRemoteEncoding: public QObject
 {
   Q_OBJECT
 public:
@@ -59,7 +59,7 @@ private:
 
   KActionMenu* m_menu;
   QStringList m_encodingDescriptions;
-  KUrl m_currentURL;
+  QUrl m_currentURL;
   DolphinViewActionHandler* m_actionHandler;
 
   bool m_loaded;