From kde-commits Sun May 17 12:44:43 2009 From: Laurent Montel Date: Sun, 17 May 2009 12:44:43 +0000 To: kde-commits Subject: playground/office/kmymoney/kmymoney2/plugins/ofximport/dialogs Message-Id: <1242564283.840655.24930.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=124256429107364 SVN commit 969062 by mlaurent: use qt3to4 M +3 -3 kofxdirectconnectdlg.cpp M +11 -9 konlinebankingsetupwizard.cpp M +17 -8 konlinebankingsetupwizard.h M +1 -1 konlinebankingstatus.cpp M +13 -10 mymoneyofxconnector.cpp --- trunk/playground/office/kmymoney/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp #969061:969062 @@ -23,7 +23,7 @@ #include #include #include -#include +#include // ---------------------------------------------------------------------------- // KDE Includes @@ -80,7 +80,7 @@ #if 0 QFile g( "request.ofx" ); g.open( QIODevice::WriteOnly ); - QTextStream(&g) << m_connector.url() << "\n" << QString(request); + Q3TextStream(&g) << m_connector.url() << "\n" << QString(request); g.close(); #endif @@ -188,7 +188,7 @@ QFile f( m_tmpfile->name() ); if ( f.open( QIODevice::ReadOnly ) ) { - QTextStream stream( &f ); + Q3TextStream stream( &f ); QString line; while ( !stream.atEnd() ) { details += stream.readLine(); // line of text excluding '\n' --- trunk/playground/office/kmymoney/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp #969061:969062 @@ -20,13 +20,15 @@ // ---------------------------------------------------------------------------- // QT Includes -#include +#include #include #include #include #include #include #include +//Added by qt3to4: +#include // ---------------------------------------------------------------------------- // KDE Includes @@ -53,11 +55,11 @@ { public: QFile m_fpTrace; - QTextStream m_trace; + Q3TextStream m_trace; }; -KOnlineBankingSetupWizard::KOnlineBankingSetupWizard(QWidget *parent, const char *name): - KOnlineBankingSetupDecl(parent,name), +KOnlineBankingSetupWizard::KOnlineBankingSetupWizard(QWidget *parent): + KOnlineBankingSetupDecl(parent), d(new Private), m_fDone(false), m_fInit(false), @@ -127,7 +129,7 @@ if(m_selectionTab->currentPageIndex() == 0) { // Get the fipids for the selected bank - QListViewItem* item = m_listFi->currentItem(); + Q3ListViewItem* item = m_listFi->currentItem(); if ( item ) { QString bank = item->text(0); @@ -346,7 +348,7 @@ kvps.setValue("fid",(*(pthis->m_it_info)).fid); kvps.setValue("org",(*(pthis->m_it_info)).org); kvps.setValue("fipid",""); - QListViewItem* item = pthis->m_listFi->currentItem(); + Q3ListViewItem* item = pthis->m_listFi->currentItem(); if ( item ) kvps.setValue("bankname",item->text(0)); @@ -402,7 +404,7 @@ if ( m_fDone ) { - QListViewItem* qitem = m_listAccount->currentItem(); + Q3ListViewItem* qitem = m_listAccount->currentItem(); ListViewItem* item = dynamic_cast(qitem); if ( item ) { @@ -422,8 +424,8 @@ return result; } -KOnlineBankingSetupWizard::ListViewItem::ListViewItem( QListView* parent, const MyMoneyKeyValueContainer& kvps ): - MyMoneyKeyValueContainer( kvps ), QListViewItem( parent ) +KOnlineBankingSetupWizard::ListViewItem::ListViewItem( Q3ListView* parent, const MyMoneyKeyValueContainer& kvps ): + MyMoneyKeyValueContainer( kvps ), Q3ListViewItem( parent ) { setText( 0, value("accountid") ); setText( 1, value("type") ); --- trunk/playground/office/kmymoney/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.h #969061:969062 @@ -27,8 +27,8 @@ // QT Includes #include -#include -#include +#include +#include // ---------------------------------------------------------------------------- // KDE Includes @@ -36,7 +36,7 @@ // ---------------------------------------------------------------------------- // Project Includes -#include "konlinebankingsetupdecl.h" +#include "ui_konlinebankingsetupdecl.h" #include class OfxAppVersion; class OfxHeaderVersion; @@ -58,18 +58,27 @@ * they wanted. * */ + +class KOnlineBankingSetupDecl : public Q3Wizard, public Ui::KOnlineBankingSetupDecl +{ +public: + KOnlineBankingSetupDecl( QWidget *parent ) : Q3Wizard( parent ) { + setupUi( this ); + } +}; + class KOnlineBankingSetupWizard : public KOnlineBankingSetupDecl { Q_OBJECT public: - class ListViewItem: public MyMoneyKeyValueContainer, public QListViewItem + class ListViewItem: public MyMoneyKeyValueContainer, public Q3ListViewItem { public: - ListViewItem( QListView* parent, const MyMoneyKeyValueContainer& kvps ); + ListViewItem( Q3ListView* parent, const MyMoneyKeyValueContainer& kvps ); virtual void x(void); }; - KOnlineBankingSetupWizard(QWidget *parent=0, const char *name=0); + KOnlineBankingSetupWizard(QWidget *parent=0); ~KOnlineBankingSetupWizard(); bool chosenSettings( MyMoneyKeyValueContainer& settings ); @@ -94,8 +103,8 @@ /// \internal d-pointer instance. Private* const d; - QValueList m_bankInfo; - QValueList::const_iterator m_it_info; + Q3ValueList m_bankInfo; + Q3ValueList::const_iterator m_it_info; bool m_fDone; bool m_fInit; OfxAppVersion* m_appId; --- trunk/playground/office/kmymoney/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp #969061:969062 @@ -28,7 +28,7 @@ #include #include #include -#include +#include // ---------------------------------------------------------------------------- // KDE Includes --- trunk/playground/office/kmymoney/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp #969061:969062 @@ -27,6 +27,9 @@ #include #include +//Added by qt3to4: +#include +#include // ---------------------------------------------------------------------------- // KDE Includes @@ -500,8 +503,8 @@ MyMoneyTransactionFilter filter; filter.setDateFilter(_dtstart,QDate::currentDate()); filter.addAccount(m_account.id()); - QValueList transactions = file->transactionList(filter); - QValueList::const_iterator it_transaction = transactions.begin(); + Q3ValueList transactions = file->transactionList(filter); + Q3ValueList::const_iterator it_transaction = transactions.begin(); while ( it_transaction != transactions.end() ) { transactionlist += transaction( *it_transaction ); @@ -527,8 +530,8 @@ MyMoneyTransactionFilter filter; filter.setDateFilter(_dtstart,QDate::currentDate()); filter.addAccount(m_account.id()); - QValueList transactions = file->transactionList(filter); - QValueList::const_iterator it_transaction = transactions.begin(); + Q3ValueList transactions = file->transactionList(filter); + Q3ValueList::const_iterator it_transaction = transactions.begin(); while ( it_transaction != transactions.end() ) { transactionlist += transaction( *it_transaction ); @@ -555,8 +558,8 @@ filter.setDateFilter(_dtstart,QDate::currentDate()); filter.addAccount(m_account.id()); filter.addAccount(m_account.accountList()); - QValueList transactions = file->transactionList(filter); - QValueList::const_iterator it_transaction = transactions.begin(); + Q3ValueList transactions = file->transactionList(filter); + Q3ValueList::const_iterator it_transaction = transactions.begin(); while ( it_transaction != transactions.end() ) { transactionlist += investmentTransaction( *it_transaction ); @@ -637,7 +640,7 @@ //Use this version for inv transactions MyMoneySplit s = _t.splitByAccount( m_account.accountList(), true ); - QCString stockid = file->account(s.accountId()).currencyId(); + Q3CString stockid = file->account(s.accountId()).currencyId(); Tag invtran("INVTRAN"); invtran.element("FITID",_t.id()).element("DTTRADE",_t.postDate().toString(Qt::ISODate).remove(QRegExp("[^0-9]"))); @@ -690,12 +693,12 @@ else if ( s.action() == MyMoneySplit::ActionDividend ) { // find the split with the category, which has the actual amount of the dividend - QValueList splits = _t.splits(); - QValueList::const_iterator it_split = splits.begin(); + Q3ValueList splits = _t.splits(); + Q3ValueList::const_iterator it_split = splits.begin(); bool found = false; while( it_split != splits.end() ) { - QCString accid = (*it_split).accountId(); + Q3CString accid = (*it_split).accountId(); MyMoneyAccount acc = file->account(accid); if ( acc.accountType() == MyMoneyAccount::Income || acc.accountType() == MyMoneyAccount::Expense ) {