-rw-r--r-- | noncore/multimedia/opierec/helpwindow.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/showimg/showimg.cpp | 6 | ||||
-rw-r--r-- | noncore/multimedia/showimg/showimg.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/noncore/multimedia/opierec/helpwindow.cpp b/noncore/multimedia/opierec/helpwindow.cpp index 1ab6510..a3b29fa 100644 --- a/noncore/multimedia/opierec/helpwindow.cpp +++ b/noncore/multimedia/opierec/helpwindow.cpp | |||
@@ -36,7 +36,7 @@ HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* par | |||
36 | 36 | ||
37 | if ( !home_.isEmpty() ) | 37 | if ( !home_.isEmpty() ) |
38 | browser->setSource( home_ ); | 38 | browser->setSource( home_ ); |
39 | QPEToolBar *toolbar = new QPEToolBar( this ); | 39 | QToolBar *toolbar = new QToolBar( this ); |
40 | 40 | ||
41 | QAction *a = new QAction( tr( "Backward" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 ); | 41 | QAction *a = new QAction( tr( "Backward" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 ); |
42 | connect( a, SIGNAL( activated() ), browser, SLOT( backward() ) ); | 42 | connect( a, SIGNAL( activated() ), browser, SLOT( backward() ) ); |
diff --git a/noncore/multimedia/showimg/showimg.cpp b/noncore/multimedia/showimg/showimg.cpp index b7754f7..ba76e57 100644 --- a/noncore/multimedia/showimg/showimg.cpp +++ b/noncore/multimedia/showimg/showimg.cpp | |||
@@ -36,7 +36,7 @@ | |||
36 | #include <qpe/applnk.h> | 36 | #include <qpe/applnk.h> |
37 | #include <qfileinfo.h> | 37 | #include <qfileinfo.h> |
38 | #include <math.h> | 38 | #include <math.h> |
39 | #include <qpe/qpemenubar.h> | 39 | #include <qmenubar.h> |
40 | #include <qwidgetstack.h> | 40 | #include <qwidgetstack.h> |
41 | #include <qpe/qpetoolbar.h> | 41 | #include <qpe/qpetoolbar.h> |
42 | #include <qaction.h> | 42 | #include <qaction.h> |
@@ -228,7 +228,7 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags ) | |||
228 | 228 | ||
229 | setToolBarsMovable( FALSE ); | 229 | setToolBarsMovable( FALSE ); |
230 | 230 | ||
231 | toolBar = new QPEToolBar( this ); | 231 | toolBar = new QToolBar( this ); |
232 | toolBar->setHorizontalStretchable( TRUE ); | 232 | toolBar->setHorizontalStretchable( TRUE ); |
233 | 233 | ||
234 | menuBar = new QMenuBar( toolBar ); | 234 | menuBar = new QMenuBar( toolBar ); |
@@ -314,7 +314,7 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags ) | |||
314 | imageList = fileSelector->fileList(); | 314 | imageList = fileSelector->fileList(); |
315 | slideAction->setEnabled( imageList.count() != 0); | 315 | slideAction->setEnabled( imageList.count() != 0); |
316 | 316 | ||
317 | iconToolBar = new QPEToolBar(this); | 317 | iconToolBar = new QToolBar(this); |
318 | 318 | ||
319 | QAction *a; | 319 | QAction *a; |
320 | 320 | ||
diff --git a/noncore/multimedia/showimg/showimg.h b/noncore/multimedia/showimg/showimg.h index da4c0b6..9cf9bfd 100644 --- a/noncore/multimedia/showimg/showimg.h +++ b/noncore/multimedia/showimg/showimg.h | |||
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | 35 | ||
36 | class QAction; | 36 | class QAction; |
37 | class QPEToolBar; | 37 | class QToolBar; |
38 | class QMenuBar; | 38 | class QMenuBar; |
39 | class QPopupMenu; | 39 | class QPopupMenu; |
40 | class QWidgetStack; | 40 | class QWidgetStack; |
@@ -248,8 +248,8 @@ private: | |||
248 | QImage image; // the loaded image | 248 | QImage image; // the loaded image |
249 | QPixmap pm; // the converted pixmap | 249 | QPixmap pm; // the converted pixmap |
250 | QPixmap pmScaled; // the scaled pixmap | 250 | QPixmap pmScaled; // the scaled pixmap |
251 | QPEToolBar *toolBar; | 251 | QToolBar *toolBar; |
252 | QPEToolBar *iconToolBar; | 252 | QToolBar *iconToolBar; |
253 | QMenuBar *menuBar; | 253 | QMenuBar *menuBar; |
254 | QMenuBar *current; | 254 | QMenuBar *current; |
255 | 255 | ||