Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit e84ff3d61520e4200f987d3a0b6bea570b2e8b32)

2 files changed, 46 insertions, 46 deletions

diff --git a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp
index 377615a..e04e581 100644
--- a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp
+++ b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp
@@ -376,9 +376,9 @@ InstitutionPage::InstitutionPage(Wizard* wizard, const char* name) :
   WizardPage<Wizard>(StepInstitution, this, wizard, name),
   d(new Private())
 {
-  connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadWidgets()));
-  connect(m_newInstitutionButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewInstitution()));
-  connect(m_institutionComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelectInstitution(int)));
+  connect(MyMoneyFile::instance(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotLoadWidgets()));
+  connect(m_newInstitutionButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewInstitution()));
+  connect(m_institutionComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSelectInstitution(int)));
 
   slotLoadWidgets();
   m_institutionComboBox->setCurrentItem(0);
@@ -475,12 +475,12 @@ AccountTypePage::AccountTypePage(Wizard* wizard, const char* name) :
   m_conversionRate->setValue(MyMoneyMoney(1,1));
   slotUpdateCurrency();
 
-  connect(m_typeSelection, TQT_SIGNAL(itemSelected(int)), this, TQT_SLOT(slotUpdateType(int)));
-  connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadWidgets()));
-  connect(m_currencyComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdateCurrency()));
-  connect(m_conversionRate, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateConversionRate(const TQString&)));
-  connect(m_conversionRate, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(slotPriceWarning()));
-  connect(m_onlineQuote, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetOnlineQuote()));
+  connect(m_typeSelection, TQ_SIGNAL(itemSelected(int)), this, TQ_SLOT(slotUpdateType(int)));
+  connect(MyMoneyFile::instance(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotLoadWidgets()));
+  connect(m_currencyComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotUpdateCurrency()));
+  connect(m_conversionRate, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotUpdateConversionRate(const TQString&)));
+  connect(m_conversionRate, TQ_SIGNAL(valueChanged(const TQString&)), this, TQ_SLOT(slotPriceWarning()));
+  connect(m_onlineQuote, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGetOnlineQuote()));
 }
 
 void AccountTypePage::slotUpdateType(int i)
@@ -633,7 +633,7 @@ BrokeragePage::BrokeragePage(Wizard* wizard, const char* name) :
   KBrokeragePageDecl(wizard),
   WizardPage<Wizard>(StepBroker, this, wizard, name)
 {
-  connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadWidgets()));
+  connect(MyMoneyFile::instance(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotLoadWidgets()));
 }
 
 void BrokeragePage::slotLoadWidgets(void)
@@ -670,16 +670,16 @@ CreditCardSchedulePage::CreditCardSchedulePage(Wizard* wizard, const char* name)
   m_mandatoryGroup->add(m_payee);
   m_mandatoryGroup->add(m_amount->lineedit());
   m_mandatoryGroup->add(m_paymentAccount);
-  connect(m_paymentAccount, TQT_SIGNAL(itemSelected(const TQString&)), object(), TQT_SIGNAL(completeStateChanged()));
-  connect(m_payee, TQT_SIGNAL(itemSelected(const TQString&)), object(), TQT_SIGNAL(completeStateChanged()));
-  connect(m_date, TQT_SIGNAL(dateChanged(const TQDate&)), object(), TQT_SIGNAL(completeStateChanged()));
+  connect(m_paymentAccount, TQ_SIGNAL(itemSelected(const TQString&)), object(), TQ_SIGNAL(completeStateChanged()));
+  connect(m_payee, TQ_SIGNAL(itemSelected(const TQString&)), object(), TQ_SIGNAL(completeStateChanged()));
+  connect(m_date, TQ_SIGNAL(dateChanged(const TQDate&)), object(), TQ_SIGNAL(completeStateChanged()));
 
-  connect(m_payee, TQT_SIGNAL(createItem(const TQString&, TQString&)), wizard, TQT_SIGNAL(createPayee(const TQString&, TQString&)));
+  connect(m_payee, TQ_SIGNAL(createItem(const TQString&, TQString&)), wizard, TQ_SIGNAL(createPayee(const TQString&, TQString&)));
 
   m_reminderCheckBox->setChecked(true);
-  connect(m_reminderCheckBox, TQT_SIGNAL(toggled(bool)), object(), TQT_SIGNAL(completeStateChanged()));
+  connect(m_reminderCheckBox, TQ_SIGNAL(toggled(bool)), object(), TQ_SIGNAL(completeStateChanged()));
 
-  connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadWidgets()));
+  connect(MyMoneyFile::instance(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotLoadWidgets()));
 
   m_method->insertItem(i18n("Write check"), MyMoneySchedule::STYPE_WRITECHEQUE);
 #if 0
@@ -764,15 +764,15 @@ GeneralLoanInfoPage::GeneralLoanInfoPage(Wizard* wizard, const char* name) :
 
   slotLoadWidgets();
 
-  connect(m_payee, TQT_SIGNAL(createItem(const TQString&, TQString&)), wizard, TQT_SIGNAL(createPayee(const TQString&, TQString&)));
-  connect(m_anyPayments, TQT_SIGNAL(activated(int)), object(),  TQT_SIGNAL(completeStateChanged()));
-  connect(m_recordings, TQT_SIGNAL(activated(int)), object(), TQT_SIGNAL(completeStateChanged()));
+  connect(m_payee, TQ_SIGNAL(createItem(const TQString&, TQString&)), wizard, TQ_SIGNAL(createPayee(const TQString&, TQString&)));
+  connect(m_anyPayments, TQ_SIGNAL(activated(int)), object(),  TQ_SIGNAL(completeStateChanged()));
+  connect(m_recordings, TQ_SIGNAL(activated(int)), object(), TQ_SIGNAL(completeStateChanged()));
 
-  connect(m_interestType, TQT_SIGNAL(activated(int)), object(),  TQT_SIGNAL(completeStateChanged()));
-  connect(m_interestChangeDateEdit, TQT_SIGNAL(dateChanged(const TQDate&)), object(),  TQT_SIGNAL(completeStateChanged()));
-  connect(m_openingBalance, TQT_SIGNAL(textChanged(const TQString&)), object(),  TQT_SIGNAL(completeStateChanged()));
+  connect(m_interestType, TQ_SIGNAL(activated(int)), object(),  TQ_SIGNAL(completeStateChanged()));
+  connect(m_interestChangeDateEdit, TQ_SIGNAL(dateChanged(const TQDate&)), object(),  TQ_SIGNAL(completeStateChanged()));
+  connect(m_openingBalance, TQ_SIGNAL(textChanged(const TQString&)), object(),  TQ_SIGNAL(completeStateChanged()));
 
-  connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadWidgets()));
+  connect(MyMoneyFile::instance(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotLoadWidgets()));
 }
 
 KMyMoneyWizardPage* GeneralLoanInfoPage::nextPage(void) const
@@ -854,16 +854,16 @@ LoanDetailsPage::LoanDetailsPage(Wizard* wizard, const char* name) :
   // allow any precision for the interest rate
   m_interestRate->setPrecision(-1);
 
-  connect(m_paymentDue, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotValuesChanged()));
+  connect(m_paymentDue, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotValuesChanged()));
 
-  connect(m_termAmount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValuesChanged()));
-  connect(m_termUnit, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotValuesChanged()));
-  connect(m_loanAmount, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotValuesChanged()));
-  connect(m_interestRate, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotValuesChanged()));
-  connect(m_paymentAmount, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotValuesChanged()));
-  connect(m_balloonAmount, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotValuesChanged()));
+  connect(m_termAmount, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotValuesChanged()));
+  connect(m_termUnit, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotValuesChanged()));
+  connect(m_loanAmount, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotValuesChanged()));
+  connect(m_interestRate, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotValuesChanged()));
+  connect(m_paymentAmount, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotValuesChanged()));
+  connect(m_balloonAmount, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotValuesChanged()));
 
-  connect(m_calculateButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCalculate()));
+  connect(m_calculateButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCalculate()));
 }
 
 void LoanDetailsPage::enterPage(void)
@@ -1233,7 +1233,7 @@ LoanPaymentPage::LoanPaymentPage(Wizard* wizard, const char* name) :
 
   d->additionalFeesTransaction.addSplit(d->phonySplit);
 
-  connect(m_additionalFeesButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAdditionalFees()));
+  connect(m_additionalFeesButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAdditionalFees()));
 }
 
 LoanPaymentPage::~LoanPaymentPage()
@@ -1285,7 +1285,7 @@ void LoanPaymentPage::slotAdditionalFees(void)
   TQMap<TQString, MyMoneyMoney> priceInfo;
   KSplitTransactionDlg* dlg = new KSplitTransactionDlg(d->additionalFeesTransaction, d->phonySplit, d->phonyAccount, false, !m_wizard->moneyBorrowed(), MyMoneyMoney(0), priceInfo);
 
-  // connect(dlg, TQT_SIGNAL(newCategory(MyMoneyAccount&)), this, TQT_SIGNAL(newCategory(MyMoneyAccount&)));
+  // connect(dlg, TQ_SIGNAL(newCategory(MyMoneyAccount&)), this, TQ_SIGNAL(newCategory(MyMoneyAccount&)));
 
   if(dlg->exec() == TQDialog::Accepted) {
     d->additionalFeesTransaction = dlg->transaction();
@@ -1316,8 +1316,8 @@ LoanSchedulePage::LoanSchedulePage(Wizard* wizard, const char* name) :
 {
   m_mandatoryGroup->add(m_interestCategory->lineEdit());
   m_mandatoryGroup->add(m_paymentAccount->lineEdit());
-  connect(m_interestCategory, TQT_SIGNAL(createItem(const TQString&, TQString&)), this, TQT_SLOT(slotCreateCategory(const TQString&, TQString&)));
-  connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadWidgets()));
+  connect(m_interestCategory, TQ_SIGNAL(createItem(const TQString&, TQString&)), this, TQ_SLOT(slotCreateCategory(const TQString&, TQString&)));
+  connect(MyMoneyFile::instance(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotLoadWidgets()));
 }
 
 void LoanSchedulePage::slotCreateCategory(const TQString& name, TQString& id)
@@ -1389,12 +1389,12 @@ LoanPayoutPage::LoanPayoutPage(Wizard* wizard, const char* name) :
   m_createAssetButton->setGuiItem(createAssetButtenItem);
   TQToolTip::add(m_createAssetButton, createAssetButtenItem.toolTip());
   TQWhatsThis::add(m_createAssetButton, createAssetButtenItem.whatsThis());
-  connect(m_createAssetButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCreateAssetAccount()));
+  connect(m_createAssetButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCreateAssetAccount()));
 
-  connect(m_noPayoutTransaction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotButtonsToggled()));
-  connect(m_refinanceLoan, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotButtonsToggled()));
+  connect(m_noPayoutTransaction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotButtonsToggled()));
+  connect(m_refinanceLoan, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotButtonsToggled()));
 
-  connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadWidgets()));
+  connect(MyMoneyFile::instance(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotLoadWidgets()));
   slotLoadWidgets();
 }
 
@@ -1404,7 +1404,7 @@ void LoanPayoutPage::slotButtonsToggled(void)
   // not defined. Using a single shot timer postpones the call of m_mandatoryGroup::changed()
   // until the next round of the main loop so we can be sure to see all relevant changes
   // that happened in the meantime (eg. widgets are enabled and disabled)
-  TQTimer::singleShot(0, m_mandatoryGroup, TQT_SLOT(changed()));
+  TQTimer::singleShot(0, m_mandatoryGroup, TQ_SLOT(changed()));
 }
 
 void LoanPayoutPage::slotCreateAssetAccount(void)
diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp
index abeb567..8179af7 100644
--- a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp
+++ b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp
@@ -176,8 +176,8 @@ GeneralPage::GeneralPage(Wizard* wizard, const char* name) :
 {
   m_userNameEdit->setFocus();
   TDEABC::StdAddressBook *ab = TDEABC::StdAddressBook::self(true);
-  connect(ab, TQT_SIGNAL(addressBookChanged(AddressBook*)), this, TQT_SLOT(slotAddressBookLoaded()));
-  connect(m_loadAddressButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLoadFromKABC()));
+  connect(ab, TQ_SIGNAL(addressBookChanged(AddressBook*)), this, TQ_SLOT(slotAddressBookLoaded()));
+  connect(m_loadAddressButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLoadFromKABC()));
   m_loadAddressButton->setEnabled(false);
 }
 
@@ -280,8 +280,8 @@ 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, TQT_SIGNAL(stateChanged()), object(), TQT_SIGNAL(completeStateChanged()));
-  connect(m_haveCheckingAccountButton, TQT_SIGNAL(toggled(bool)), object(), TQT_SIGNAL(completeStateChanged()));
+  connect(m_mandatoryGroup, TQ_SIGNAL(stateChanged()), object(), TQ_SIGNAL(completeStateChanged()));
+  connect(m_haveCheckingAccountButton, TQ_SIGNAL(toggled(bool)), object(), TQ_SIGNAL(completeStateChanged()));
   m_accountNameEdit->setFocus();
   m_openingDateEdit->setDate(TQDate(TQDate::currentDate().year(),1,1));
 }
@@ -316,7 +316,7 @@ PreferencePage::PreferencePage(Wizard* wizard, const char* name) :
   KPreferencePageDecl(wizard),
   WizardPage<Wizard>(stepCount++, this, wizard, name)
 {
-  connect(m_openConfigButton, TQT_SIGNAL(clicked()), kmymoney2, TQT_SLOT(slotSettings()));
+  connect(m_openConfigButton, TQ_SIGNAL(clicked()), kmymoney2, TQ_SLOT(slotSettings()));
 }
 
 KMyMoneyWizardPage* PreferencePage::nextPage(void) const
@@ -329,7 +329,7 @@ FilePage::FilePage(Wizard* wizard, const char* name) :
   WizardPage<Wizard>(stepCount++, this, wizard, name)
 {
   m_mandatoryGroup->add(m_dataFileEdit->lineEdit());
-  connect(m_mandatoryGroup, TQT_SIGNAL(stateChanged()), object(), TQT_SIGNAL(completeStateChanged()));
+  connect(m_mandatoryGroup, TQ_SIGNAL(stateChanged()), object(), TQ_SIGNAL(completeStateChanged()));
 
   KUser user;
   m_dataFileEdit->setShowLocalProtocol(false);