2 files changed, 5 insertions, 5 deletions

diff --git a/core/pim/datebook2/mainwindow.cpp b/core/pim/datebook2/mainwindow.cpp
index 7d436ae..be30415 100644
--- a/core/pim/datebook2/mainwindow.cpp
+++ b/core/pim/datebook2/mainwindow.cpp
@@ -1,36 +1,36 @@
 
 #include <qcopchannel_qws.h>
 #include <qwidgetstack.h>
 #include <qlabel.h>
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qtimer.h>
 
 #include <qpe/qpeapplication.h>
 #include <qpe/ir.h>
 #include <qmenubar.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 
 #include "editor.h"
 #include "show.h"
 #include "templatemanager.h"
 #include "bookmanager.h"
 #include "mainwindow.h"
 
 
 using namespace Datebook;
 
 MainWindow::MainWindow()
     : OPimMainWindow( "Datebook", 0, 0 ), m_descMan( "Descriptions" ),  m_locMan( "Locations" )
 {
     setIcon( Resource::loadPixmap( "datebook_icon" ) );
     initUI();
     initManagers();
     initView();
     initConfig();
 
     QTimer::singleShot(0, this, SLOT(populate() ) );
 
     QCopChannel* chan = new QCopChannel( "QPE/System", this );
@@ -69,49 +69,49 @@ void MainWindow::beam( int uid ) {
 
 }
 void MainWindow::show( int uid ) {
 
     eventShow()->show( manager()->event( uid ) );
 }
 void MainWindow::add( const OPimRecord& ad) {
     manager()->add( ad );
 }
 void MainWindow::edit() {
     edit ( currentView()->currentItem() );
 }
 void MainWindow::edit( int uid ) {
 
 }
 /*
  * init tool bars layout and so on
  */
 void MainWindow::initUI() {
     setToolBarsMovable( false );
 
     m_stack = new QWidgetStack( this );
     setCentralWidget( m_stack );
 
-    m_toolBar = new QPEToolBar( this );
+    m_toolBar = new QToolBar( this );
     m_toolBar->setHorizontalStretchable( TRUE );
 
     QMenuBar* mb = new QMenuBar( m_toolBar );
 
     m_popView    = new QPopupMenu( this );
     m_popSetting = new QPopupMenu( this );
 
     mb->insertItem( tr("View"), m_popView );
     mb->insertItem( tr("Settings" ), m_popSetting );
 
     m_popTemplate = new QPopupMenu( this );
     m_popTemplate->setCheckable( TRUE );
     connect( m_popTemplate, SIGNAL(activated(int) ),
              this, SLOT(slotNewFromTemplate(int) ) );
     m_popView->insertItem(tr("New from template"), m_popTemplate, -1, 0);
 
 
     QAction* a = new QAction( tr("New Event"), Resource::loadPixmap("new"),
                               QString::null, 0, this, 0 );
     a->addTo( m_toolBar );
     a->addTo( m_popView );
     connect(a, SIGNAL( activated() ), this, SLOT( create() ) );
 
     a = new QAction( tr("Edit Event"), Resource::loadPixmap("edit"),
diff --git a/core/pim/datebook2/mainwindow.h b/core/pim/datebook2/mainwindow.h
index 3c22637..33ef864 100644
--- a/core/pim/datebook2/mainwindow.h
+++ b/core/pim/datebook2/mainwindow.h
@@ -1,107 +1,107 @@
 #ifndef DATE_BOOK_MAIN_WINDOW_H
 #define DATE_BOOK_MAIN_WINDOW_H
 
 #include <qlist.h>
 
 #include <opie/opimmainwindow.h>
 
 #include "descriptionmanager.h"
 #include "locationmanager.h"
 #include "templatemanager.h"
 #include "view.h"
 
 class QAction;
 class QWidgetStack;
 class QPopupMenu;
-class QPEToolBar;
+class QToolBar;
 namespace Datebook {
     class BookManager;
     class Show;
     class Editor;
     class MainWindow : public OPimMainWindow {
         Q_OBJECT
         friend class Show; // to avoid QObject
         friend class View; // to avoid QObject
         friend class Editor;
     public:
         MainWindow();
         ~MainWindow();
 
     private slots:
         void initUI(); // init the UI
         void initConfig(); // apply the config
         void initView(); // init the Views..
         void initManagers(); // init the Managers including templates, location and description
         void raiseCurrentView(); // raise the current View
         void slotGoToNow(); // will switch the currentView to the curren date time
         void slotFind(); // find!!!
         void slotConfigure(); // configure the app
         void slotClockChanged(bool); // clock changed
         void slotWeekChanged( bool ); // week changed
         void slotAppMessage( const QCString&, const QByteArray& ); // qApp message QPE/Application/datebook
         void slotReceive( const QCString&, const QByteArray& ); // QPE/System and QPE/Datebook
         void slotAction( QAction* ); // View changed
         void slotConfigureLocs(); // Configure the Locations
         void slotConfigureDesc(); // Configure the Desc
         void slotConfigureTemp();
         void slotNewFromTemplate(int ); // called when someone chooses the template menu
 
         void setTemplateMenu(); // updates the templateMenu
 
     protected slots:
         void populate();
         void doSetDocument( const QString& str );
         void flush();
         void reload();
         int create();
         bool remove( int uid );
         void beam( int uid );
         void show( int uid );
         void edit( int uid );
         void edit();
         void add( const OPimRecord& );
 
     private:
-        QPEToolBar* toolbar();
+        QToolBar* toolbar();
         QPopupMenu* viewMenu();
         QPopupMenu* settingsMenu();
         QPopupMenu* templateMenu();
         View* currentView();
         BookManager* manager();
         TemplateManager templateManager();
         LocationManager locationManager();
         DescriptionManager descriptionManager();
         void setLocationManager( const LocationManager& );
         void setDescriptionManager( const DescriptionManager& );
         Show* eventShow();
         Editor* editor();
 
     private: // friend functions for Show
         void hideShow(); // to hide the view
         // off friend Show
 
         // friend of the view
     private:
         void viewPopup( int );
         void viewAdd( const QDate& date );
         void viewAdd( const QDateTime&, const QDateTime& );
         bool viewAP()const;
         bool viewStartMonday()const;
         // off view show
     private:
         QList<View> m_view; // the Views.. not autoDelete
         QWidgetStack* m_stack;
-        QPEToolBar *m_toolBar;
+        QToolBar *m_toolBar;
         QPopupMenu* m_popView;
         QPopupMenu* m_popSetting;
         QPopupMenu* m_popTemplate;
         BookManager* m_manager;
         TemplateManager m_tempMan;
         DescriptionManager m_descMan;
         LocationManager m_locMan;
         Show* m_show;
         Editor* m_edit;
     };
 }
 
 #endif