author | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
---|---|---|
committer | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
commit | 87a9d6badcf518ffd14559ef886ff7729b63b73b (patch) (unidiff) | |
tree | 05af57bcebb8a124c2561336e4ff3dfdd52aeccb /core/pim/osearch/mainwindow.h | |
parent | 9ce566fd5b280622670cf7b0e158f9d9c54e6e9a (diff) | |
download | opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.zip opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.tar.gz opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.tar.bz2 |
resolved merge conflict
Diffstat (limited to 'core/pim/osearch/mainwindow.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/osearch/mainwindow.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/core/pim/osearch/mainwindow.h b/core/pim/osearch/mainwindow.h index 1f5c4bb..75054f0 100644 --- a/core/pim/osearch/mainwindow.h +++ b/core/pim/osearch/mainwindow.h | |||
@@ -7,14 +7,19 @@ | |||
7 | * * | 7 | * * |
8 | ***************************************************************************/ | 8 | ***************************************************************************/ |
9 | 9 | ||
10 | // (c) 2002 Patrick S. Vogt <tille@handhelds.org> | 10 | // (c) 2002-2003 Patrick S. Vogt <tille@handhelds.org> |
11 | 11 | ||
12 | #ifndef MAINWINDOW_H | 12 | #ifndef MAINWINDOW_H |
13 | #define MAINWINDOW_H | 13 | #define MAINWINDOW_H |
14 | 14 | ||
15 | #include <qmainwindow.h> | 15 | #include <qmainwindow.h> |
16 | #include <qdialog.h> | ||
17 | #include <qaction.h> | ||
16 | #include <qlist.h> | 18 | #include <qlist.h> |
19 | |||
17 | #include <qmap.h> | 20 | #include <qmap.h> |
21 | #include <qtimer.h> | ||
22 | #include <qpopupmenu.h> | ||
18 | 23 | ||
19 | class QAction; | 24 | class QAction; |
20 | class QPEToolBar; | 25 | class QPEToolBar; |
@@ -26,8 +31,11 @@ class OListView; | |||
26 | class OListViewItem; | 31 | class OListViewItem; |
27 | class QListViewItem; | 32 | class QListViewItem; |
28 | class QPopupMenu; | 33 | class QPopupMenu; |
29 | class QSignalMapper; | ||
30 | class QTimer; | 34 | class QTimer; |
35 | |||
36 | class QSignalMapper; | ||
37 | class QButton; | ||
38 | |||
31 | class SearchGroup; | 39 | class SearchGroup; |
32 | 40 | ||
33 | class MainWindow : public QMainWindow | 41 | class MainWindow : public QMainWindow |
@@ -38,7 +46,7 @@ class MainWindow : public QMainWindow | |||
38 | public: | 46 | public: |
39 | MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); | 47 | MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); |
40 | ~MainWindow(); | 48 | ~MainWindow(); |
41 | 49 | static QString appName() { return QString::fromLatin1("osearch"); } | |
42 | 50 | ||
43 | public slots: | 51 | public slots: |
44 | void setCurrent(QListViewItem*); | 52 | void setCurrent(QListViewItem*); |