author | mickeyl <mickeyl> | 2003-12-07 13:51:01 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-07 13:51:01 (UTC) |
commit | c648101ca50a9782911b58b5158b31e1d0427ab3 (patch) (unidiff) | |
tree | 0fcf5801e23d95e071c7f1b62230c5b15c6256ea /noncore/apps/opie-reader/QTReaderApp.h | |
parent | 2d793ca674944241480f6939814e3f61d0a0e0fb (diff) | |
download | opie-c648101ca50a9782911b58b5158b31e1d0427ab3.zip opie-c648101ca50a9782911b58b5158b31e1d0427ab3.tar.gz opie-c648101ca50a9782911b58b5158b31e1d0427ab3.tar.bz2 |
s/QPEMenuBar/QMenuBar:
- remove usage of deprecated classses
- makes it easier to migrate to OMenuBar in the future
Diffstat (limited to 'noncore/apps/opie-reader/QTReaderApp.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-reader/QTReaderApp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/apps/opie-reader/QTReaderApp.h b/noncore/apps/opie-reader/QTReaderApp.h index 2765d47..86c14b1 100644 --- a/noncore/apps/opie-reader/QTReaderApp.h +++ b/noncore/apps/opie-reader/QTReaderApp.h | |||
@@ -36,25 +36,25 @@ | |||
36 | #include <qmap.h> | 36 | #include <qmap.h> |
37 | #include <qlineedit.h> | 37 | #include <qlineedit.h> |
38 | #include <qstack.h> | 38 | #include <qstack.h> |
39 | #include <qlistbox.h> | 39 | #include <qlistbox.h> |
40 | //#include "Queue.h" | 40 | //#include "Queue.h" |
41 | 41 | ||
42 | class QWidgetStack; | 42 | class QWidgetStack; |
43 | class QToolButton; | 43 | class QToolButton; |
44 | class QPopupMenu; | 44 | class QPopupMenu; |
45 | class QToolBar; | 45 | class QToolBar; |
46 | #ifdef USEQPE | 46 | #ifdef USEQPE |
47 | class QPEToolBar; | 47 | class QPEToolBar; |
48 | class QPEMenuBar; | 48 | class QMenuBar; |
49 | #endif | 49 | #endif |
50 | class CBkmkSelector; | 50 | class CBkmkSelector; |
51 | class QProgressBar; | 51 | class QProgressBar; |
52 | class QAction; | 52 | class QAction; |
53 | class CAnnoEdit; | 53 | class CAnnoEdit; |
54 | class QFloatBar; | 54 | class QFloatBar; |
55 | class CDrawBuffer; | 55 | class CDrawBuffer; |
56 | class QTReader; | 56 | class QTReader; |
57 | class QImage; | 57 | class QImage; |
58 | class Config; | 58 | class Config; |
59 | 59 | ||
60 | enum ActionTypes | 60 | enum ActionTypes |
@@ -374,25 +374,25 @@ private slots: | |||
374 | #ifdef __ISEARCH | 374 | #ifdef __ISEARCH |
375 | QStack<searchrecord>* searchStack; | 375 | QStack<searchrecord>* searchStack; |
376 | bool dosearch(size_t start, CDrawBuffer& test, const QString& arg); | 376 | bool dosearch(size_t start, CDrawBuffer& test, const QString& arg); |
377 | #else | 377 | #else |
378 | bool dosearch(size_t start, CDrawBuffer& test, const QRegExp& arg); | 378 | bool dosearch(size_t start, CDrawBuffer& test, const QRegExp& arg); |
379 | #endif | 379 | #endif |
380 | QWidgetStack *editorStack; | 380 | QWidgetStack *editorStack; |
381 | QTReader* reader; | 381 | QTReader* reader; |
382 | QComboBox* m_fontSelector; | 382 | QComboBox* m_fontSelector; |
383 | // QPEToolBar /* *menu,*/ *fileBar; | 383 | // QPEToolBar /* *menu,*/ *fileBar; |
384 | QToolBar *menubar, *fileBar, *navBar, *viewBar, *markBar; | 384 | QToolBar *menubar, *fileBar, *navBar, *viewBar, *markBar; |
385 | #ifdef USEQPE | 385 | #ifdef USEQPE |
386 | QPEMenuBar *mb; | 386 | QMenuBar *mb; |
387 | #else | 387 | #else |
388 | QMenuBar *mb; | 388 | QMenuBar *mb; |
389 | #endif | 389 | #endif |
390 | QFloatBar *searchBar, *regBar/*, *m_fontBar*/; | 390 | QFloatBar *searchBar, *regBar/*, *m_fontBar*/; |
391 | QToolBar /* *searchBar, *regBar,*/ *m_fontBar; | 391 | QToolBar /* *searchBar, *regBar,*/ *m_fontBar; |
392 | QLineEdit *searchEdit, *regEdit; | 392 | QLineEdit *searchEdit, *regEdit; |
393 | bool searchVisible; | 393 | bool searchVisible; |
394 | bool regVisible; | 394 | bool regVisible; |
395 | bool m_fontVisible, m_twoTouch; | 395 | bool m_fontVisible, m_twoTouch; |
396 | bool bFromDocView; | 396 | bool bFromDocView; |
397 | static unsigned long m_uid; | 397 | static unsigned long m_uid; |
398 | long unsigned get_unique_id() { return m_uid++; } | 398 | long unsigned get_unique_id() { return m_uid++; } |