7 files changed, 1 insertions, 7 deletions

diff --git a/noncore/apps/qashmoney/account.cpp b/noncore/apps/qashmoney/account.cpp
index 28f9ba2..181be23 100755
--- a/noncore/apps/qashmoney/account.cpp
+++ b/noncore/apps/qashmoney/account.cpp
@@ -1,24 +1,23 @@
 #include "account.h"
 #include "transaction.h"
 #include "transfer.h"
 #include "preferences.h"
 
 #include <qpixmap.h>
 #include <stdlib.h>
-#include <iostream.h>
 
 extern Preferences *preferences;
 
 Account::Account ()
   {
     adb = sqlite_open ( "qmaccounts.db", 0, NULL );
   }
 
 Account::~Account ()
   {
     sqlite_close ( adb );
   }
 
 void Account::addAccount ( QString name, int parentid, float balance, int type, QString description, float creditlimit,
 					int statementyear, int statementmonth, int statementday, float statementbalance, const char *currency  )
   {
diff --git a/noncore/apps/qashmoney/budget.cpp b/noncore/apps/qashmoney/budget.cpp
index 9f74078..2cec329 100755
--- a/noncore/apps/qashmoney/budget.cpp
+++ b/noncore/apps/qashmoney/budget.cpp
@@ -1,20 +1,19 @@
 #include "budget.h"
 #include "transaction.h"
 #include <stdlib.h>
-#include <iostream.h>
 
 extern Transaction *transaction;
 
 Budget::Budget ()
   {
     bdb = sqlite_open ( "qmbudgets.db", 0, NULL );
   }
 
 Budget::~Budget ()
   {
     sqlite_close ( bdb );
   }
 
 int Budget::addBudget ( QString name, int type, QString description, QString currency, int startday, int startmonth, int startyear, int endday, int endmonth, int endyear, int defaultview )
   {
     sqlite_exec_printf ( bdb, "insert into budgets values ( '%q', %i, '%q', '%q', %i, %i, %i, %i, %i, %i, %i, NULL );", 0, 0, 0, ( const char * ) name, type, ( const char * ) description, ( const char * ) currency, startday, startmonth, startyear, endday, endmonth, endyear, defaultview );
diff --git a/noncore/apps/qashmoney/qashmoney.cpp b/noncore/apps/qashmoney/qashmoney.cpp
index e985f0b..d4cbc14 100755
--- a/noncore/apps/qashmoney/qashmoney.cpp
+++ b/noncore/apps/qashmoney/qashmoney.cpp
@@ -1,22 +1,21 @@
 #include "qashmoney.h"
 #include "preferencedialogs.h"
 #include "memorydialog.h"
 
 #include <qheader.h>
-#include <iostream.h>
 
 Budget *budget = new Budget ();
 Preferences *preferences = new Preferences ();
 Account *account = new Account ();
 Transaction *transaction = new Transaction ();
 Transfer *transfer = new Transfer ();
 Memory *memory = new Memory ();
 
 QashMoney::QashMoney () : QWidget ()
   {
     preferences->addPreferences ();
     preferences->initializeColumnPreferences ();
     preferences->initializeSortingPreferences ();
 
     // set the text in the upper part of the frame
     setCaption ( tr ( "QashMoney" ) );
diff --git a/noncore/apps/qashmoney/qashmoney.pro b/noncore/apps/qashmoney/qashmoney.pro
index 8b4646a..ec29faa 100755
--- a/noncore/apps/qashmoney/qashmoney.pro
+++ b/noncore/apps/qashmoney/qashmoney.pro
@@ -30,20 +30,20 @@ SOURCES =	qashmoney.cpp \
                         preferencedialogs.cpp \
                         memory.cpp \
                         memorydialog.cpp \
                         newaccount.cpp \
                         calculator.cpp \
                         datepicker.cpp \
 			main.cpp \
                         budget.cpp \
                         budgetdisplay.cpp \
                         currency.cpp
 INCLUDEPATH = $(OPIEDIR)/include
 DEPENDPATH = $(OPIEDIR)/include
 
 DESTDIR = $(OPIEDIR)/bin
 
 unix:LIBS += -lm
-LIBS += -lqpe -lqte -lstdc++ -lsqlite
+LIBS += -lqpe -lqte -lsqlite
 
 include ( $(OPIEDIR)/include.pro )
 
diff --git a/noncore/apps/qashmoney/transaction.cpp b/noncore/apps/qashmoney/transaction.cpp
index dcf46b1..d008a4f 100755
--- a/noncore/apps/qashmoney/transaction.cpp
+++ b/noncore/apps/qashmoney/transaction.cpp
@@ -1,27 +1,26 @@
 // RESERVEDONE COLUMN NAME REPRESENTS THE LINEITEMID AND SHOULD BE CHANGED IN
 // FUTURE VERSIONS OF QASHMONEY
 
 // RESERVEDTWO REPRESENTS THE TRANSACTION DESCRIPTION
 
 #include "transaction.h"
 #include "account.h"
 #include "transactiondisplay.h"
 
 #include <stdlib.h>
-#include <iostream.h>
 
 extern Account *account;
 extern Preferences *preferences;
 
 Transaction::Transaction ()
   {
     tdb = sqlite_open ( "qmtransactions.db", 0, NULL );
   }
 
 Transaction::~Transaction ()
   {
     sqlite_close ( tdb );
   }
 
 void Transaction::addTransaction ( QString description, QString payee, int accountid, int parentid, int number, int day, int month, int year, float amount, int cleared, int budgetid, int lineitemid )
   {
diff --git a/noncore/apps/qashmoney/transactiondisplay.cpp b/noncore/apps/qashmoney/transactiondisplay.cpp
index 1839cd2..78b8a00 100755
--- a/noncore/apps/qashmoney/transactiondisplay.cpp
+++ b/noncore/apps/qashmoney/transactiondisplay.cpp
@@ -1,31 +1,30 @@
 #include "transactiondisplay.h"
 #include "newtransaction.h"
 #include "account.h"
 #include "budget.h"
 #include "memory.h"
 #include "transfer.h"
 #include "preferences.h"
 #include "calculator.h"
 #include "datepicker.h"
 
 #include <qdatetime.h>
 #include <qmessagebox.h>
 #include <qheader.h>
 #include <qmultilineedit.h>
-#include <iostream.h>
 #include <qdatetime.h>
 
 extern Transaction *transaction;
 extern Budget *budget;
 extern Account *account;
 extern Preferences *preferences;
 extern Memory *memory;
 extern Transfer *transfer;
 
 TransactionDisplay::TransactionDisplay ( QWidget* parent ) : QWidget ( parent )
   {
     // set transactiondisplay variables;
     accountid = 0;
     children = TRUE;
 
     firstline = new QHBox ( this );
diff --git a/noncore/apps/qashmoney/transfer.cpp b/noncore/apps/qashmoney/transfer.cpp
index c4bbaf9..ae1b748 100755
--- a/noncore/apps/qashmoney/transfer.cpp
+++ b/noncore/apps/qashmoney/transfer.cpp
@@ -1,21 +1,20 @@
 #include "transfer.h"
 #include "account.h"
 #include "transactiondisplay.h"
 #include <stdlib.h>
-#include <iostream.h>
 
 extern Account *account;
 extern Preferences *preferences;
 
 Transfer::Transfer ()
   {
     db = sqlite_open ( "qmtransfers.db", 0, 0 );
   }
 
 Transfer::~Transfer ()
   {
     sqlite_close ( db );
   }
 
 void Transfer::addTransfer ( int fromaccount, int fromparent, int toaccount, int toparent, int day, int month, int year, float amount, int cleared )
   {