-rw-r--r-- | noncore/apps/checkbook/cbinfo.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/checkbook/traninfo.cpp | 24 | ||||
-rw-r--r-- | noncore/apps/checkbook/traninfo.h | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/noncore/apps/checkbook/cbinfo.cpp b/noncore/apps/checkbook/cbinfo.cpp index 36dde04..6e3afa7 100644 --- a/noncore/apps/checkbook/cbinfo.cpp +++ b/noncore/apps/checkbook/cbinfo.cpp | |||
@@ -175,13 +175,13 @@ void CBInfo::loadTransactions() | |||
175 | if( i==-1 ) { | 175 | if( i==-1 ) { |
176 | i=1; | 176 | i=1; |
177 | bOld=true; | 177 | bOld=true; |
178 | } | 178 | } |
179 | while( i>=0 ) { | 179 | while( i>=0 ) { |
180 | _last=i; | 180 | _last=i; |
181 | tran=new TranInfo(config, i); | 181 | tran=new TranInfo(&config, i); |
182 | trandesc = tran->desc(); | 182 | trandesc = tran->desc(); |
183 | if( trandesc==QString::null ) { | 183 | if( trandesc==QString::null ) { |
184 | delete tran; | 184 | delete tran; |
185 | break; | 185 | break; |
186 | } | 186 | } |
187 | tl->append(tran); | 187 | tl->append(tran); |
diff --git a/noncore/apps/checkbook/traninfo.cpp b/noncore/apps/checkbook/traninfo.cpp index 4833af9..7bd2004 100644 --- a/noncore/apps/checkbook/traninfo.cpp +++ b/noncore/apps/checkbook/traninfo.cpp | |||
@@ -47,40 +47,40 @@ TranInfo::TranInfo( int id, const QString &desc, const QDate &date, bool withdra | |||
47 | f = fee; | 47 | f = fee; |
48 | cn = number; | 48 | cn = number; |
49 | n = notes; | 49 | n = notes; |
50 | _next=next; | 50 | _next=next; |
51 | } | 51 | } |
52 | 52 | ||
53 | TranInfo::TranInfo( Config config, int entry ) | 53 | TranInfo::TranInfo( Config *config, int entry ) |
54 | { | 54 | { |
55 | config.setGroup( QString::number( entry ) ); | 55 | config->setGroup( QString::number( entry ) ); |
56 | QString desc = config.readEntry( "Description", "Not Found" ); | 56 | QString desc = config->readEntry( "Description", "Not Found" ); |
57 | if ( desc != "Not Found" ) | 57 | if ( desc != "Not Found" ) |
58 | { | 58 | { |
59 | // ID | 59 | // ID |
60 | i = entry; | 60 | i = entry; |
61 | 61 | ||
62 | // Description | 62 | // Description |
63 | d = desc; | 63 | d = desc; |
64 | 64 | ||
65 | // Transaction date | 65 | // Transaction date |
66 | int yr, mn, dy; | 66 | int yr, mn, dy; |
67 | QString datestr = config.readEntry( "Date", "" ); | 67 | QString datestr = config->readEntry( "Date", "" ); |
68 | int begin, end; | 68 | int begin, end; |
69 | begin = datestr.find( '/' ); | 69 | begin = datestr.find( '/' ); |
70 | mn = datestr.left( begin ).toInt(); | 70 | mn = datestr.left( begin ).toInt(); |
71 | end = datestr.find( '/', ++begin ); | 71 | end = datestr.find( '/', ++begin ); |
72 | dy = datestr.mid( begin, end - begin ).toInt(); | 72 | dy = datestr.mid( begin, end - begin ).toInt(); |
73 | yr = datestr.right( datestr.length() - end - 1).toInt(); | 73 | yr = datestr.right( datestr.length() - end - 1).toInt(); |
74 | td.setYMD( yr, mn, dy ); | 74 | td.setYMD( yr, mn, dy ); |
75 | 75 | ||
76 | // Deposit/withdrawal indicator ( withdrawal == TRUE ) | 76 | // Deposit/withdrawal indicator ( withdrawal == TRUE ) |
77 | w = ( config.readEntry( "Payment", "false" ) == "true" ); | 77 | w = ( config->readEntry( "Payment", "false" ) == "true" ); |
78 | 78 | ||
79 | // Type | 79 | // Type |
80 | QString type = config.readEntry( "Type", "0" ); | 80 | QString type = config->readEntry( "Type", "0" ); |
81 | if ( w ) | 81 | if ( w ) |
82 | { // Withdrawal types | 82 | { // Withdrawal types |
83 | if( type == "0" ) | 83 | if( type == "0" ) |
84 | t = "Debit Charge"; | 84 | t = "Debit Charge"; |
85 | else if( type == "1" ) | 85 | else if( type == "1" ) |
86 | t = "Written Check"; | 86 | t = "Written Check"; |
@@ -99,31 +99,31 @@ TranInfo::TranInfo( Config config, int entry ) | |||
99 | t = "Transfer"; | 99 | t = "Transfer"; |
100 | else if( type == "3" ) | 100 | else if( type == "3" ) |
101 | t = "Cash"; | 101 | t = "Cash"; |
102 | } | 102 | } |
103 | 103 | ||
104 | // Category | 104 | // Category |
105 | c = config.readEntry( "Category", "" ); | 105 | c = config->readEntry( "Category", "" ); |
106 | 106 | ||
107 | // Transaction amount | 107 | // Transaction amount |
108 | QString stramount = config.readEntry( "Amount", "0.00" ); | 108 | QString stramount = config->readEntry( "Amount", "0.00" ); |
109 | bool ok; | 109 | bool ok; |
110 | a = stramount.toFloat( &ok ); | 110 | a = stramount.toFloat( &ok ); |
111 | 111 | ||
112 | // Transaction fee | 112 | // Transaction fee |
113 | stramount = config.readEntry( "TransactionFee", "0.00" ); | 113 | stramount = config->readEntry( "TransactionFee", "0.00" ); |
114 | f = stramount.toFloat( &ok ); | 114 | f = stramount.toFloat( &ok ); |
115 | 115 | ||
116 | // Transaction number | 116 | // Transaction number |
117 | cn = config.readEntry( "CheckNumber", "" ); | 117 | cn = config->readEntry( "CheckNumber", "" ); |
118 | 118 | ||
119 | // Notes | 119 | // Notes |
120 | n = config.readEntry( "Comments", "" ); | 120 | n = config->readEntry( "Comments", "" ); |
121 | 121 | ||
122 | // next | 122 | // next |
123 | _next = config.readNumEntry("Next", -1); | 123 | _next = config->readNumEntry("Next", -1); |
124 | } | 124 | } |
125 | } | 125 | } |
126 | 126 | ||
127 | // --- datestr ---------------------------------------------------------------- | 127 | // --- datestr ---------------------------------------------------------------- |
128 | const QString &TranInfo::datestr(bool bDisplayDate) | 128 | const QString &TranInfo::datestr(bool bDisplayDate) |
129 | { | 129 | { |
diff --git a/noncore/apps/checkbook/traninfo.h b/noncore/apps/checkbook/traninfo.h index cbe0238..2ecb60d 100644 --- a/noncore/apps/checkbook/traninfo.h +++ b/noncore/apps/checkbook/traninfo.h | |||
@@ -38,13 +38,13 @@ class TranInfo | |||
38 | { | 38 | { |
39 | public: | 39 | public: |
40 | TranInfo( int = 0, const QString & = 0x0, const QDate & = QDate::currentDate(), | 40 | TranInfo( int = 0, const QString & = 0x0, const QDate & = QDate::currentDate(), |
41 | bool = TRUE, const QString & = 0x0, const QString & = 0x0, | 41 | bool = TRUE, const QString & = 0x0, const QString & = 0x0, |
42 | float = 0.0, float = 0.0, | 42 | float = 0.0, float = 0.0, |
43 | const QString & = 0x0, const QString & = 0x0, int =-1 ); | 43 | const QString & = 0x0, const QString & = 0x0, int =-1 ); |
44 | TranInfo( Config, int ); | 44 | TranInfo( Config *, int ); |
45 | 45 | ||
46 | // getters | 46 | // getters |
47 | int id() const { return i; } | 47 | int id() const { return i; } |
48 | const QString &getIdStr(); | 48 | const QString &getIdStr(); |
49 | 49 | ||
50 | const QString &desc() const { return d; } | 50 | const QString &desc() const { return d; } |