summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xnoncore/apps/qashmoney/account.h4
-rwxr-xr-xnoncore/apps/qashmoney/budget.h4
-rwxr-xr-xnoncore/apps/qashmoney/memory.h4
-rwxr-xr-xnoncore/apps/qashmoney/preferences.h4
-rwxr-xr-xnoncore/apps/qashmoney/qashmoney.pro2
-rwxr-xr-xnoncore/apps/qashmoney/transaction.h4
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,19 +1,19 @@
#ifndef ACCOUNT_H
#define ACCOUNT_H
#include <qstring.h>
#include <qlistview.h>
#include <qcombobox.h>
-#include <sqlite.h>
+#include <sqlite3.h>
class Account
{
public:
Account ();
~Account ();
// This function adds a new account to the database. It takes the account name, parent,
// initial balance and the account type, description, credit limit, statementbalancedate
// as three integers, and the statementbalance amount
// The parent is an integer account id. Its -1 if there is no parent
@@ -71,25 +71,25 @@ class Account
// Returns account description and name
QString getAccountDescription ( int accountid );
QString getCurrencyCode ( int accountid );
QString getAccountName ( int accountid );
QStringList getAccountNames ();
QStringList getAccountIDs ();
QString getAccountBalance ( int accountid );
// returns account credit limit
float getAccountCreditLimit ( int );
// The primary database that stores all our data
- sqlite *adb;
+ sqlite3 *adb;
};
class GreyBackgroundItem : public QListViewItem
{
public:
GreyBackgroundItem ( QListView *parent );
GreyBackgroundItem ( QListView *parent, QString label1, QString label2, QString label3 );
GreyBackgroundItem ( QListView *parent, QString label1, QString label2, QString label3, QString label4 );
GreyBackgroundItem ( QListView *parent, QString label1, QString label2, QString label3, QString label4, QString label5 );
virtual void paintCell ( QPainter *p, const QColorGroup &cg, int column, int width, int alignment );
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,19 +1,19 @@
#ifndef BUDGET_H
#define BUDGET_H
#include <qstring.h>
#include <qstringlist.h>
#include <qlistview.h>
-#include <sqlite.h>
+#include <sqlite3.h>
class Budget
{
public:
Budget ();
~Budget ();
int addBudget ( QString name, int type, QString description, QString currency, int startday, int startmonth, int startyear, int endday, int endmonth, int endyear, int defaultview );
void updateBudget ( QString name, QString description, QString currency, int budgetid );
void deleteBudget ( int budgetid );
int getNumberOfBudgets ();
@@ -29,17 +29,17 @@ class Budget
QString getBudgetTotal ( int budgetid, int viewtype );
int getLastAdded ();
int addLineItem ( int budgetid, QString lineitemname, float lineitemamount, int lineitemtype );
void updateLineItem ( QString lineitemname, float lineitemamount, int lineitemtype, int budgetid, int lineitemid );
void displayLineItems ( int budgetid, QListView *listview, int month, int year, int viewtype );
void deleteLineItem ( int budgetid, int lineitemid );
int getLineItemTime ( int budgetid, int lineitemid );
float getLineItemAmount ( int budgetid, int lineitemid );
private:
- sqlite *bdb;
+ sqlite3 *bdb;
};
#endif
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,19 +1,19 @@
#ifndef MEMORY_H
#define MEMORY_H
#include <qstring.h>
#include <qlistbox.h>
#include <qcombobox.h>
-#include <sqlite.h>
+#include <sqlite3.h>
class Memory : public QObject
{
Q_OBJECT
public:
Memory ();
~Memory ();
// This function adds a new memory to the database. It takes the memory name, parent,
@@ -24,22 +24,22 @@ class Memory : public QObject
// Returns the number of checking memorys
int getNumberOfMemoryItems ();
void changeMemoryName ( QString );
// This takes a QListView and puts parents and children memorys
// into the list view
void displayMemoryItems ( QListBox * );
void displayMemoryItems ( QComboBox * );
// The primary database that stores all our data
- sqlite *db;
+ sqlite3 *db;
public slots:
// Deletes a memory item. Takes the memoryid as its parameter
void deleteMemoryItem ( QString );
};
#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,13 +1,13 @@
-#include <sqlite.h>
+#include <sqlite3.h>
#include <qstring.h>
#ifndef PREFERENCES_H
#define PREFERENCES_H
class Preferences
{
public:
Preferences ();
~Preferences ();
void addPreferences ();
@@ -20,25 +20,25 @@ class Preferences
void getSortingPreference ( int id, int *column, int *direction );
// Convenience for getting date separator with one function
// call. Takes the preference id as its argument
QString getSeparator ( );
// Changes a preference for the given ID
void changePreference ( int , int );
void changeColumnPreference ( int id, int width );
void changeSortingPreference ( int id, int column );
// The primary database that stores all our data
- sqlite *db;
+ sqlite3 *db;
// This function returns a Qstring for the year first date formats
// for displaying. It takes the date numbers
QString getDate ( int, int, int );
QString getDate ( int y, int m );
void setDefaultDatePreferences ();
};
#endif
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
@@ -34,22 +34,22 @@ SOURCES = qashmoney.cpp \
calculator.cpp \
datepicker.cpp \
main.cpp \
budget.cpp \
budgetdisplay.cpp \
currency.cpp
INCLUDEPATH = $(OPIEDIR)/include
DEPENDPATH = $(OPIEDIR)/include
TARGET = qashmoney
DESTDIR = $(OPIEDIR)/bin
unix:LIBS += -lm
-LIBS += -lqpe -lopiecore2 -lsqlite
+LIBS += -lqpe -lopiecore2 -lsqlite3
include ( $(OPIEDIR)/include.pro )
!isEmpty( LIBSQLITE_INC_DIR ) {
INCLUDEPATH = $$LIBSQLITE_INC_DIR $$INCLUDEPATH
}
!isEmpty( LIBSQLITE_LIB_DIR ) {
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,19 +1,19 @@
#ifndef TRANSACTION_H
#define TRANSACTION_H
#include <qstring.h>
#include <qlistview.h>
#include <qdatetime.h>
-#include <sqlite.h>
+#include <sqlite3.h>
#include "preferences.h"
class Transaction
{
public:
Transaction ();
~Transaction ();
// This function adds a new transaction to the database. It takes the payee, accountid,
// budgetid, number, day, month, year, amount, cleared
@@ -54,20 +54,20 @@ class Transaction
QString getAbsoluteAmount ( int );
int getCleared ( int );
void setCleared ( int id, int cleared );
int getBudgetID ( int id );
int getLineItemID ( int id );
int getDay ( int );
int getMonth ( int );
int getYear ( int );
int getAccountID ( int id );
private:
- sqlite *tdb;
+ sqlite3 *tdb;
int rows, columns;
};
#endif