The icons view and details view don't use hardcoded (test-) values anymore, instead...

[dolphin.git] / src / urlnavigator.cpp

diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp
index 4ce0fc00937da06f75ad606ce723972c502fba17..1ac92474ea6046343448f5caeea581dc31db7883 100644 (file)
--- a/src/urlnavigator.cpp
+++ b/src/urlnavigator.cpp
@@ -23,7 +23,7 @@
 
 #include "bookmarkselector.h"
 #include "dolphinsettings.h"
-#include "generalsettings.h"
+#include "dolphin_generalsettings.h"
 #include "protocolcombo.h"
 #include "urlnavigatorbutton.h"
 
@@ -343,7 +343,7 @@ void UrlNavigator::slotReturnPressed(const QString& text)
 
     KUrl typedUrl(text);
     if (typedUrl.hasPass()) {
-        typedUrl.setPass(QString::null);
+        typedUrl.setPass(QString());
     }
 
     QStringList urls = m_pathBox->urls();
@@ -567,7 +567,7 @@ void UrlNavigator::updateContent()
                 QString hostText = url().host();
 
                 if (!url().user().isEmpty()) {
-                    hostText = url().user() + "@" + hostText;
+                    hostText = url().user() + '@' + hostText;
                 }
 
                 if (!m_host) {