From 6af2fc9af52731ac3630c9019c0bfebd877666b9 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 2 Sep 2010 17:15:20 +0200 Subject: 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 --- src/urlbar/urlresolver.cpp | 1 + src/urlbar/urlresolver.h | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'src/urlbar') 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 #include + 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; -- cgit v1.2.1