-rwxr-xr-x | noncore/apps/qashmoney/account.h | 4 | ||||
-rwxr-xr-x | noncore/apps/qashmoney/budget.h | 4 | ||||
-rwxr-xr-x | noncore/apps/qashmoney/memory.h | 4 | ||||
-rwxr-xr-x | noncore/apps/qashmoney/preferences.h | 4 | ||||
-rwxr-xr-x | noncore/apps/qashmoney/qashmoney.pro | 2 | ||||
-rwxr-xr-x | noncore/apps/qashmoney/transaction.h | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/noncore/apps/qashmoney/account.h b/noncore/apps/qashmoney/account.h index f77f400..5bad4a1 100755 --- a/noncore/apps/qashmoney/account.h +++ b/noncore/apps/qashmoney/account.h | |||
@@ -1,15 +1,15 @@ | |||
1 | #ifndef ACCOUNT_H | 1 | #ifndef ACCOUNT_H |
2 | #define ACCOUNT_H | 2 | #define ACCOUNT_H |
3 | 3 | ||
4 | #include <qstring.h> | 4 | #include <qstring.h> |
5 | #include <qlistview.h> | 5 | #include <qlistview.h> |
6 | #include <qcombobox.h> | 6 | #include <qcombobox.h> |
7 | #include <sqlite.h> | 7 | #include <sqlite3.h> |
8 | 8 | ||
9 | class Account | 9 | class Account |
10 | { | 10 | { |
11 | public: | 11 | public: |
12 | 12 | ||
13 | Account (); | 13 | Account (); |
14 | ~Account (); | 14 | ~Account (); |
15 | 15 | ||
@@ -75,17 +75,17 @@ class Account | |||
75 | QStringList getAccountNames (); | 75 | QStringList getAccountNames (); |
76 | QStringList getAccountIDs (); | 76 | QStringList getAccountIDs (); |
77 | QString getAccountBalance ( int accountid ); | 77 | QString getAccountBalance ( int accountid ); |
78 | 78 | ||
79 | // returns account credit limit | 79 | // returns account credit limit |
80 | float getAccountCreditLimit ( int ); | 80 | float getAccountCreditLimit ( int ); |
81 | 81 | ||
82 | // The primary database that stores all our data | 82 | // The primary database that stores all our data |
83 | sqlite *adb; | 83 | sqlite3 *adb; |
84 | }; | 84 | }; |
85 | 85 | ||
86 | class GreyBackgroundItem : public QListViewItem | 86 | class GreyBackgroundItem : public QListViewItem |
87 | { | 87 | { |
88 | public: | 88 | public: |
89 | 89 | ||
90 | GreyBackgroundItem ( QListView *parent ); | 90 | GreyBackgroundItem ( QListView *parent ); |
91 | GreyBackgroundItem ( QListView *parent, QString label1, QString label2, QString label3 ); | 91 | GreyBackgroundItem ( QListView *parent, QString label1, QString label2, QString label3 ); |
diff --git a/noncore/apps/qashmoney/budget.h b/noncore/apps/qashmoney/budget.h index 16af26a..f82e048 100755 --- a/noncore/apps/qashmoney/budget.h +++ b/noncore/apps/qashmoney/budget.h | |||
@@ -1,15 +1,15 @@ | |||
1 | #ifndef BUDGET_H | 1 | #ifndef BUDGET_H |
2 | #define BUDGET_H | 2 | #define BUDGET_H |
3 | 3 | ||
4 | #include <qstring.h> | 4 | #include <qstring.h> |
5 | #include <qstringlist.h> | 5 | #include <qstringlist.h> |
6 | #include <qlistview.h> | 6 | #include <qlistview.h> |
7 | #include <sqlite.h> | 7 | #include <sqlite3.h> |
8 | 8 | ||
9 | class Budget | 9 | class Budget |
10 | { | 10 | { |
11 | public: | 11 | public: |
12 | 12 | ||
13 | Budget (); | 13 | Budget (); |
14 | ~Budget (); | 14 | ~Budget (); |
15 | 15 | ||
@@ -33,13 +33,13 @@ class Budget | |||
33 | int addLineItem ( int budgetid, QString lineitemname, float lineitemamount, int lineitemtype ); | 33 | int addLineItem ( int budgetid, QString lineitemname, float lineitemamount, int lineitemtype ); |
34 | void updateLineItem ( QString lineitemname, float lineitemamount, int lineitemtype, int budgetid, int lineitemid ); | 34 | void updateLineItem ( QString lineitemname, float lineitemamount, int lineitemtype, int budgetid, int lineitemid ); |
35 | void displayLineItems ( int budgetid, QListView *listview, int month, int year, int viewtype ); | 35 | void displayLineItems ( int budgetid, QListView *listview, int month, int year, int viewtype ); |
36 | void deleteLineItem ( int budgetid, int lineitemid ); | 36 | void deleteLineItem ( int budgetid, int lineitemid ); |
37 | int getLineItemTime ( int budgetid, int lineitemid ); | 37 | int getLineItemTime ( int budgetid, int lineitemid ); |
38 | float getLineItemAmount ( int budgetid, int lineitemid ); | 38 | float getLineItemAmount ( int budgetid, int lineitemid ); |
39 | 39 | ||
40 | private: | 40 | private: |
41 | sqlite *bdb; | 41 | sqlite3 *bdb; |
42 | }; | 42 | }; |
43 | 43 | ||
44 | #endif | 44 | #endif |
45 | 45 | ||
diff --git a/noncore/apps/qashmoney/memory.h b/noncore/apps/qashmoney/memory.h index 6f3f100..6e8ae46 100755 --- a/noncore/apps/qashmoney/memory.h +++ b/noncore/apps/qashmoney/memory.h | |||
@@ -1,15 +1,15 @@ | |||
1 | #ifndef MEMORY_H | 1 | #ifndef MEMORY_H |
2 | #define MEMORY_H | 2 | #define MEMORY_H |
3 | 3 | ||
4 | #include <qstring.h> | 4 | #include <qstring.h> |
5 | #include <qlistbox.h> | 5 | #include <qlistbox.h> |
6 | #include <qcombobox.h> | 6 | #include <qcombobox.h> |
7 | #include <sqlite.h> | 7 | #include <sqlite3.h> |
8 | 8 | ||
9 | class Memory : public QObject | 9 | class Memory : public QObject |
10 | { | 10 | { |
11 | 11 | ||
12 | Q_OBJECT | 12 | Q_OBJECT |
13 | 13 | ||
14 | public: | 14 | public: |
15 | 15 | ||
@@ -28,17 +28,17 @@ class Memory : public QObject | |||
28 | void changeMemoryName ( QString ); | 28 | void changeMemoryName ( QString ); |
29 | 29 | ||
30 | // This takes a QListView and puts parents and children memorys | 30 | // This takes a QListView and puts parents and children memorys |
31 | // into the list view | 31 | // into the list view |
32 | void displayMemoryItems ( QListBox * ); | 32 | void displayMemoryItems ( QListBox * ); |
33 | void displayMemoryItems ( QComboBox * ); | 33 | void displayMemoryItems ( QComboBox * ); |
34 | 34 | ||
35 | // The primary database that stores all our data | 35 | // The primary database that stores all our data |
36 | sqlite *db; | 36 | sqlite3 *db; |
37 | 37 | ||
38 | public slots: | 38 | public slots: |
39 | 39 | ||
40 | // Deletes a memory item. Takes the memoryid as its parameter | 40 | // Deletes a memory item. Takes the memoryid as its parameter |
41 | void deleteMemoryItem ( QString ); | 41 | void deleteMemoryItem ( QString ); |
42 | }; | 42 | }; |
43 | 43 | ||
44 | #endif | 44 | #endif |
diff --git a/noncore/apps/qashmoney/preferences.h b/noncore/apps/qashmoney/preferences.h index 10ec6e9..38579ad 100755 --- a/noncore/apps/qashmoney/preferences.h +++ b/noncore/apps/qashmoney/preferences.h | |||
@@ -1,9 +1,9 @@ | |||
1 | #include <sqlite.h> | 1 | #include <sqlite3.h> |
2 | #include <qstring.h> | 2 | #include <qstring.h> |
3 | 3 | ||
4 | #ifndef PREFERENCES_H | 4 | #ifndef PREFERENCES_H |
5 | #define PREFERENCES_H | 5 | #define PREFERENCES_H |
6 | 6 | ||
7 | class Preferences | 7 | class Preferences |
8 | { | 8 | { |
9 | public: | 9 | public: |
@@ -24,17 +24,17 @@ class Preferences | |||
24 | QString getSeparator ( ); | 24 | QString getSeparator ( ); |
25 | 25 | ||
26 | // Changes a preference for the given ID | 26 | // Changes a preference for the given ID |
27 | void changePreference ( int , int ); | 27 | void changePreference ( int , int ); |
28 | void changeColumnPreference ( int id, int width ); | 28 | void changeColumnPreference ( int id, int width ); |
29 | void changeSortingPreference ( int id, int column ); | 29 | void changeSortingPreference ( int id, int column ); |
30 | 30 | ||
31 | // The primary database that stores all our data | 31 | // The primary database that stores all our data |
32 | sqlite *db; | 32 | sqlite3 *db; |
33 | 33 | ||
34 | // This function returns a Qstring for the year first date formats | 34 | // This function returns a Qstring for the year first date formats |
35 | // for displaying. It takes the date numbers | 35 | // for displaying. It takes the date numbers |
36 | QString getDate ( int, int, int ); | 36 | QString getDate ( int, int, int ); |
37 | QString getDate ( int y, int m ); | 37 | QString getDate ( int y, int m ); |
38 | 38 | ||
39 | void setDefaultDatePreferences (); | 39 | void setDefaultDatePreferences (); |
40 | }; | 40 | }; |
diff --git a/noncore/apps/qashmoney/qashmoney.pro b/noncore/apps/qashmoney/qashmoney.pro index 4222a25..faa898b 100755 --- a/noncore/apps/qashmoney/qashmoney.pro +++ b/noncore/apps/qashmoney/qashmoney.pro | |||
@@ -38,17 +38,17 @@ SOURCES = qashmoney.cpp \ | |||
38 | budgetdisplay.cpp \ | 38 | budgetdisplay.cpp \ |
39 | currency.cpp | 39 | currency.cpp |
40 | INCLUDEPATH = $(OPIEDIR)/include | 40 | INCLUDEPATH = $(OPIEDIR)/include |
41 | DEPENDPATH = $(OPIEDIR)/include | 41 | DEPENDPATH = $(OPIEDIR)/include |
42 | TARGET = qashmoney | 42 | TARGET = qashmoney |
43 | DESTDIR = $(OPIEDIR)/bin | 43 | DESTDIR = $(OPIEDIR)/bin |
44 | 44 | ||
45 | unix:LIBS += -lm | 45 | unix:LIBS += -lm |
46 | LIBS += -lqpe -lopiecore2 -lsqlite | 46 | LIBS += -lqpe -lopiecore2 -lsqlite3 |
47 | 47 | ||
48 | include ( $(OPIEDIR)/include.pro ) | 48 | include ( $(OPIEDIR)/include.pro ) |
49 | 49 | ||
50 | !isEmpty( LIBSQLITE_INC_DIR ) { | 50 | !isEmpty( LIBSQLITE_INC_DIR ) { |
51 | INCLUDEPATH = $$LIBSQLITE_INC_DIR $$INCLUDEPATH | 51 | INCLUDEPATH = $$LIBSQLITE_INC_DIR $$INCLUDEPATH |
52 | } | 52 | } |
53 | !isEmpty( LIBSQLITE_LIB_DIR ) { | 53 | !isEmpty( LIBSQLITE_LIB_DIR ) { |
54 | LIBS = -L$$LIBSQLITE_LIB_DIR $$LIBS | 54 | LIBS = -L$$LIBSQLITE_LIB_DIR $$LIBS |
diff --git a/noncore/apps/qashmoney/transaction.h b/noncore/apps/qashmoney/transaction.h index 5871555..3df43a8 100755 --- a/noncore/apps/qashmoney/transaction.h +++ b/noncore/apps/qashmoney/transaction.h | |||
@@ -1,15 +1,15 @@ | |||
1 | #ifndef TRANSACTION_H | 1 | #ifndef TRANSACTION_H |
2 | #define TRANSACTION_H | 2 | #define TRANSACTION_H |
3 | 3 | ||
4 | #include <qstring.h> | 4 | #include <qstring.h> |
5 | #include <qlistview.h> | 5 | #include <qlistview.h> |
6 | #include <qdatetime.h> | 6 | #include <qdatetime.h> |
7 | #include <sqlite.h> | 7 | #include <sqlite3.h> |
8 | 8 | ||
9 | #include "preferences.h" | 9 | #include "preferences.h" |
10 | 10 | ||
11 | class Transaction | 11 | class Transaction |
12 | { | 12 | { |
13 | public: | 13 | public: |
14 | 14 | ||
15 | Transaction (); | 15 | Transaction (); |
@@ -58,16 +58,16 @@ class Transaction | |||
58 | int getLineItemID ( int id ); | 58 | int getLineItemID ( int id ); |
59 | int getDay ( int ); | 59 | int getDay ( int ); |
60 | int getMonth ( int ); | 60 | int getMonth ( int ); |
61 | int getYear ( int ); | 61 | int getYear ( int ); |
62 | int getAccountID ( int id ); | 62 | int getAccountID ( int id ); |
63 | 63 | ||
64 | private: | 64 | private: |
65 | 65 | ||
66 | sqlite *tdb; | 66 | sqlite3 *tdb; |
67 | int rows, columns; | 67 | int rows, columns; |
68 | }; | 68 | }; |
69 | 69 | ||
70 | #endif | 70 | #endif |
71 | 71 | ||
72 | 72 | ||
73 | 73 | ||