diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-05 06:00:29 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-05 06:00:29 +0000 |
commit | fecb0e67b23e8b83ba7fc881bb57bc48c0852d62 (patch) | |
tree | 6b8614802f0d01b353bc9ba78aff2090846c198e /kmymoney2/wizards/newuserwizard | |
parent | dadc34655c3ab961b0b0b94a10eaaba710f0b5e8 (diff) | |
download | kmymoney-fecb0e67b23e8b83ba7fc881bb57bc48c0852d62.tar.gz kmymoney-fecb0e67b23e8b83ba7fc881bb57bc48c0852d62.zip |
TQt4 port kmymoney
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmymoney@1239855 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmymoney2/wizards/newuserwizard')
10 files changed, 130 insertions, 118 deletions
diff --git a/kmymoney2/wizards/newuserwizard/kaccountpagedecl.ui b/kmymoney2/wizards/newuserwizard/kaccountpagedecl.ui index e0e3620..9d76f0d 100644 --- a/kmymoney2/wizards/newuserwizard/kaccountpagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kaccountpagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KAccountPageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KAccountPageDecl</cstring> </property> @@ -27,7 +27,7 @@ <string>A typical KMyMoney user maintains a checking a account with some institution and uses it to receive money or pay bills. If this is not the case, please deselect the checkbox below and continue on the next page.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_haveCheckingAccountButton</cstring> </property> @@ -35,7 +35,7 @@ <string>I have a checking account that I want to manage with KMyMoney</string> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>m_accountDataFrame</cstring> </property> @@ -68,7 +68,7 @@ <string>Each institution has a routing number. Enter it here. If uncertain, leave the field blank. You can modify it later.</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -76,7 +76,7 @@ <string>Name of the institution</string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -100,7 +100,7 @@ <string>Enter a descriptive name that will be used by KMyMoney to identify your checking account.</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -108,9 +108,9 @@ <string>Opening date</string> </property> </widget> - <widget class="QLayoutWidget" row="3" column="1"> + <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>81</width> <height>20</height> @@ -143,7 +143,7 @@ </spacer> </hbox> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -151,7 +151,7 @@ <string>Number of the account</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -159,7 +159,7 @@ <string>Name of the account</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -167,15 +167,15 @@ <string>Opening balance</string> </property> </widget> - <widget class="QLayoutWidget" row="4" column="1"> + <widget class="TQLayoutWidget" row="4" column="1"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_accountCurrencyLabel</cstring> </property> @@ -204,7 +204,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>200</width> <height>20</height> @@ -236,7 +236,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -264,5 +264,9 @@ <tabstop>kActiveLabel2</tabstop> <tabstop>kActiveLabel1</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newuserwizard/kcurrencypagedecl.ui b/kmymoney2/wizards/newuserwizard/kcurrencypagedecl.ui index 579bf1e..8705796 100644 --- a/kmymoney2/wizards/newuserwizard/kcurrencypagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kcurrencypagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KCurrencyPageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KCurrencyPageDecl</cstring> </property> @@ -27,9 +27,9 @@ <string>KMyMoney supports multiple currencies. Your reports will be based on a default curreny which you can select here. The default for new accounts is also the currency you select here.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout19</cstring> + <cstring>tqlayout19</cstring> </property> <hbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>21</height> @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>21</height> @@ -78,5 +78,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui b/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui index dcae784..527c6eb 100644 --- a/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KFilePageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KFilePageDecl</cstring> </property> @@ -42,7 +42,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -82,5 +82,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newuserwizard/kgeneralpagedecl.ui b/kmymoney2/wizards/newuserwizard/kgeneralpagedecl.ui index 916493d..d1aa51d 100644 --- a/kmymoney2/wizards/newuserwizard/kgeneralpagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kgeneralpagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KGeneralPageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KGeneralPageDecl</cstring> </property> @@ -26,19 +26,19 @@ This information will be seen and used only by you. The information is used to personalize KMyMoney, to encrypt your file, etc.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame8</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>25</width> <height>0</height> @@ -51,27 +51,27 @@ This information will be seen and used only by you. The information is used to p <enum>Plain</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout20</cstring> + <cstring>tqlayout20</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -81,26 +81,26 @@ This information will be seen and used only by you. The information is used to p <string>County/State:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>m_userNameEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>m_countyEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>m_townEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -110,16 +110,16 @@ This information will be seen and used only by you. The information is used to p <string>Street:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>m_streetEdit</cstring> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>TextLabel7</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -129,7 +129,7 @@ This information will be seen and used only by you. The information is used to p <string>Email:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -137,11 +137,11 @@ This information will be seen and used only by you. The information is used to p <string>Your name:</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>TextLabel6</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -151,11 +151,11 @@ This information will be seen and used only by you. The information is used to p <string>Telephone:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -165,16 +165,16 @@ This information will be seen and used only by you. The information is used to p <string>Town:</string> </property> </widget> - <widget class="QLineEdit" row="6" column="1"> + <widget class="TQLineEdit" row="6" column="1"> <property name="name"> <cstring>m_emailEdit</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -184,21 +184,21 @@ This information will be seen and used only by you. The information is used to p <string>Zip code</string> </property> </widget> - <widget class="QLineEdit" row="5" column="1"> + <widget class="TQLineEdit" row="5" column="1"> <property name="name"> <cstring>m_telephoneEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>m_zipcodeEdit</cstring> </property> </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> @@ -222,7 +222,7 @@ This information will be seen and used only by you. The information is used to p <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>20</height> @@ -233,11 +233,11 @@ This information will be seen and used only by you. The information is used to p </widget> </vbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame8_2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>25</width> <height>0</height> @@ -254,5 +254,5 @@ This information will be seen and used only by you. The information is used to p </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newuserwizard/kintropagedecl.ui b/kmymoney2/wizards/newuserwizard/kintropagedecl.ui index d9dd326..b0bed68 100644 --- a/kmymoney2/wizards/newuserwizard/kintropagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kintropagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KIntroPageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KIntroPageDecl</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -29,7 +29,7 @@ <property name="text"> <string>Welcome to KMyMoney!</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -53,7 +53,7 @@ On the next few pages you will be guided through the steps necessary to setup th <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>41</height> @@ -62,5 +62,5 @@ On the next few pages you will be guided through the steps necessary to setup th </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp index 608afb6..d8607fc 100644 --- a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp +++ b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp @@ -20,12 +20,12 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qpixmap.h> -#include <qbitmap.h> -#include <qcheckbox.h> -#include <qpushbutton.h> -#include <qdir.h> -#include <qlabel.h> +#include <tqpixmap.h> +#include <tqbitmap.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> +#include <tqdir.h> +#include <tqlabel.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -68,8 +68,8 @@ using namespace NewUserWizard; static int stepCount; -NewUserWizard::Wizard::Wizard(QWidget *parent, const char *name, bool modal, WFlags flags) : - KMyMoneyWizard(parent, name, modal, flags), +NewUserWizard::Wizard::Wizard(TQWidget *tqparent, const char *name, bool modal, WFlags flags) : + KMyMoneyWizard(tqparent, name, modal, flags), m_introPage(0) { bool isFirstTime = KMyMoneyGlobalSettings::firstTimeRun(); @@ -108,7 +108,7 @@ MyMoneyPayee NewUserWizard::Wizard::user(void) const return m_generalPage->user(); } -QString NewUserWizard::Wizard::url(void) const +TQString NewUserWizard::Wizard::url(void) const { return m_filePage->m_dataFileEdit->url(); } @@ -150,7 +150,7 @@ MyMoneySecurity NewUserWizard::Wizard::baseCurrency(void) const return m_baseCurrency; } -QValueList<MyMoneyTemplate> NewUserWizard::Wizard::templates(void) const +TQValueList<MyMoneyTemplate> NewUserWizard::Wizard::templates(void) const { return m_categoriesPage->selectedTemplates(); } @@ -172,8 +172,8 @@ GeneralPage::GeneralPage(Wizard* wizard, const char* name) : { m_userNameEdit->setFocus(); KABC::StdAddressBook *ab = KABC::StdAddressBook::self(true); - connect(ab, SIGNAL(addressBookChanged(AddressBook*)), this, SLOT(slotAddressBookLoaded())); - connect(m_loadAddressButton, SIGNAL(clicked()), this, SLOT(slotLoadFromKABC())); + connect(ab, TQT_SIGNAL(addressBookChanged(AddressBook*)), this, TQT_SLOT(slotAddressBookLoaded())); + connect(m_loadAddressButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLoadFromKABC())); m_loadAddressButton->setEnabled(false); } @@ -205,10 +205,10 @@ void GeneralPage::slotLoadFromKABC(void) m_telephoneEdit->setText( phone.number() ); KABC::Address a = addr.address( KABC::Address::Home ); - QString sep; + TQString sep; if(!a.country().isEmpty() && !a.region().isEmpty()) sep = " / "; - m_countyEdit->setText(QString("%1%2%3").arg(a.country(), sep, a.region())); + m_countyEdit->setText(TQString("%1%2%3").tqarg(a.country(), sep, a.region())); m_postcodeEdit->setText( a.postalCode() ); m_townEdit->setText( a.locality() ); m_streetEdit->setText( a.street() ); @@ -223,25 +223,25 @@ CurrencyPage::CurrencyPage(Wizard* wizard, const char* name) : Currency(wizard), WizardPage<Wizard>(stepCount++, this, wizard, name) { - QListViewItem *first = 0; - QValueList<MyMoneySecurity> list = MyMoneyFile::instance()->currencyList(); - QValueList<MyMoneySecurity>::const_iterator it; + TQListViewItem *first = 0; + TQValueList<MyMoneySecurity> list = MyMoneyFile::instance()->currencyList(); + TQValueList<MyMoneySecurity>::const_iterator it; - QString localCurrency(localeconv()->int_curr_symbol); + TQString localCurrency(localeconv()->int_curr_symbol); localCurrency.truncate(3); - QString baseCurrency = MyMoneyFile::instance()->baseCurrency().id(); + TQString baseCurrency = MyMoneyFile::instance()->baseCurrency().id(); // construct a transparent 16x16 pixmap - QPixmap empty(16, 16); - empty.setMask(QBitmap(16, 16, true)); + TQPixmap empty(16, 16); + empty.setMask(TQBitmap(16, 16, true)); m_currencyList->clear(); for(it = list.begin(); it != list.end(); ++it) { - QListViewItem* p = insertCurrency(*it); + TQListViewItem* p = insertCurrency(*it); if((*it).id() == baseCurrency) { first = p; - p->setPixmap(0, QPixmap( locate("icon","hicolor/16x16/apps/kmymoney2.png"))); + p->setPixmap(0, TQPixmap( locate("icon","hicolor/16x16/apps/kmymoney2.png"))); } else { p->setPixmap(0, empty); } @@ -276,10 +276,10 @@ AccountPage::AccountPage(Wizard* wizard, const char* name) : WizardPage<Wizard>(stepCount, this, wizard, name) // don't inc. the step count here { m_mandatoryGroup->add(m_accountNameEdit); - connect(m_mandatoryGroup, SIGNAL(stateChanged()), object(), SIGNAL(completeStateChanged())); - connect(m_haveCheckingAccountButton, SIGNAL(toggled(bool)), object(), SIGNAL(completeStateChanged())); + connect(m_mandatoryGroup, TQT_SIGNAL(stateChanged()), object(), TQT_SIGNAL(completeStateChanged())); + connect(m_haveCheckingAccountButton, TQT_SIGNAL(toggled(bool)), object(), TQT_SIGNAL(completeStateChanged())); m_accountNameEdit->setFocus(); - m_openingDateEdit->setDate(QDate(QDate::currentDate().year(),1,1)); + m_openingDateEdit->setDate(TQDate(TQDate::tqcurrentDate().year(),1,1)); } KMyMoneyWizardPage* AccountPage::nextPage(void) const @@ -303,7 +303,7 @@ KMyMoneyWizardPage* CategoriesPage::nextPage(void) const return m_wizard->m_preferencePage; } -QValueList<MyMoneyTemplate> CategoriesPage::selectedTemplates(void) const +TQValueList<MyMoneyTemplate> CategoriesPage::selectedTemplates(void) const { return m_templateSelector->selectedTemplates(); } @@ -312,7 +312,7 @@ PreferencePage::PreferencePage(Wizard* wizard, const char* name) : KPreferencePageDecl(wizard), WizardPage<Wizard>(stepCount++, this, wizard, name) { - connect(m_openConfigButton, SIGNAL(clicked()), kmymoney2, SLOT(slotSettings())); + connect(m_openConfigButton, TQT_SIGNAL(clicked()), kmymoney2, TQT_SLOT(slotSettings())); } KMyMoneyWizardPage* PreferencePage::nextPage(void) const @@ -325,11 +325,11 @@ FilePage::FilePage(Wizard* wizard, const char* name) : WizardPage<Wizard>(stepCount++, this, wizard, name) { m_mandatoryGroup->add(m_dataFileEdit->lineEdit()); - connect(m_mandatoryGroup, SIGNAL(stateChanged()), object(), SIGNAL(completeStateChanged())); + connect(m_mandatoryGroup, TQT_SIGNAL(stateChanged()), object(), TQT_SIGNAL(completeStateChanged())); KUser user; m_dataFileEdit->setShowLocalProtocol(false); - m_dataFileEdit->setURL(QString("%1/%2.kmy").arg(QDir::homeDirPath(), user.loginName())); + m_dataFileEdit->setURL(TQString("%1/%2.kmy").tqarg(TQDir::homeDirPath(), user.loginName())); // allow selection of non-existing files m_dataFileEdit->setMode(KFile::File); @@ -346,7 +346,7 @@ bool FilePage::isComplete(void) const // b) the directory does exist rc = !KIO::NetAccess::exists(m_dataFileEdit->url(), false, m_wizard); if(rc) { - QRegExp exp("(.*)/(.*)"); + TQRegExp exp("(.*)/(.*)"); rc = false; if(exp.search(m_dataFileEdit->url()) != -1) { if(exp.cap(2).length() > 0) { diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard.h b/kmymoney2/wizards/newuserwizard/knewuserwizard.h index a8cd8d5..25e010f 100644 --- a/kmymoney2/wizards/newuserwizard/knewuserwizard.h +++ b/kmymoney2/wizards/newuserwizard/knewuserwizard.h @@ -21,7 +21,7 @@ // ---------------------------------------------------------------------------- // QT Includes -class QString; +class TQString; // ---------------------------------------------------------------------------- // Project Includes @@ -65,8 +65,9 @@ class Wizard : public KMyMoneyWizard friend class FilePage; Q_OBJECT + TQ_OBJECT public: - Wizard(QWidget* parent = 0, const char* name = 0, bool modal = false, WFlags flags = 0); + Wizard(TQWidget* tqparent = 0, const char* name = 0, bool modal = false, WFlags flags = 0); /** * Returns the personal information of the user (e.g. name, address, etc.) */ @@ -75,7 +76,7 @@ public: /** * Returns the URL that the user has chosen to store the file */ - QString url(void) const; + TQString url(void) const; /** * Returns the information about an institution if entered by @@ -104,7 +105,7 @@ public: /** * Returns a list of templates including accounts to be created */ - QValueList<MyMoneyTemplate> templates(void) const; + TQValueList<MyMoneyTemplate> templates(void) const; private: MyMoneySecurity m_baseCurrency; diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard_p.h b/kmymoney2/wizards/newuserwizard/knewuserwizard_p.h index aa62725..ea1910a 100644 --- a/kmymoney2/wizards/newuserwizard/knewuserwizard_p.h +++ b/kmymoney2/wizards/newuserwizard/knewuserwizard_p.h @@ -44,8 +44,9 @@ namespace NewUserWizard { class IntroPage : public KIntroPageDecl, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - IntroPage(Wizard* parent, const char* name = 0); + IntroPage(Wizard* tqparent, const char* name = 0); KMyMoneyWizardPage* nextPage(void) const; }; @@ -57,8 +58,9 @@ public: class GeneralPage : public UserInfo, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - GeneralPage(Wizard* parent, const char* name = 0); + GeneralPage(Wizard* tqparent, const char* name = 0); KMyMoneyWizardPage* nextPage(void) const; protected slots: @@ -75,8 +77,9 @@ protected slots: class CurrencyPage : public Currency, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - CurrencyPage(Wizard* parent, const char* name = 0); + CurrencyPage(Wizard* tqparent, const char* name = 0); void enterPage(void); KMyMoneyWizardPage* nextPage(void) const; }; @@ -87,8 +90,9 @@ public: class AccountPage : public KAccountPageDecl, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - AccountPage(Wizard* parent, const char* name = 0); + AccountPage(Wizard* tqparent, const char* name = 0); KMyMoneyWizardPage* nextPage(void) const; virtual bool isComplete(void) const; @@ -102,10 +106,11 @@ public: class CategoriesPage : public Accounts, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - CategoriesPage(Wizard* parent, const char* name = 0); + CategoriesPage(Wizard* tqparent, const char* name = 0); KMyMoneyWizardPage* nextPage(void) const; - QValueList<MyMoneyTemplate> selectedTemplates(void) const; + TQValueList<MyMoneyTemplate> selectedTemplates(void) const; }; /** @@ -116,8 +121,9 @@ public: class PreferencePage : public KPreferencePageDecl, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - PreferencePage(Wizard* parent, const char* name = 0); + PreferencePage(Wizard* tqparent, const char* name = 0); KMyMoneyWizardPage* nextPage(void) const; }; @@ -129,8 +135,9 @@ public: class FilePage : public KFilePageDecl, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - FilePage(Wizard* parent, const char* name = 0); + FilePage(Wizard* tqparent, const char* name = 0); virtual bool isComplete(void) const; }; diff --git a/kmymoney2/wizards/newuserwizard/kpasswordpagedecl.ui b/kmymoney2/wizards/newuserwizard/kpasswordpagedecl.ui index 3d3c062..95002a3 100644 --- a/kmymoney2/wizards/newuserwizard/kpasswordpagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kpasswordpagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KPasswordPageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KPasswordPageDecl</cstring> </property> @@ -29,5 +29,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newuserwizard/kpreferencepagedecl.ui b/kmymoney2/wizards/newuserwizard/kpreferencepagedecl.ui index bfe6446..95838b7 100644 --- a/kmymoney2/wizards/newuserwizard/kpreferencepagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kpreferencepagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KPreferencePageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KPreferencePageDecl</cstring> </property> @@ -27,9 +27,9 @@ <string>If you would like to review or change any preference settings for KMyMoney at this time, you can do so here. If not just click <b>Next</b>.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -92,5 +92,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> |