From fecb0e67b23e8b83ba7fc881bb57bc48c0852d62 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 5 Jul 2011 06:00:29 +0000 Subject: 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 --- kmymoney2/wizards/newuserwizard/knewuserwizard.cpp | 62 +++++++++++----------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'kmymoney2/wizards/newuserwizard/knewuserwizard.cpp') 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 -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include // ---------------------------------------------------------------------------- // 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 NewUserWizard::Wizard::templates(void) const +TQValueList 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(stepCount++, this, wizard, name) { - QListViewItem *first = 0; - QValueList list = MyMoneyFile::instance()->currencyList(); - QValueList::const_iterator it; + TQListViewItem *first = 0; + TQValueList list = MyMoneyFile::instance()->currencyList(); + TQValueList::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(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 CategoriesPage::selectedTemplates(void) const +TQValueList CategoriesPage::selectedTemplates(void) const { return m_templateSelector->selectedTemplates(); } @@ -312,7 +312,7 @@ PreferencePage::PreferencePage(Wizard* wizard, const char* name) : KPreferencePageDecl(wizard), WizardPage(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(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) { -- cgit v1.2.1