author | mickeyl <mickeyl> | 2003-12-07 13:51:01 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-07 13:51:01 (UTC) |
commit | c648101ca50a9782911b58b5158b31e1d0427ab3 (patch) (unidiff) | |
tree | 0fcf5801e23d95e071c7f1b62230c5b15c6256ea /noncore/apps/qashmoney | |
parent | 2d793ca674944241480f6939814e3f61d0a0e0fb (diff) | |
download | opie-c648101ca50a9782911b58b5158b31e1d0427ab3.zip opie-c648101ca50a9782911b58b5158b31e1d0427ab3.tar.gz opie-c648101ca50a9782911b58b5158b31e1d0427ab3.tar.bz2 |
s/QPEMenuBar/QMenuBar:
- remove usage of deprecated classses
- makes it easier to migrate to OMenuBar in the future
-rwxr-xr-x | noncore/apps/qashmoney/budgetdisplay.cpp | 2 | ||||
-rwxr-xr-x | noncore/apps/qashmoney/budgetdisplay.h | 4 | ||||
-rwxr-xr-x | noncore/apps/qashmoney/qashmoney.cpp | 2 | ||||
-rwxr-xr-x | noncore/apps/qashmoney/qashmoney.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/noncore/apps/qashmoney/budgetdisplay.cpp b/noncore/apps/qashmoney/budgetdisplay.cpp index afc6a2d..492595a 100755 --- a/noncore/apps/qashmoney/budgetdisplay.cpp +++ b/noncore/apps/qashmoney/budgetdisplay.cpp | |||
@@ -24,25 +24,25 @@ BudgetDisplay::BudgetDisplay ( QWidget *parent ) : QWidget ( parent ) | |||
24 | year = newDate.year(); | 24 | year = newDate.year(); |
25 | month = newDate.month(); | 25 | month = newDate.month(); |
26 | day = newDate.day(); | 26 | day = newDate.day(); |
27 | datelabel = preferences->getDate ( year, month ); | 27 | datelabel = preferences->getDate ( year, month ); |
28 | 28 | ||
29 | setCaption ( "Budget" ); | 29 | setCaption ( "Budget" ); |
30 | 30 | ||
31 | firstline = new QHBox ( this ); | 31 | firstline = new QHBox ( this ); |
32 | firstline->setSpacing ( 2 ); | 32 | firstline->setSpacing ( 2 ); |
33 | secondline = new QHBox ( this ); | 33 | secondline = new QHBox ( this ); |
34 | secondline->setSpacing ( 10 ); | 34 | secondline->setSpacing ( 10 ); |
35 | 35 | ||
36 | menu = new QPEMenuBar ( this ); | 36 | menu = new QMenuBar ( this ); |
37 | menu->setFrameStyle ( QFrame::Box | QFrame::Sunken ); | 37 | menu->setFrameStyle ( QFrame::Box | QFrame::Sunken ); |
38 | budgetmenu = new QPopupMenu ( this ); | 38 | budgetmenu = new QPopupMenu ( this ); |
39 | lineitemsmenu = new QPopupMenu ( this ); | 39 | lineitemsmenu = new QPopupMenu ( this ); |
40 | datemenu = new QPopupMenu ( this ); | 40 | datemenu = new QPopupMenu ( this ); |
41 | menu->insertItem ( "Budget", budgetmenu ); | 41 | menu->insertItem ( "Budget", budgetmenu ); |
42 | menu->insertItem ( "Line Item", lineitemsmenu ); | 42 | menu->insertItem ( "Line Item", lineitemsmenu ); |
43 | menu->insertItem ( "Date", datemenu ); | 43 | menu->insertItem ( "Date", datemenu ); |
44 | budgetmenu->insertItem ( "New", this, SLOT ( newBudget () ), 0, 1 ); | 44 | budgetmenu->insertItem ( "New", this, SLOT ( newBudget () ), 0, 1 ); |
45 | budgetmenu->insertItem ( "Edit", this, SLOT ( editBudget () ), 0, 2 ); | 45 | budgetmenu->insertItem ( "Edit", this, SLOT ( editBudget () ), 0, 2 ); |
46 | budgetmenu->insertItem ( "Delete", this, SLOT ( deleteBudget () ), 0, 3 ); | 46 | budgetmenu->insertItem ( "Delete", this, SLOT ( deleteBudget () ), 0, 3 ); |
47 | lineitemsmenu->insertItem ( "New", this, SLOT ( newLineItem () ), 0, 1 ); | 47 | lineitemsmenu->insertItem ( "New", this, SLOT ( newLineItem () ), 0, 1 ); |
48 | lineitemsmenu->insertItem ( "Edit", this, SLOT ( editLineItem () ), 0, 2 ); | 48 | lineitemsmenu->insertItem ( "Edit", this, SLOT ( editLineItem () ), 0, 2 ); |
diff --git a/noncore/apps/qashmoney/budgetdisplay.h b/noncore/apps/qashmoney/budgetdisplay.h index 3976ce1..a4e806c 100755 --- a/noncore/apps/qashmoney/budgetdisplay.h +++ b/noncore/apps/qashmoney/budgetdisplay.h | |||
@@ -1,37 +1,37 @@ | |||
1 | #ifndef BUDGETDISPLAY_H | 1 | #ifndef BUDGETDISPLAY_H |
2 | #define BUDGETDISPLAY_H | 2 | #define BUDGETDISPLAY_H |
3 | 3 | ||
4 | #include <qlistview.h> | 4 | #include <qlistview.h> |
5 | #include <qlineedit.h> | 5 | #include <qlineedit.h> |
6 | #include <qpushbutton.h> | 6 | #include <qpushbutton.h> |
7 | #include <qcombobox.h> | 7 | #include <qcombobox.h> |
8 | #include <qlayout.h> | 8 | #include <qlayout.h> |
9 | #include <qlabel.h> | 9 | #include <qlabel.h> |
10 | #include <qstringlist.h> | 10 | #include <qstringlist.h> |
11 | #include <qdatetime.h> | 11 | #include <qdatetime.h> |
12 | #include <qpe/qpemenubar.h> | 12 | #include <qmenubar.h> |
13 | #include <qpopupmenu.h> | 13 | #include <qpopupmenu.h> |
14 | #include <qhbox.h> | 14 | #include <qhbox.h> |
15 | 15 | ||
16 | #include "currency.h" | 16 | #include "currency.h" |
17 | 17 | ||
18 | class BudgetDisplay : public QWidget | 18 | class BudgetDisplay : public QWidget |
19 | { | 19 | { |
20 | Q_OBJECT | 20 | Q_OBJECT |
21 | 21 | ||
22 | public: | 22 | public: |
23 | BudgetDisplay ( QWidget *parent ); | 23 | BudgetDisplay ( QWidget *parent ); |
24 | 24 | ||
25 | QPEMenuBar *menu; | 25 | QMenuBar *menu; |
26 | QPopupMenu *budgetmenu; | 26 | QPopupMenu *budgetmenu; |
27 | QPopupMenu *lineitemsmenu; | 27 | QPopupMenu *lineitemsmenu; |
28 | QPopupMenu *datemenu; | 28 | QPopupMenu *datemenu; |
29 | 29 | ||
30 | QHBox *firstline; | 30 | QHBox *firstline; |
31 | QHBox *secondline; | 31 | QHBox *secondline; |
32 | 32 | ||
33 | QLabel *budgeted; | 33 | QLabel *budgeted; |
34 | QLabel *actual; | 34 | QLabel *actual; |
35 | QLabel *date; | 35 | QLabel *date; |
36 | 36 | ||
37 | QLineEdit *budgetname; | 37 | QLineEdit *budgetname; |
diff --git a/noncore/apps/qashmoney/qashmoney.cpp b/noncore/apps/qashmoney/qashmoney.cpp index 20e8d32..e985f0b 100755 --- a/noncore/apps/qashmoney/qashmoney.cpp +++ b/noncore/apps/qashmoney/qashmoney.cpp | |||
@@ -14,25 +14,25 @@ Memory *memory = new Memory (); | |||
14 | 14 | ||
15 | QashMoney::QashMoney () : QWidget () | 15 | QashMoney::QashMoney () : QWidget () |
16 | { | 16 | { |
17 | preferences->addPreferences (); | 17 | preferences->addPreferences (); |
18 | preferences->initializeColumnPreferences (); | 18 | preferences->initializeColumnPreferences (); |
19 | preferences->initializeSortingPreferences (); | 19 | preferences->initializeSortingPreferences (); |
20 | 20 | ||
21 | // set the text in the upper part of the frame | 21 | // set the text in the upper part of the frame |
22 | setCaption ( tr ( "QashMoney" ) ); | 22 | setCaption ( tr ( "QashMoney" ) ); |
23 | 23 | ||
24 | // Create new menubar for our mainwindow | 24 | // Create new menubar for our mainwindow |
25 | // and add menu items | 25 | // and add menu items |
26 | mainmenu = new QPEMenuBar ( this ); | 26 | mainmenu = new QMenuBar ( this ); |
27 | mainmenu->setFrameStyle ( QFrame::PopupPanel | QFrame::Raised ); | 27 | mainmenu->setFrameStyle ( QFrame::PopupPanel | QFrame::Raised ); |
28 | preferencesmenu = new QPopupMenu ( this ); | 28 | preferencesmenu = new QPopupMenu ( this ); |
29 | utilitiesmenu = new QPopupMenu ( this ); | 29 | utilitiesmenu = new QPopupMenu ( this ); |
30 | mainmenu->insertItem ( "Preferences", preferencesmenu ); | 30 | mainmenu->insertItem ( "Preferences", preferencesmenu ); |
31 | mainmenu->insertItem ( "Utilities", utilitiesmenu ); | 31 | mainmenu->insertItem ( "Utilities", utilitiesmenu ); |
32 | preferencesmenu->insertItem ( "Date", this, SLOT ( displayDatePreferencesDialog () ) ); | 32 | preferencesmenu->insertItem ( "Date", this, SLOT ( displayDatePreferencesDialog () ) ); |
33 | preferencesmenu->insertItem ( "Account", this, SLOT ( displayAccountPreferencesDialog () ) ); | 33 | preferencesmenu->insertItem ( "Account", this, SLOT ( displayAccountPreferencesDialog () ) ); |
34 | preferencesmenu->insertItem ( "Transaction", this, SLOT ( displayTransactionPreferencesDialog () ) ); | 34 | preferencesmenu->insertItem ( "Transaction", this, SLOT ( displayTransactionPreferencesDialog () ) ); |
35 | utilitiesmenu->insertItem ( "Memory", this, SLOT ( displayMemoryDialog () ) ); | 35 | utilitiesmenu->insertItem ( "Memory", this, SLOT ( displayMemoryDialog () ) ); |
36 | 36 | ||
37 | // create the main tabwidget for displaying accounts and transactions | 37 | // create the main tabwidget for displaying accounts and transactions |
38 | maintabs = new QTabWidget ( this ); | 38 | maintabs = new QTabWidget ( this ); |
diff --git a/noncore/apps/qashmoney/qashmoney.h b/noncore/apps/qashmoney/qashmoney.h index ec2c7ec..f2c456c 100755 --- a/noncore/apps/qashmoney/qashmoney.h +++ b/noncore/apps/qashmoney/qashmoney.h | |||
@@ -1,16 +1,16 @@ | |||
1 | #ifndef QASHMONEY_H | 1 | #ifndef QASHMONEY_H |
2 | #define QASHMONEY_H | 2 | #define QASHMONEY_H |
3 | 3 | ||
4 | #include <qpe/qpemenubar.h> | 4 | #include <qmenubar.h> |
5 | #include <qpopupmenu.h> | 5 | #include <qpopupmenu.h> |
6 | #include <qlayout.h> | 6 | #include <qlayout.h> |
7 | #include <qtabwidget.h> | 7 | #include <qtabwidget.h> |
8 | #include <qdatetime.h> | 8 | #include <qdatetime.h> |
9 | 9 | ||
10 | #include "accountdisplay.h" | 10 | #include "accountdisplay.h" |
11 | #include "transactiondisplay.h" | 11 | #include "transactiondisplay.h" |
12 | #include "budgetdisplay.h" | 12 | #include "budgetdisplay.h" |
13 | #include "account.h" | 13 | #include "account.h" |
14 | #include "preferences.h" | 14 | #include "preferences.h" |
15 | #include "transaction.h" | 15 | #include "transaction.h" |
16 | #include "transfer.h" | 16 | #include "transfer.h" |
@@ -21,25 +21,25 @@ class QashMoney : public QWidget | |||
21 | { | 21 | { |
22 | Q_OBJECT | 22 | Q_OBJECT |
23 | 23 | ||
24 | public: | 24 | public: |
25 | QashMoney (); | 25 | QashMoney (); |
26 | ~QashMoney(); | 26 | ~QashMoney(); |
27 | 27 | ||
28 | QTabWidget* maintabs; | 28 | QTabWidget* maintabs; |
29 | QWidget* tab; | 29 | QWidget* tab; |
30 | QWidget* tab_2; | 30 | QWidget* tab_2; |
31 | QWidget* tab_3; | 31 | QWidget* tab_3; |
32 | 32 | ||
33 | QPEMenuBar *mainmenu; | 33 | QMenuBar *mainmenu; |
34 | QPopupMenu *preferencesmenu; | 34 | QPopupMenu *preferencesmenu; |
35 | QPopupMenu *utilitiesmenu; | 35 | QPopupMenu *utilitiesmenu; |
36 | 36 | ||
37 | public slots: | 37 | public slots: |
38 | void displayDatePreferencesDialog (); | 38 | void displayDatePreferencesDialog (); |
39 | void displayTransactionPreferencesDialog (); | 39 | void displayTransactionPreferencesDialog (); |
40 | void displayAccountPreferencesDialog (); | 40 | void displayAccountPreferencesDialog (); |
41 | void displayMemoryDialog (); | 41 | void displayMemoryDialog (); |
42 | void setTransactionTab (); | 42 | void setTransactionTab (); |
43 | 43 | ||
44 | private slots: | 44 | private slots: |
45 | void changeTabDisplay (); | 45 | void changeTabDisplay (); |