diff options
author | adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-05-06 23:02:43 +0000 |
---|---|---|
committer | adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-05-06 23:02:43 +0000 |
commit | 601ebdf6c4faea76016cf0d87d50abc260ca1569 (patch) | |
tree | cf601630c933447f2a369f6245f9a04b9a46b08a /src/mainview.h | |
parent | Typographical and grammar corrections (diff) | |
parent | EBN Krazy fixes. 1st round.. (diff) | |
download | rekonq-601ebdf6c4faea76016cf0d87d50abc260ca1569.tar.xz |
Fixing conflicts merging master
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@964593 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/mainview.h')
-rw-r--r-- | src/mainview.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mainview.h b/src/mainview.h index 5696c4c2..d3d4948d 100644 --- a/src/mainview.h +++ b/src/mainview.h @@ -32,14 +32,17 @@ #include <KTabWidget> // Forward Declarations +class QLineEdit; class QUrl; class QWebFrame; class QLabel; class KAction; +class KCompletion; class KMenu; class KUrl; +class HistoryCompletionModel; class StackedUrlBar; class TabBar; class UrlBar; @@ -193,3 +196,4 @@ private: }; #endif + |