merge noncore/apps/* except

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

1 files changed, 3 insertions, 3 deletions

diff --git a/noncore/apps/checkbook/transaction.h b/noncore/apps/checkbook/transaction.h
index 000aee7..fbe9cd3 100644
--- a/noncore/apps/checkbook/transaction.h
+++ b/noncore/apps/checkbook/transaction.h
@@ -37,26 +37,26 @@ class QLineEdit;
 class QMultiLineEdit;
 class QPushButton;
 class QRadioButton;
 class QString;
 class QWidget;
 class TranInfo;
+class Cfg;
 
 class Transaction : public QDialog
 {
 	Q_OBJECT
 
 	public:
-		Transaction( QWidget * = 0x0, const QString & = 0x0, TranInfo * = 0x0,
-					 const QString & = "$" );
+		Transaction( QWidget *, const QString &, TranInfo *, Cfg *);
 		~Transaction();
 
 	private:
 		TranInfo *tran;
 
-		QString currencySymbol;
+		Cfg *_pCfg;
 
 		QRadioButton   *withBtn;
 		QRadioButton   *depBtn;
 		QPushButton    *dateBtn;
 		DateBookMonth  *datePicker;
 		QLineEdit      *numEdit;