merge noncore/apps/* except

 - advancedfm (ljp, please...)
 - odict (tille, please...)

1 files changed, 19 insertions, 1 deletions

diff --git a/noncore/apps/checkbook/cbinfo.h b/noncore/apps/checkbook/cbinfo.h
index 5e65db2..0b5b818 100644
--- a/noncore/apps/checkbook/cbinfo.h
+++ b/noncore/apps/checkbook/cbinfo.h
@@ -26,12 +26,13 @@
 
 */
 
 #ifndef CBINFO_H
 #define CBINFO_H
 
+#include <qwidget.h>
 #include <qlist.h>
 #include <qstring.h>
 
 class Config;
 class TranInfo;
 class TranInfoList;
@@ -60,30 +61,47 @@ class CBInfo
 		void setBank( const QString &bank )			{ bn = bank; }
 		void setAccount( const QString &account )		{ a = account; }
 		void setPin( const QString &pin )				{ p = pin; }
 		void setNotes( const QString &notes )			{ nt = notes; }
 		void setStartingBalance( float startbal )		{ sb = startbal; }
 
+        // write
 		void     write();
 
+        // transactions
 		TranInfoList *transactions()		const { return tl; }
-		TranInfo     *findTransaction( const QString &, const QString &, const QString & );
+		TranInfo *findTransaction( const QString & );
 		void           addTransaction( TranInfo * );
 		void           removeTransaction( TranInfo * );
 
+        // lastTab
+        void setLastTab(const QString &sLastTab) { _sLastTab=sLastTab; }
+        QString &getLastTab() { return(_sLastTab); }
+
+        // getNextNumber
+        int getNextNumber() { return( ++_last ); }
+
+        // sortOrder
+        void setSortOrder(const QString &sSortOrder) { _sSortOrder=sSortOrder; }
+        QString &getSortOrder() { return(_sSortOrder); }
+
 	private:
 		QString n;
 		QString fn;
 		QString pw;
 		QString t;
 		QString bn;
 		QString a;
 		QString p;
 		QString nt;
 		float   sb;
 		float   b;
+        QString _sLastTab;
+        int _first;
+        int _last;
+        QString _sSortOrder;
 
 		TranInfoList *tl;
 
 		void loadTransactions();
 		void calcBalance();
 };