Merge remote-tracking branch 'origin/master' into frameworks

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

diff --git a/src/views/dolphinremoteencoding.h b/src/views/dolphinremoteencoding.h
index 54499f78b175db15ce1620d985e7b2d7225e013f..0351abad7f468fc90c7b2a51a06e216295df0baf 100644 (file)
--- a/src/views/dolphinremoteencoding.h
+++ b/src/views/dolphinremoteencoding.h
@@ -21,8 +21,8 @@
 #define DOLPHINREMOTEENCODING_H
 
 #include <QStringList>
-#include <QtGui/QAction>
-#include <kurl.h>
+#include <QAction>
+#include <QUrl>
 #include "libdolphin_export.h"
 
 
@@ -30,7 +30,7 @@ class KActionMenu;
 class DolphinViewActionHandler;
 
 /**
- * @brief Allows to chnage character encoding for remote urls like ftp.
+ * @brief Allows to change character encoding for remote urls like ftp.
  *
  * When browsing remote url, its possible to change encoding from Tools Menu.
  */
@@ -47,10 +47,10 @@ public Q_SLOTS:
   void slotItemSelected(QAction* action);
   void slotReload();
   void slotDefault();
-  
+
 private Q_SLOTS:
   void slotAboutToShow();
-  
+
 private:
   void updateView();
   void loadSettings();
@@ -59,7 +59,7 @@ private:
 
   KActionMenu* m_menu;
   QStringList m_encodingDescriptions;
-  KUrl m_currentURL;
+  QUrl m_currentURL;
   DolphinViewActionHandler* m_actionHandler;
 
   bool m_loaded;