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

[dolphin.git] / src / settings / dolphinsettingsdialog.cpp

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 533a7f0890181ce5478de9017041c4adb2c70cf7..d9240d97c347b57df46b8a3abd22904f8ea8ec23 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -30,14 +30,13 @@
 #include "viewmodes/viewsettingspage.h"
 #include "trash/trashsettingspage.h"
 
-#include <KLocale>
-#include <KMessageBox>
+#include <KLocalizedString>
 #include <QIcon>
 
 #include <QPushButton>
 #include <QDialogButtonBox>
 
-DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& url, QWidget* parent) :
+DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
     KPageDialog(parent),
     m_pages()