s/QPEToolBar/QToolBar:

 - remove usage of deprecated classses
 - makes it easier to migrate to OToolBar in the future

2 files changed, 4 insertions, 4 deletions

diff --git a/noncore/apps/opie-bartender/bartender.cpp b/noncore/apps/opie-bartender/bartender.cpp
index 3a0d8d1..8c4ee93 100644
--- a/noncore/apps/opie-bartender/bartender.cpp
+++ b/noncore/apps/opie-bartender/bartender.cpp
@@ -9,25 +9,25 @@
     *   the Free Software Foundation; either version 2 of the License, or     *
     *   (at your option) any later version.                                   *
     ***************************************************************************/
 
 #include "bartender.h"
 #include "newdrinks.h"
 #include "showdrinks.h"
 #include "inputDialog.h"
 #include "searchresults.h"
 #include "bac.h"
 
 #include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <opie/colorpopupmenu.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 
 #include <qcstring.h>
 #include <qlineedit.h>
 #include <qdir.h>
 #include <qpushbutton.h>
 #include <qlistbox.h>
 #include <qstringlist.h>
 #include <qmultilineedit.h>
 #include <qmessagebox.h>
@@ -54,25 +54,25 @@
 
 Bartender::Bartender( QWidget* parent,  const char* name, WFlags fl )
     : QMainWindow( parent, name, fl ) {
     if ( !name )
   setName( "Bartender" );
     QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 2);
     layout->setMargin( 2);
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     setCaption( tr( "Bartender" ) );
 
-    ToolBar1 = new QPEToolBar( this, "ToolBar1" );
+    ToolBar1 = new QToolBar( this, "ToolBar1" );
     ToolBar1->setFixedHeight(22);
     layout->addMultiCellWidget( ToolBar1, 0, 0, 0, 4 );
 
     QMenuBar *menuBar = new QMenuBar( ToolBar1 );
     QPopupMenu *fileMenu;
     fileMenu = new QPopupMenu( this);
     menuBar->insertItem( tr("File"), fileMenu );
 
     fileMenu->insertItem(tr("New Drink"));
     fileMenu->insertItem(tr("Open Drink"));
     fileMenu->insertItem(tr("Find by Drink Name"));
     fileMenu->insertItem(tr("Find by Alcohol"));
diff --git a/noncore/apps/opie-bartender/bartender.h b/noncore/apps/opie-bartender/bartender.h
index 69cfa82..df1af76 100644
--- a/noncore/apps/opie-bartender/bartender.h
+++ b/noncore/apps/opie-bartender/bartender.h
@@ -13,35 +13,35 @@
 #include "newdrinks.h"
 
 #include <qvariant.h>
 #include <qwidget.h>
 #include <qmainwindow.h>
 #include <qfile.h>
 
 class QVBoxLayout; 
 class QHBoxLayout; 
 class QGridLayout; 
 class QListView;
 class QListViewItem;
-class QPEToolBar;
+class QToolBar;
 
 class Bartender : public QMainWindow
 { 
     Q_OBJECT
 
 public:
     Bartender( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~Bartender();
 
-    QPEToolBar* ToolBar1;
+    QToolBar* ToolBar1;
     QListView* DrinkView;
     QFile dbFile;
 public slots:
     void doEdit();
     
 protected:
 
 protected slots:
     void fileMenuActivated(int);
     void editMenuActivated(int); 
     void cleanUp();
     void fileNew();