summaryrefslogtreecommitdiff
path: root/noncore
authorharlekin <harlekin>2003-04-10 21:14:03 (UTC)
committer harlekin <harlekin>2003-04-10 21:14:03 (UTC)
commit6f7b120de8f4b883e709386882f3fe8ed925d0da (patch) (side-by-side diff)
tree2935f95a527e146a78b8459dbb02711093864df1 /noncore
parent91867cb8a9a35c89a357bb6f20677f680709e357 (diff)
downloadopie-6f7b120de8f4b883e709386882f3fe8ed925d0da.zip
opie-6f7b120de8f4b883e709386882f3fe8ed925d0da.tar.gz
opie-6f7b120de8f4b883e709386882f3fe8ed925d0da.tar.bz2
qpetoolbar and qpemenubar are depreciated
Diffstat (limited to 'noncore') (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/aqpkg/mainwin.cpp14
-rw-r--r--noncore/settings/aqpkg/mainwin.h6
2 files changed, 10 insertions, 10 deletions
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index b597e03..6ea619c 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -19,9 +19,9 @@
#include <unistd.h>
#include <qpe/qcopenvelope_qws.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/qpeapplication.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
#include <qpe/config.h>
#include <qpe/resource.h>
@@ -65,14 +65,14 @@ MainWindow :: MainWindow()
// Build menu and tool bars
setToolBarsMovable( FALSE );
- QPEToolBar *bar = new QPEToolBar( this );
+ QToolBar *bar = new QToolBar( this );
bar->setHorizontalStretchable( TRUE );
- QPEMenuBar *mb = new QPEMenuBar( bar );
+ QMenuBar *mb = new QMenuBar( bar );
mb->setMargin( 0 );
- bar = new QPEToolBar( this );
+ bar = new QToolBar( this );
// Find toolbar
- findBar = new QPEToolBar( this );
+ findBar = new QToolBar( this );
addToolBar( findBar, QMainWindow::Top, true );
findBar->setHorizontalStretchable( true );
findEdit = new QLineEdit( findBar );
@@ -81,7 +81,7 @@ MainWindow :: MainWindow()
connect( findEdit, SIGNAL( textChanged( const QString & ) ), this, SLOT( findPackage( const QString & ) ) );
// Quick jump toolbar
- jumpBar = new QPEToolBar( this );
+ jumpBar = new QToolBar( this );
addToolBar( jumpBar, QMainWindow::Top, true );
jumpBar->setHorizontalStretchable( true );
QWidget *w = new QWidget( jumpBar );
diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h
index b2de871..4b044de 100644
--- a/noncore/settings/aqpkg/mainwin.h
+++ b/noncore/settings/aqpkg/mainwin.h
@@ -31,7 +31,7 @@ class QComboBox;
class QLabel;
class QLineEdit;
class QListView;
-class QPEToolBar;
+class QToolBar;
class QProgressBar;
class QWidgetStack;
@@ -51,8 +51,8 @@ private:
QWidgetStack *stack;
- QPEToolBar *findBar;
- QPEToolBar *jumpBar;
+ QToolBar *findBar;
+ QToolBar *jumpBar;
QLineEdit *findEdit;
QAction *actionFindNext;
QAction *actionFilter;