From 1f9d00360b9018301630ce062d7dda0c6583edfb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:17 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 252fce5a2a5384702fbcc1c9987284d7bd2e6943. --- .../wizards/newuserwizard/kaccountpagedecl.ui | 10 ++++----- .../wizards/newuserwizard/kcurrencypagedecl.ui | 6 ++--- kmymoney2/wizards/newuserwizard/kfilepagedecl.ui | 2 +- .../wizards/newuserwizard/kgeneralpagedecl.ui | 26 +++++++++++----------- kmymoney2/wizards/newuserwizard/kintropagedecl.ui | 4 ++-- kmymoney2/wizards/newuserwizard/knewuserwizard.cpp | 6 ++--- .../wizards/newuserwizard/kpreferencepagedecl.ui | 6 ++--- 7 files changed, 30 insertions(+), 30 deletions(-) (limited to 'kmymoney2/wizards/newuserwizard') diff --git a/kmymoney2/wizards/newuserwizard/kaccountpagedecl.ui b/kmymoney2/wizards/newuserwizard/kaccountpagedecl.ui index 725aa31..76ce9f9 100644 --- a/kmymoney2/wizards/newuserwizard/kaccountpagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kaccountpagedecl.ui @@ -110,7 +110,7 @@ - layout3 + tqlayout3 @@ -134,7 +134,7 @@ Expanding - + 81 20 @@ -169,7 +169,7 @@ - layout5 + tqlayout5 @@ -204,7 +204,7 @@ Expanding - + 200 20 @@ -236,7 +236,7 @@ Expanding - + 20 16 diff --git a/kmymoney2/wizards/newuserwizard/kcurrencypagedecl.ui b/kmymoney2/wizards/newuserwizard/kcurrencypagedecl.ui index a0c4b90..dd20dc0 100644 --- a/kmymoney2/wizards/newuserwizard/kcurrencypagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kcurrencypagedecl.ui @@ -29,7 +29,7 @@ - layout19 + tqlayout19 @@ -45,7 +45,7 @@ Expanding - + 61 21 @@ -67,7 +67,7 @@ Expanding - + 51 21 diff --git a/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui b/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui index 316902a..8a39942 100644 --- a/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui @@ -42,7 +42,7 @@ Expanding - + 20 30 diff --git a/kmymoney2/wizards/newuserwizard/kgeneralpagedecl.ui b/kmymoney2/wizards/newuserwizard/kgeneralpagedecl.ui index 2cd041b..5483233 100644 --- a/kmymoney2/wizards/newuserwizard/kgeneralpagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kgeneralpagedecl.ui @@ -28,7 +28,7 @@ This information will be seen and used only by you. The information is used to p - layout18 + tqlayout18 @@ -38,7 +38,7 @@ This information will be seen and used only by you. The information is used to p frame8 - + 25 0 @@ -53,7 +53,7 @@ This information will be seen and used only by you. The information is used to p - layout17 + tqlayout17 @@ -61,7 +61,7 @@ This information will be seen and used only by you. The information is used to p - layout20 + tqlayout20 @@ -71,7 +71,7 @@ This information will be seen and used only by you. The information is used to p TextLabel4 - + 100 0 @@ -100,7 +100,7 @@ This information will be seen and used only by you. The information is used to p TextLabel2 - + 100 0 @@ -119,7 +119,7 @@ This information will be seen and used only by you. The information is used to p TextLabel7 - + 100 0 @@ -141,7 +141,7 @@ This information will be seen and used only by you. The information is used to p TextLabel6 - + 100 0 @@ -155,7 +155,7 @@ This information will be seen and used only by you. The information is used to p TextLabel3 - + 100 0 @@ -174,7 +174,7 @@ This information will be seen and used only by you. The information is used to p TextLabel5 - + 100 0 @@ -198,7 +198,7 @@ This information will be seen and used only by you. The information is used to p - layout12 + tqlayout12 @@ -222,7 +222,7 @@ This information will be seen and used only by you. The information is used to p Expanding - + 61 20 @@ -237,7 +237,7 @@ This information will be seen and used only by you. The information is used to p frame8_2 - + 25 0 diff --git a/kmymoney2/wizards/newuserwizard/kintropagedecl.ui b/kmymoney2/wizards/newuserwizard/kintropagedecl.ui index df1d9aa..810f0b7 100644 --- a/kmymoney2/wizards/newuserwizard/kintropagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kintropagedecl.ui @@ -29,7 +29,7 @@ Welcome to KMyMoney! - + AlignCenter @@ -53,7 +53,7 @@ On the next few pages you will be guided through the steps necessary to setup th Expanding - + 20 41 diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp index 04daf5c..c1159d9 100644 --- a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp +++ b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp @@ -208,7 +208,7 @@ void GeneralPage::slotLoadFromKABC(void) TQString sep; if(!a.country().isEmpty() && !a.region().isEmpty()) sep = " / "; - m_countyEdit->setText(TQString("%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() ); @@ -279,7 +279,7 @@ AccountPage::AccountPage(Wizard* wizard, const char* name) : 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(TQDate(TQDate::currentDate().year(),1,1)); + m_openingDateEdit->setDate(TQDate(TQDate::tqcurrentDate().year(),1,1)); } KMyMoneyWizardPage* AccountPage::nextPage(void) const @@ -329,7 +329,7 @@ FilePage::FilePage(Wizard* wizard, const char* name) : KUser user; m_dataFileEdit->setShowLocalProtocol(false); - m_dataFileEdit->setURL(TQString("%1/%2.kmy").arg(TQDir::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); diff --git a/kmymoney2/wizards/newuserwizard/kpreferencepagedecl.ui b/kmymoney2/wizards/newuserwizard/kpreferencepagedecl.ui index c623436..01634fc 100644 --- a/kmymoney2/wizards/newuserwizard/kpreferencepagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kpreferencepagedecl.ui @@ -29,7 +29,7 @@ - layout1 + tqlayout1 @@ -45,7 +45,7 @@ Expanding - + 51 20 @@ -72,7 +72,7 @@ Expanding - + 20 31 -- cgit v1.2.1