s/QPEMenuBar/QMenuBar:

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

2 files changed, 3 insertions, 3 deletions

diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp
index 3915e52..fb2ca79 100644
--- a/noncore/apps/opie-sheet/mainwindow.cpp
+++ b/noncore/apps/opie-sheet/mainwindow.cpp
@@ -316,97 +316,97 @@ void MainWindow::initActions()
 
   colWidth=new QAction(tr("Column Width"), tr("&Width"), 0, this);
   connect(colWidth, SIGNAL(activated()), this, SLOT(slotColumnWidth()));
   colAdjust=new QAction(tr("Adjust Column"), tr("&Adjust"), 0, this);
   connect(colAdjust, SIGNAL(activated()), this, SLOT(slotColumnAdjust()));
   colShow=new QAction(tr("Show Column"), tr("&Show"), 0, this);
   connect(colShow, SIGNAL(activated()), this, SLOT(slotColumnShow()));
   colHide=new QAction(tr("Hide Column"), tr("&Hide"), 0, this);
   connect(colHide, SIGNAL(activated()), this, SLOT(slotColumnHide()));
 
   sheetRename=new QAction(tr("Rename Sheet"), tr("&Rename"), 0, this);
   connect(sheetRename, SIGNAL(activated()), this, SLOT(slotSheetRename()));
   sheetRemove=new QAction(tr("Remove Sheet"), tr("R&emove"), 0, this);
   connect(sheetRemove, SIGNAL(activated()), this, SLOT(slotSheetRemove()));
 
   dataSort=new QAction(tr("Sort Data"), tr("&Sort"), 0, this);
   connect(dataSort, SIGNAL(activated()), this, SLOT(slotDataSort()));
   dataFindReplace=new QAction(tr("Find && Replace"), tr("&Find && Replace"), 0, this);
   connect(dataFindReplace, SIGNAL(activated()), this, SLOT(slotDataFindReplace()));
 
   funcEqual=new QAction(tr("Equal To"), QPixmap(func_equal_xpm), tr("&Equal To"), 0, this);
   funcEqual->setToolTip("=");
   connect(funcEqual, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
   funcPlus=new QAction(tr("Addition"), QPixmap(func_plus_xpm), tr("&Addition"), 0, this);
   funcPlus->setToolTip("+");
   connect(funcPlus, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
   funcMinus=new QAction(tr("Subtraction"), QPixmap(func_minus_xpm), tr("&Subtraction"), 0, this);
   funcMinus->setToolTip("-");
   connect(funcMinus, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
   funcCross=new QAction(tr("Multiplication"), QPixmap(func_cross_xpm), tr("&Multiplication"), 0, this);
   funcCross->setToolTip("*");
   connect(funcCross, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
   funcDivide=new QAction(tr("Division"), QPixmap(func_divide_xpm), tr("&Division"), 0, this);
   funcDivide->setToolTip("/");
   connect(funcDivide, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
   funcParanOpen=new QAction(tr("Open ParanthesistempCellData->row+row1, tempCellData->col+col1"), QPixmap(func_paran_open_xpm), tr("&Open Paranthesis"), 0, this);
   funcParanOpen->setToolTip("(");
   connect(funcParanOpen, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
   funcParanClose=new QAction(tr("Close Paranthesis"), QPixmap(func_paran_close_xpm), tr("&Close Paranthesis"), 0, this);
   funcParanClose->setToolTip(")");
   connect(funcParanClose, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
   funcComma=new QAction(tr("Comma"), QPixmap(func_comma_xpm), tr("&Comma"), 0, this);
   funcComma->setToolTip(",");
   connect(funcComma, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
 }
 
 void MainWindow::initMenu()
 {
-  menu=new QPEMenuBar(this);
+  menu=new QMenuBar(this);
 
   menuFile=new QPopupMenu;
   fileNew->addTo(menuFile);
   fileOpen->addTo(menuFile);
   fileSave->addTo(menuFile);
   fileSaveAs->addTo(menuFile);
 //  menuFile->insertSeparator();
 //  fileQuit->addTo(menuFile);
   menu->insertItem(tr("&File"), menuFile);
 
   menuEdit=new QPopupMenu;
   editAccept->addTo(menuEdit);
   editCancel->addTo(menuEdit);
   editCellSelect->addTo(menuEdit);
   menuEdit->insertSeparator();
   editCut->addTo(menuEdit);
   editCopy->addTo(menuEdit);
   editPaste->addTo(menuEdit);
   editPasteContents->addTo(menuEdit);
   editClear->addTo(menuEdit);
   menu->insertItem(tr("&Edit"), menuEdit);
 
   menuInsert=new QPopupMenu;
   menu->insertItem(tr("&Insert"), menuInsert);
 
   menuFormat=new QPopupMenu;
   formatCells->addTo(menuFormat);
   menu->insertItem(tr("&Format"), menuFormat);
 
   menuData=new QPopupMenu;
   dataSort->addTo(menuData);
   dataFindReplace->addTo(menuData);
   menu->insertItem(tr("&Data"), menuData);
 
 //  menuHelp=new QPopupMenu;
 // helpGeneral->addTo(menuHelp);
 //  helpAbout->addTo(menuHelp);
 //  menu->insertItem(tr("&Help"), menuHelp);
 
   submenuRow=new QPopupMenu;
   rowHeight->addTo(submenuRow);
   rowAdjust->addTo(submenuRow);
   rowShow->addTo(submenuRow);
   rowHide->addTo(submenuRow);
   menuFormat->insertItem(tr("&Row"), submenuRow);
 
   submenuCol=new QPopupMenu;
   colWidth->addTo(submenuCol);
diff --git a/noncore/apps/opie-sheet/mainwindow.h b/noncore/apps/opie-sheet/mainwindow.h
index 370d82e..4007f88 100644
--- a/noncore/apps/opie-sheet/mainwindow.h
+++ b/noncore/apps/opie-sheet/mainwindow.h
@@ -1,91 +1,91 @@
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 /*
  * Opie Sheet (formerly Sheet/Qt)
  * by Serdar Ozler <sozler@sitebest.com>
  */
 
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <qpe/applnk.h>
 #include <qpe/fileselector.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qmainwindow.h>
 #include <qaction.h>
 #include <qlineedit.h>
 #include <qbutton.h>
 #include <qcombobox.h>
 #include <qtoolbutton.h>
 
 #include "sheet.h"
 
 typedef struct typeSheet
 {
   QString name;
   QList<typeCellData> data;
 };
 
 class MainWindow: public QMainWindow
 {
   Q_OBJECT
 
   // QPE objects
   DocLnk* currentDoc;
-  QPEMenuBar *menu;
+  QMenuBar *menu;
   QPEToolBar *toolbarFunctions, *toolbarEdit, *toolbarStandard;
   FileSelector *fileSelector;
 
   // QT objects
   QPopupMenu *menuFile, *menuEdit, *menuInsert, *menuFormat, *menuData, *menuHelp,
              *submenuFunc, *submenuFuncStd, *submenuFuncMath, *submenuFuncStat,
              *submenuRow, *submenuCol, *submenuSheet;
   QAction *fileNew, *fileOpen, *fileSave, *fileSaveAs, *fileQuit, *helpAbout, *editAccept, *editCancel, *formatCells,
           *funcPlus, *funcMinus, *funcCross, *funcDivide, *funcParanOpen, *funcParanClose, *funcComma, *funcEqual,
           *editCut, *editCopy, *editPaste, *editPasteContents, *editClear, *insertCols, *insertRows, *insertSheets, *insertCells,
           *rowHeight, *rowShow, *rowHide, *rowAdjust, *colWidth, *colShow, *colHide, *colAdjust, *sheetRename, *sheetRemove,
           *dataSort, *dataFindReplace, *editCellSelect, *helpGeneral;
   QLineEdit *editData;
   QButton *buttonUp, *buttonDown, *buttonLeft, *buttonRight;
   QComboBox *comboSheets;
   QToolButton *toolFunction;
   QList<typeSheet> listSheets;
   QString helpFile;
 
   // Other objects
   Sheet *sheet;
 
   // Variables
   bool documentModified;
 
   // Private functions
   void initMenu();
   void initActions();
   void initFunctionsToolbar();
   void initEditToolbar();
   void initStandardToolbar();
   void initSheet();
   void addToData(const QString &data);
   int saveCurrentFile(bool ask=TRUE);
   void documentOpen(const DocLnk &lnkDoc);
   void documentSave(DocLnk *lnkDoc);
   void closeEvent(QCloseEvent *e);
   void addFlyAction(const QString &text, const QString &menuText, const QString &tip, QWidget *w);
   typeSheet *createNewSheet();
   typeSheet *findSheet(const QString &name);
 
   private slots:
     void slotFileNew();
     void slotFileOpen();
     void slotFileSave();
     void slotFileSaveAs();
     void slotHelpAbout();
     void slotEditAccept();