diff options
| author | Cedric Bellegarde <gnumdk@gmail.com> | 2011-10-17 08:34:17 +0200 |
|---|---|---|
| committer | Cedric Bellegarde <gnumdk@gmail.com> | 2011-10-17 08:34:17 +0200 |
| commit | 2b2adbcfcb6ed81edb2e4646735285935e61c624 (patch) | |
| tree | 52f983051b7c81e06c00ab20d64471c429320b1d /src/urlbar/urlbar.cpp | |
| parent | Update menu bar tools (useful for people using plasma-menubar/oxygen-appmenu) (diff) | |
| parent | rekonq 0.8.50: First development version on the road to 0.9... (diff) | |
| download | rekonq-2b2adbcfcb6ed81edb2e4646735285935e61c624.tar.xz | |
Merge branch 'master' of git.kde.org:rekonq
Diffstat (limited to 'src/urlbar/urlbar.cpp')
| -rw-r--r-- | src/urlbar/urlbar.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp index 0515f58b..7b77f3db 100644 --- a/src/urlbar/urlbar.cpp +++ b/src/urlbar/urlbar.cpp @@ -294,7 +294,7 @@ void UrlBar::keyPressEvent(QKeyEvent *event) { clearFocus(); if (text() != rApp->mainWindow()->currentTab()->view()->url().toString() - && !rApp->mainWindow()->currentTab()->view()->url().toString().startsWith("about")) + && !rApp->mainWindow()->currentTab()->view()->url().toString().startsWith(QL1S("about"))) setText(rApp->mainWindow()->currentTab()->view()->url().toString()); event->accept(); } @@ -518,10 +518,20 @@ void UrlBar::contextMenuEvent(QContextMenuEvent* event) bool UrlBar::isValidURL(QString url) { bool isValid = false; - if (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("ftp://")) + if (url.startsWith(QL1S("http://")) + || url.startsWith(QL1S("https://")) + || url.startsWith(QL1S("ftp://")) + ) url = url.remove(QRegExp("(http|https|ftp)://")); - if (url.contains('.') && url.indexOf('.') > 0 && url.indexOf('.') < url.length() && !url.trimmed().contains(" ") && QUrl::fromUserInput(url).isValid()) + + if (url.contains(QL1C('.')) + && url.indexOf(QL1C('.')) > 0 + && url.indexOf(QL1C('.')) < url.length() + && !url.trimmed().contains(QL1C(' ')) + && QUrl::fromUserInput(url).isValid() + ) isValid = true; + return isValid; } |