author | mickeyl <mickeyl> | 2003-12-07 14:06:21 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-07 14:06:21 (UTC) |
commit | 4518f62746143246d29eb9f08030e241ac33eeb7 (patch) (unidiff) | |
tree | beda04d2c1ddadefd4d0dc2bb18774a15da03bf2 /noncore/apps/opie-sheet | |
parent | c648101ca50a9782911b58b5158b31e1d0427ab3 (diff) | |
download | opie-4518f62746143246d29eb9f08030e241ac33eeb7.zip opie-4518f62746143246d29eb9f08030e241ac33eeb7.tar.gz opie-4518f62746143246d29eb9f08030e241ac33eeb7.tar.bz2 |
s/QPEToolBar/QToolBar:
- remove usage of deprecated classses
- makes it easier to migrate to OToolBar in the future
-rw-r--r-- | noncore/apps/opie-sheet/mainwindow.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/mainwindow.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp index fb2ca79..78b3073 100644 --- a/noncore/apps/opie-sheet/mainwindow.cpp +++ b/noncore/apps/opie-sheet/mainwindow.cpp | |||
@@ -460,13 +460,13 @@ void MainWindow::initMenu() | |||
460 | insertCols->addTo(menuInsert); | 460 | insertCols->addTo(menuInsert); |
461 | insertSheets->addTo(menuInsert); | 461 | insertSheets->addTo(menuInsert); |
462 | } | 462 | } |
463 | 463 | ||
464 | void MainWindow::initStandardToolbar() | 464 | void MainWindow::initStandardToolbar() |
465 | { | 465 | { |
466 | toolbarStandard=new QPEToolBar(this); | 466 | toolbarStandard=new QToolBar(this); |
467 | toolbarStandard->setHorizontalStretchable(TRUE); | 467 | toolbarStandard->setHorizontalStretchable(TRUE); |
468 | moveToolBar(toolbarStandard, Top); | 468 | moveToolBar(toolbarStandard, Top); |
469 | 469 | ||
470 | fileNew->addTo(toolbarStandard); | 470 | fileNew->addTo(toolbarStandard); |
471 | fileOpen->addTo(toolbarStandard); | 471 | fileOpen->addTo(toolbarStandard); |
472 | fileSave->addTo(toolbarStandard); | 472 | fileSave->addTo(toolbarStandard); |
@@ -475,13 +475,13 @@ void MainWindow::initStandardToolbar() | |||
475 | toolbarStandard->setStretchableWidget(comboSheets); | 475 | toolbarStandard->setStretchableWidget(comboSheets); |
476 | connect(comboSheets, SIGNAL(activated(const QString &)), this, SLOT(slotSheetChanged(const QString &))); | 476 | connect(comboSheets, SIGNAL(activated(const QString &)), this, SLOT(slotSheetChanged(const QString &))); |
477 | } | 477 | } |
478 | 478 | ||
479 | void MainWindow::initFunctionsToolbar() | 479 | void MainWindow::initFunctionsToolbar() |
480 | { | 480 | { |
481 | toolbarFunctions=new QPEToolBar(this); | 481 | toolbarFunctions=new QToolBar(this); |
482 | toolbarFunctions->setHorizontalStretchable(TRUE); | 482 | toolbarFunctions->setHorizontalStretchable(TRUE); |
483 | moveToolBar(toolbarFunctions, Bottom); | 483 | moveToolBar(toolbarFunctions, Bottom); |
484 | 484 | ||
485 | funcEqual->addTo(toolbarFunctions); | 485 | funcEqual->addTo(toolbarFunctions); |
486 | funcPlus->addTo(toolbarFunctions); | 486 | funcPlus->addTo(toolbarFunctions); |
487 | funcMinus->addTo(toolbarFunctions); | 487 | funcMinus->addTo(toolbarFunctions); |
@@ -497,13 +497,13 @@ void MainWindow::initFunctionsToolbar() | |||
497 | toolFunction->setPopup(submenuFunc); | 497 | toolFunction->setPopup(submenuFunc); |
498 | toolFunction->setPopupDelay(0); | 498 | toolFunction->setPopupDelay(0); |
499 | } | 499 | } |
500 | 500 | ||
501 | void MainWindow::initEditToolbar() | 501 | void MainWindow::initEditToolbar() |
502 | { | 502 | { |
503 | toolbarEdit=new QPEToolBar(this); | 503 | toolbarEdit=new QToolBar(this); |
504 | toolbarEdit->setHorizontalStretchable(TRUE); | 504 | toolbarEdit->setHorizontalStretchable(TRUE); |
505 | moveToolBar(toolbarEdit, Bottom); | 505 | moveToolBar(toolbarEdit, Bottom); |
506 | 506 | ||
507 | editAccept->addTo(toolbarEdit); | 507 | editAccept->addTo(toolbarEdit); |
508 | editCancel->addTo(toolbarEdit); | 508 | editCancel->addTo(toolbarEdit); |
509 | 509 | ||
diff --git a/noncore/apps/opie-sheet/mainwindow.h b/noncore/apps/opie-sheet/mainwindow.h index 4007f88..bd99c36 100644 --- a/noncore/apps/opie-sheet/mainwindow.h +++ b/noncore/apps/opie-sheet/mainwindow.h | |||
@@ -15,13 +15,13 @@ | |||
15 | #ifndef MAINWINDOW_H | 15 | #ifndef MAINWINDOW_H |
16 | #define MAINWINDOW_H | 16 | #define MAINWINDOW_H |
17 | 17 | ||
18 | #include <qpe/applnk.h> | 18 | #include <qpe/applnk.h> |
19 | #include <qpe/fileselector.h> | 19 | #include <qpe/fileselector.h> |
20 | #include <qmenubar.h> | 20 | #include <qmenubar.h> |
21 | #include <qpe/qpetoolbar.h> | 21 | #include <qtoolbar.h> |
22 | #include <qmainwindow.h> | 22 | #include <qmainwindow.h> |
23 | #include <qaction.h> | 23 | #include <qaction.h> |
24 | #include <qlineedit.h> | 24 | #include <qlineedit.h> |
25 | #include <qbutton.h> | 25 | #include <qbutton.h> |
26 | #include <qcombobox.h> | 26 | #include <qcombobox.h> |
27 | #include <qtoolbutton.h> | 27 | #include <qtoolbutton.h> |
@@ -38,13 +38,13 @@ class MainWindow: public QMainWindow | |||
38 | { | 38 | { |
39 | Q_OBJECT | 39 | Q_OBJECT |
40 | 40 | ||
41 | // QPE objects | 41 | // QPE objects |
42 | DocLnk* currentDoc; | 42 | DocLnk* currentDoc; |
43 | QMenuBar *menu; | 43 | QMenuBar *menu; |
44 | QPEToolBar *toolbarFunctions, *toolbarEdit, *toolbarStandard; | 44 | QToolBar *toolbarFunctions, *toolbarEdit, *toolbarStandard; |
45 | FileSelector *fileSelector; | 45 | FileSelector *fileSelector; |
46 | 46 | ||
47 | // QT objects | 47 | // QT objects |
48 | QPopupMenu *menuFile, *menuEdit, *menuInsert, *menuFormat, *menuData, *menuHelp, | 48 | QPopupMenu *menuFile, *menuEdit, *menuInsert, *menuFormat, *menuData, *menuHelp, |
49 | *submenuFunc, *submenuFuncStd, *submenuFuncMath, *submenuFuncStat, | 49 | *submenuFunc, *submenuFuncStd, *submenuFuncMath, *submenuFuncStat, |
50 | *submenuRow, *submenuCol, *submenuSheet; | 50 | *submenuRow, *submenuCol, *submenuSheet; |