| author | mickeyl <mickeyl> | 2003-12-07 14:06:21 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2003-12-07 14:06:21 (UTC) |
| commit | 4518f62746143246d29eb9f08030e241ac33eeb7 (patch) (side-by-side diff) | |
| tree | beda04d2c1ddadefd4d0dc2bb18774a15da03bf2 /noncore/apps/opie-reader | |
| parent | c648101ca50a9782911b58b5158b31e1d0427ab3 (diff) | |
| download | opie-4518f62746143246d29eb9f08030e241ac33eeb7.zip opie-4518f62746143246d29eb9f08030e241ac33eeb7.tar.gz opie-4518f62746143246d29eb9f08030e241ac33eeb7.tar.bz2 | |
s/QPEToolBar/QToolBar:
- remove usage of deprecated classses
- makes it easier to migrate to OToolBar in the future
| -rw-r--r-- | noncore/apps/opie-reader/QTReaderApp.cpp | 6 | ||||
| -rw-r--r-- | noncore/apps/opie-reader/QTReaderApp.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp index 8c0d138..f10020a 100644 --- a/noncore/apps/opie-reader/QTReaderApp.cpp +++ b/noncore/apps/opie-reader/QTReaderApp.cpp @@ -22,7 +22,7 @@ #include <qclipboard.h> #include <qwidgetstack.h> #ifdef USEQPE -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/qpetoolbar.h> #endif #include <qmenubar.h> @@ -254,8 +254,8 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) setIcon( QPixmap (PICDIR "uqtreader.png") ); #endif /* USEQPE */ -// QPEToolBar *bar = new QPEToolBar( this ); -// menubar = new QPEToolBar( this ); +// QToolBar *bar = new QToolBar( this ); +// menubar = new QToolBar( this ); #ifdef USEQPE Config config( APPDIR ); #else diff --git a/noncore/apps/opie-reader/QTReaderApp.h b/noncore/apps/opie-reader/QTReaderApp.h index 86c14b1..ab6f60e 100644 --- a/noncore/apps/opie-reader/QTReaderApp.h +++ b/noncore/apps/opie-reader/QTReaderApp.h @@ -44,7 +44,7 @@ class QToolButton; class QPopupMenu; class QToolBar; #ifdef USEQPE
-class QPEToolBar; +class QToolBar; class QMenuBar;
#endif class CBkmkSelector; @@ -380,7 +380,7 @@ private slots: QWidgetStack *editorStack; QTReader* reader; QComboBox* m_fontSelector; -// QPEToolBar /* *menu,*/ *fileBar; +// QToolBar /* *menu,*/ *fileBar; QToolBar *menubar, *fileBar, *navBar, *viewBar, *markBar; #ifdef USEQPE
QMenuBar *mb;
|