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
@@ -16,15 +16,15 @@
  ***************************************************************************/
 
 #include <linux/limits.h>
 #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>
 
 #include <qaction.h>
 #include <qcombobox.h>
 #include <qfile.h>
@@ -62,29 +62,29 @@ MainWindow :: MainWindow()
     initMainWidget();
     initProgressWidget();
     
     // 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 );
     QWhatsThis::add( findEdit, tr( "Type the text to search for here." ) );
     findBar->setStretchableWidget( findEdit );
     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 );
     jumpBar->setStretchableWidget( w );
     
     QGridLayout *layout = new QGridLayout( w );
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
@@ -28,13 +28,13 @@ class InstallDlgImpl;
 class QAction;
 class QCheckListItem;
 class QComboBox;
 class QLabel;
 class QLineEdit;
 class QListView;
-class QPEToolBar;
+class QToolBar;
 class QProgressBar;
 class QWidgetStack;
 
 class MainWindow :public  QMainWindow
 {
 	Q_OBJECT
@@ -48,14 +48,14 @@ protected:
 
 private:
     DataManager *mgr;
 
     QWidgetStack *stack;
     
-    QPEToolBar *findBar;
-    QPEToolBar *jumpBar;
+    QToolBar *findBar;
+    QToolBar *jumpBar;
     QLineEdit  *findEdit;
     QAction    *actionFindNext;
     QAction    *actionFilter;
     QAction    *actionUpgrade;
     QAction    *actionDownload;
     QAction    *actionUninstalled;