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/findbar.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/findbar.h')
-rw-r--r-- | src/findbar.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/findbar.h b/src/findbar.h index 15a82e1e..a8a78970 100644 --- a/src/findbar.h +++ b/src/findbar.h @@ -22,14 +22,20 @@ #ifndef FINDBAR_H #define FINDBAR_H + // KDE Includes #include <KLineEdit> #include <KToolBar> -#include <KXmlGuiWindow> // Qt Includes -#include <QtCore> -#include <QtGui> +#include <QtGui/QWidget> +#include <QtGui/QCheckBox> +#include <QtGui/QKeyEvent> + +// Forward Declarations +class KXmlGuiWindow; +class QKeyEvent; +class QString; class FindBar : public QWidget @@ -57,5 +63,5 @@ private: QCheckBox *m_matchCase; }; - #endif + |