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/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index 80738df..07403a1 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -29,13 +29,13 @@
 #include <qregexp.h>
 #include <qwhatsthis.h>
 #include <qmenubar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <opie/owait.h>
 
 #include "olistview.h"
@@ -110,14 +110,14 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
    actionWildcards->setOn( cfg.readBoolEntry( "wildcards", false ) );
 //   actionWholeWordsOnly->setOn( cfg.readBoolEntry( "whole_words_only", false ) );
 }
 
 void MainWindow::makeMenu()
 {
-   QPEToolBar *toolBar = new QPEToolBar( this );
-   QPEToolBar *searchBar = new QPEToolBar(this);
+   QToolBar *toolBar = new QToolBar( this );
+   QToolBar *searchBar = new QToolBar(this);
    QMenuBar *menuBar = new QMenuBar( toolBar );
    QPopupMenu *searchMenu = new QPopupMenu( menuBar );
 //   QPopupMenu *viewMenu = new QPopupMenu( menuBar );
    QPopupMenu *cfgMenu = new QPopupMenu( menuBar );
    QPopupMenu *searchOptions = new QPopupMenu( cfgMenu );
 
diff --git a/core/pim/osearch/mainwindow.h b/core/pim/osearch/mainwindow.h
index 75054f0..bdc6c5f 100644
--- a/core/pim/osearch/mainwindow.h
+++ b/core/pim/osearch/mainwindow.h
@@ -19,13 +19,13 @@
 
 #include <qmap.h>
 #include <qtimer.h>
 #include <qpopupmenu.h>
 
 class QAction;
-class QPEToolBar;
+class QToolBar;
 class QHBox;
 class QVBoxLayout;
 class QTextView;
 class QFrame;
 class OListView;
 class OListViewItem;