diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2010-09-02 17:15:20 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2010-09-02 17:15:20 +0200 |
commit | 6af2fc9af52731ac3630c9019c0bfebd877666b9 (patch) | |
tree | 4bac4a651bd6bbd612f1e2174a193d8920d75913 /src/urlbar | |
parent | Merge commit 'refs/merge-requests/196' of git://gitorious.org/rekonq/mainline... (diff) | |
download | rekonq-6af2fc9af52731ac3630c9019c0bfebd877666b9.tar.xz |
Code Review.
General clean up
let member variables have better names, starting with _ and the needed get functions
signals/slots --> Q_SIGNALS/Q_SLOTS
moc headers
Diffstat (limited to 'src/urlbar')
-rw-r--r-- | src/urlbar/urlresolver.cpp | 1 | ||||
-rw-r--r-- | src/urlbar/urlresolver.h | 18 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp index dfb3289f..7f6a7f4f 100644 --- a/src/urlbar/urlresolver.cpp +++ b/src/urlbar/urlresolver.cpp @@ -26,6 +26,7 @@ // Self Includes #include "urlresolver.h" +#include "urlresolver.moc" // Local Includes #include "application.h" diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h index 700fd460..f16c44f8 100644 --- a/src/urlbar/urlresolver.h +++ b/src/urlbar/urlresolver.h @@ -40,6 +40,7 @@ #include <QList> #include <QStringList> + class UrlSearchItem { public: @@ -123,14 +124,6 @@ Q_SIGNALS: void suggestionsReady(const UrlSearchList &, const QString &); private: - QString _typedString; - - UrlSearchList _webSearches; - UrlSearchList _qurlFromUserInput; - UrlSearchList _history; - UrlSearchList _bookmarks; - UrlSearchList _suggestions; - void computeWebSearches(); void computeHistory(); void computeQurlFromUserInput(); @@ -139,6 +132,15 @@ private: UrlSearchItem privilegedItem(UrlSearchList* list); UrlSearchList orderLists(); + + QString _typedString; + + UrlSearchList _webSearches; + UrlSearchList _qurlFromUserInput; + UrlSearchList _history; + UrlSearchList _bookmarks; + UrlSearchList _suggestions; + static QRegExp _browseRegexp; static QRegExp _searchEnginesRegexp; |