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. --- kmymoney2/widgets/kaccounttemplateselector.cpp | 12 +-- kmymoney2/widgets/kaccounttemplateselectordecl.cpp | 38 ++++---- kmymoney2/widgets/kaccounttemplateselectordecl.ui | 6 +- kmymoney2/widgets/kbudgetvalues.cpp | 6 +- kmymoney2/widgets/kbudgetvaluesdecl.cpp | 20 ++-- kmymoney2/widgets/kbudgetvaluesdecl.ui | 6 +- kmymoney2/widgets/kguiutils.cpp | 4 +- kmymoney2/widgets/klistviewsearchline.cpp | 10 +- kmymoney2/widgets/klistviewsearchline.h | 4 +- kmymoney2/widgets/kmymoneyaccountselector.cpp | 18 ++-- kmymoney2/widgets/kmymoneyaccounttree.cpp | 2 +- kmymoney2/widgets/kmymoneyaccounttreebase.cpp | 24 ++--- kmymoney2/widgets/kmymoneyaccounttreebase.h | 6 +- kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp | 32 +++---- kmymoney2/widgets/kmymoneybriefschedule.cpp | 34 +++---- kmymoney2/widgets/kmymoneycalculator.cpp | 6 +- kmymoney2/widgets/kmymoneycalculator.h | 2 +- kmymoney2/widgets/kmymoneycalendar.cpp | 38 ++++---- kmymoney2/widgets/kmymoneycalendar.h | 4 +- kmymoney2/widgets/kmymoneycategory.cpp | 12 +-- kmymoney2/widgets/kmymoneycategory.h | 4 +- kmymoney2/widgets/kmymoneychecklistitem.cpp | 4 +- kmymoney2/widgets/kmymoneychecklistitem.h | 2 +- kmymoney2/widgets/kmymoneycombo.cpp | 16 ++-- kmymoney2/widgets/kmymoneycombo.h | 2 +- kmymoney2/widgets/kmymoneycompletion.cpp | 2 +- kmymoney2/widgets/kmymoneycurrencyselector.cpp | 4 +- kmymoney2/widgets/kmymoneydateinput.cpp | 26 +++--- kmymoney2/widgets/kmymoneydateinput.h | 6 +- kmymoney2/widgets/kmymoneydatetbl.cpp | 14 +-- kmymoney2/widgets/kmymoneydatetbl.h | 6 +- kmymoney2/widgets/kmymoneyedit.cpp | 16 ++-- kmymoney2/widgets/kmymoneyedit.h | 2 +- kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp | 6 +- kmymoney2/widgets/kmymoneyforecastlistviewitem.h | 2 +- kmymoney2/widgets/kmymoneygpgconfigdecl.ui | 12 +-- kmymoney2/widgets/kmymoneylineedit.cpp | 10 +- kmymoney2/widgets/kmymoneylineedit.h | 10 +- kmymoney2/widgets/kmymoneylistviewitem.cpp | 6 +- kmymoney2/widgets/kmymoneylistviewitem.h | 2 +- kmymoney2/widgets/kmymoneyonlinequoteconfigdecl.ui | 8 +- kmymoney2/widgets/kmymoneyreportconfigtab1decl.ui | 6 +- kmymoney2/widgets/kmymoneyreportconfigtab2decl.ui | 8 +- kmymoney2/widgets/kmymoneyreportconfigtab3decl.ui | 20 ++-- .../widgets/kmymoneyreportconfigtabchartdecl.ui | 10 +- kmymoney2/widgets/kmymoneyreportcontroldecl.ui | 14 +-- kmymoney2/widgets/kmymoneyscheduledcalendar.cpp | 2 +- kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp | 14 +-- kmymoney2/widgets/kmymoneyscheduleddatetbl.h | 2 +- kmymoney2/widgets/kmymoneyselector.cpp | 26 +++--- kmymoney2/widgets/kmymoneytitlelabel.cpp | 2 +- kmymoney2/widgets/kmymoneywizard.cpp | 18 ++-- kmymoney2/widgets/kmymoneywizard.h | 4 +- kmymoney2/widgets/kschedulebriefwidget.ui | 22 ++--- kmymoney2/widgets/register.cpp | 20 ++-- kmymoney2/widgets/scheduledtransaction.cpp | 2 +- kmymoney2/widgets/stdtransactionmatched.cpp | 4 +- kmymoney2/widgets/stdtransactionmatched.h | 2 +- kmymoney2/widgets/transaction.cpp | 104 ++++++++++----------- kmymoney2/widgets/transaction.h | 4 +- kmymoney2/widgets/transactionform.cpp | 18 ++-- kmymoney2/widgets/transactionform.h | 4 +- kmymoney2/widgets/transactionsortoption.ui | 16 ++-- 63 files changed, 383 insertions(+), 383 deletions(-) (limited to 'kmymoney2/widgets') diff --git a/kmymoney2/widgets/kaccounttemplateselector.cpp b/kmymoney2/widgets/kaccounttemplateselector.cpp index 9b26503..6e96b78 100644 --- a/kmymoney2/widgets/kaccounttemplateselector.cpp +++ b/kmymoney2/widgets/kaccounttemplateselector.cpp @@ -204,8 +204,8 @@ void KAccountTemplateSelector::slotLoadTemplateList(void) TQString oCountry = KGlobal::locale()->twoAlphaToCountryName(exp.cap(2)); TQString oLang = KGlobal::locale()->twoAlphaToLanguageName(exp.cap(1)); d->countries.remove(country); - d->countries[TQString("%1 (%2)").arg(oCountry).arg(oLang)] = oName; - d->countries[TQString("%1 (%2)").arg(country).arg(lang)] = *it_d; + d->countries[TQString("%1 (%2)").tqarg(oCountry).tqarg(oLang)] = oName; + d->countries[TQString("%1 (%2)").tqarg(country).tqarg(lang)] = *it_d; } } else { d->countries[country] = *it_d; @@ -238,13 +238,13 @@ void KAccountTemplateSelector::slotLoadCountry(void) TQStringList::iterator it; for(it = d->dirlist.begin(); it != d->dirlist.end(); ++it) { TQStringList::iterator it_f; - TQDir dir(TQString("%1%2").arg(*it).arg(*(d->it_m))); + TQDir dir(TQString("%1%2").tqarg(*it).tqarg(*(d->it_m))); if(dir.exists()) { TQStringList files = dir.entryList("*", TQDir::Files); for(it_f = files.begin(); it_f != files.end(); ++it_f) { - MyMoneyTemplate templ(TQString("%1/%2").arg(dir.canonicalPath()).arg(*it_f)); - d->m_templates[TQString("%1").arg(d->id)] = templ; - new KListViewItem(parent, templ.title(), templ.shortDescription(), TQString("%1").arg(d->id)); + MyMoneyTemplate templ(TQString("%1/%2").tqarg(dir.canonicalPath()).tqarg(*it_f)); + d->m_templates[TQString("%1").tqarg(d->id)] = templ; + new KListViewItem(parent, templ.title(), templ.shortDescription(), TQString("%1").tqarg(d->id)); ++d->id; } } diff --git a/kmymoney2/widgets/kaccounttemplateselectordecl.cpp b/kmymoney2/widgets/kaccounttemplateselectordecl.cpp index c37a269..75f3d16 100644 --- a/kmymoney2/widgets/kaccounttemplateselectordecl.cpp +++ b/kmymoney2/widgets/kaccounttemplateselectordecl.cpp @@ -21,7 +21,7 @@ inline TQString kmm_i18n(const char* msg) { return i18n(msg); } #include #include #include -#include +#include #include #include @@ -39,7 +39,7 @@ KAccountTemplateSelectorDecl::KAccountTemplateSelectorDecl( TQWidget* parent, co m_groupList = new KListView( this, "m_groupList" ); m_groupList->addColumn( kmm_i18n( "Account Types" ) ); m_groupList->addColumn( kmm_i18n( "Description" ) ); - m_groupList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, m_groupList->sizePolicy().hasHeightForWidth() ) ); + m_groupList->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, m_groupList->sizePolicy().hasHeightForWidth() ) ); m_groupList->setMinimumSize( TQSize( 0, 150 ) ); m_groupList->setProperty( "selectionMode", "Extended" ); m_groupList->setAllColumnsShowFocus( TRUE ); @@ -47,43 +47,43 @@ KAccountTemplateSelectorDecl::KAccountTemplateSelectorDecl( TQWidget* parent, co m_groupList->setFullWidth( TRUE ); KAccountTemplateSelectorDeclLayout->addWidget( m_groupList ); - layout3 = new TQHBoxLayout( 0, 0, 6, "layout3"); + tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3"); groupBox1 = new TQGroupBox( this, "groupBox1" ); - groupBox1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 2, groupBox1->sizePolicy().hasHeightForWidth() ) ); + groupBox1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 2, groupBox1->sizePolicy().hasHeightForWidth() ) ); groupBox1->setColumnLayout(0, Qt::Vertical ); - groupBox1->layout()->setSpacing( 6 ); - groupBox1->layout()->setMargin( 11 ); - groupBox1Layout = new TQVBoxLayout( groupBox1->layout() ); - groupBox1Layout->setAlignment( TQt::AlignTop ); + groupBox1->tqlayout()->setSpacing( 6 ); + groupBox1->tqlayout()->setMargin( 11 ); + groupBox1Layout = new TQVBoxLayout( groupBox1->tqlayout() ); + groupBox1Layout->tqsetAlignment( TQt::AlignTop ); m_description = new KTextEdit( groupBox1, "m_description" ); - m_description->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 3, m_description->sizePolicy().hasHeightForWidth() ) ); + m_description->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 3, m_description->sizePolicy().hasHeightForWidth() ) ); m_description->setReadOnly( TRUE ); groupBox1Layout->addWidget( m_description ); - layout3->addWidget( groupBox1 ); + tqlayout3->addWidget( groupBox1 ); groupBox2 = new TQGroupBox( this, "groupBox2" ); - groupBox2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 2, groupBox2->sizePolicy().hasHeightForWidth() ) ); + groupBox2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 2, groupBox2->sizePolicy().hasHeightForWidth() ) ); groupBox2->setColumnLayout(0, Qt::Vertical ); - groupBox2->layout()->setSpacing( 6 ); - groupBox2->layout()->setMargin( 11 ); - groupBox2Layout = new TQVBoxLayout( groupBox2->layout() ); - groupBox2Layout->setAlignment( TQt::AlignTop ); + groupBox2->tqlayout()->setSpacing( 6 ); + groupBox2->tqlayout()->setMargin( 11 ); + groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() ); + groupBox2Layout->tqsetAlignment( TQt::AlignTop ); m_accountList = new KListView( groupBox2, "m_accountList" ); m_accountList->addColumn( kmm_i18n( "Name" ) ); - m_accountList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 3, m_accountList->sizePolicy().hasHeightForWidth() ) ); + m_accountList->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 3, m_accountList->sizePolicy().hasHeightForWidth() ) ); m_accountList->setMinimumSize( TQSize( 0, 150 ) ); m_accountList->setProperty( "selectionMode", "NoSelection" ); m_accountList->setAllColumnsShowFocus( TRUE ); m_accountList->setRootIsDecorated( TRUE ); m_accountList->setFullWidth( TRUE ); groupBox2Layout->addWidget( m_accountList ); - layout3->addWidget( groupBox2 ); - KAccountTemplateSelectorDeclLayout->addLayout( layout3 ); + tqlayout3->addWidget( groupBox2 ); + KAccountTemplateSelectorDeclLayout->addLayout( tqlayout3 ); languageChange(); - resize( TQSize(546, 346).expandedTo(minimumSizeHint()) ); + resize( TQSize(546, 346).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/kmymoney2/widgets/kaccounttemplateselectordecl.ui b/kmymoney2/widgets/kaccounttemplateselectordecl.ui index cc5b9da..deb37ab 100644 --- a/kmymoney2/widgets/kaccounttemplateselectordecl.ui +++ b/kmymoney2/widgets/kaccounttemplateselectordecl.ui @@ -53,7 +53,7 @@ 0 - + 0 150 @@ -74,7 +74,7 @@ - layout3 + tqlayout3 @@ -159,7 +159,7 @@ 3 - + 0 150 diff --git a/kmymoney2/widgets/kbudgetvalues.cpp b/kmymoney2/widgets/kbudgetvalues.cpp index df665a8..d635eba 100644 --- a/kmymoney2/widgets/kbudgetvalues.cpp +++ b/kmymoney2/widgets/kbudgetvalues.cpp @@ -184,7 +184,7 @@ void KBudgetValues::slotChangePeriod(int id) newValue = (newValue / MyMoneyMoney(12, 1)).convert(); } if(!newValue.isZero()) { - if(KMessageBox::questionYesNo(this, TQString("")+i18n("You have entered budget values using a different base which would result in a monthly budget of %1. Should this value be used to fill the monthly budget?").arg(newValue.formatMoney("", 2))+TQString(""), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) { + if(KMessageBox::questionYesNo(this, TQString("")+i18n("You have entered budget values using a different base which would result in a monthly budget of %1. Should this value be used to fill the monthly budget?").tqarg(newValue.formatMoney("", 2))+TQString(""), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) { m_amountMonthly->setValue(newValue); } } @@ -203,7 +203,7 @@ void KBudgetValues::slotChangePeriod(int id) newValue += m_field[i]->value(); } if(!newValue.isZero()) { - if(KMessageBox::questionYesNo(this, TQString("")+i18n("You have entered budget values using a different base which would result in a yearly budget of %1. Should this value be used to fill the monthly budget?").arg(newValue.formatMoney("", 2))+TQString(""), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) { + if(KMessageBox::questionYesNo(this, TQString("")+i18n("You have entered budget values using a different base which would result in a yearly budget of %1. Should this value be used to fill the monthly budget?").tqarg(newValue.formatMoney("", 2))+TQString(""), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) { m_amountYearly->setValue(newValue); } } @@ -222,7 +222,7 @@ void KBudgetValues::slotChangePeriod(int id) } if(!newValue.isZero()) { - if(KMessageBox::questionYesNo(this, TQString("")+i18n("You have entered budget values using a different base which would result in an individual monthly budget of %1. Should this value be used to fill the monthly budgets?").arg(newValue.formatMoney("", 2))+TQString(""), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) { + if(KMessageBox::questionYesNo(this, TQString("")+i18n("You have entered budget values using a different base which would result in an individual monthly budget of %1. Should this value be used to fill the monthly budgets?").tqarg(newValue.formatMoney("", 2))+TQString(""), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) { for(int i=0; i < 12; ++i) m_field[i]->setValue(newValue); } diff --git a/kmymoney2/widgets/kbudgetvaluesdecl.cpp b/kmymoney2/widgets/kbudgetvaluesdecl.cpp index 7bd47e6..385cbfa 100644 --- a/kmymoney2/widgets/kbudgetvaluesdecl.cpp +++ b/kmymoney2/widgets/kbudgetvaluesdecl.cpp @@ -23,7 +23,7 @@ inline TQString kmm_i18n(const char* msg) { return i18n(msg); } #include #include #include -#include +#include #include #include @@ -169,21 +169,21 @@ KBudgetValuesDecl::KBudgetValuesDecl( TQWidget* parent, const char* name, WFlags KBudgetValuesDeclLayout->addWidget( m_firstItemStack, 0, 3 ); - layout12 = new TQVBoxLayout( 0, 0, 6, "layout12"); + tqlayout12 = new TQVBoxLayout( 0, 0, 6, "tqlayout12"); m_clearButton = new KPushButton( this, "m_clearButton" ); - layout12->addWidget( m_clearButton ); + tqlayout12->addWidget( m_clearButton ); spacer7 = new TQSpacerItem( 20, 21, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - layout12->addItem( spacer7 ); + tqlayout12->addItem( spacer7 ); - KBudgetValuesDeclLayout->addMultiCellLayout( layout12, 0, 5, 1, 1 ); + KBudgetValuesDeclLayout->addMultiCellLayout( tqlayout12, 0, 5, 1, 1 ); m_periodGroup = new TQButtonGroup( this, "m_periodGroup" ); m_periodGroup->setColumnLayout(0, Qt::Vertical ); - m_periodGroup->layout()->setSpacing( 6 ); - m_periodGroup->layout()->setMargin( 11 ); - m_periodGroupLayout = new TQVBoxLayout( m_periodGroup->layout() ); - m_periodGroupLayout->setAlignment( TQt::AlignTop ); + m_periodGroup->tqlayout()->setSpacing( 6 ); + m_periodGroup->tqlayout()->setMargin( 11 ); + m_periodGroupLayout = new TQVBoxLayout( m_periodGroup->tqlayout() ); + m_periodGroupLayout->tqsetAlignment( TQt::AlignTop ); m_monthlyButton = new TQRadioButton( m_periodGroup, "m_monthlyButton" ); m_periodGroupLayout->addWidget( m_monthlyButton ); @@ -198,7 +198,7 @@ KBudgetValuesDecl::KBudgetValuesDecl( TQWidget* parent, const char* name, WFlags KBudgetValuesDeclLayout->addMultiCellWidget( m_periodGroup, 0, 5, 0, 0 ); languageChange(); - resize( TQSize(553, 188).expandedTo(minimumSizeHint()) ); + resize( TQSize(553, 188).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // tab order diff --git a/kmymoney2/widgets/kbudgetvaluesdecl.ui b/kmymoney2/widgets/kbudgetvaluesdecl.ui index 7f0ea54..0eb9cb7 100644 --- a/kmymoney2/widgets/kbudgetvaluesdecl.ui +++ b/kmymoney2/widgets/kbudgetvaluesdecl.ui @@ -282,7 +282,7 @@ - layout12 + tqlayout12 @@ -306,7 +306,7 @@ Expanding - + 20 21 @@ -360,7 +360,7 @@ Expanding - + 20 21 diff --git a/kmymoney2/widgets/kguiutils.cpp b/kmymoney2/widgets/kguiutils.cpp index e8e8d3f..1b17ac6 100644 --- a/kmymoney2/widgets/kguiutils.cpp +++ b/kmymoney2/widgets/kguiutils.cpp @@ -96,7 +96,7 @@ void kMandatoryFieldGroup::add(TQWidget *widget) void kMandatoryFieldGroup::remove(TQWidget *widget) { - widget->setPaletteBackgroundColor(widget->colorGroup().background()); + widget->setPaletteBackgroundColor(widget->tqcolorGroup().background()); widgets.remove(widget); changed(); } @@ -164,7 +164,7 @@ void kMandatoryFieldGroup::clear(void) { TQValueList::Iterator i; for (i = widgets.begin(); i != widgets.end(); ++i) - (*i)->setPaletteBackgroundColor((*i)->colorGroup().background()); + (*i)->setPaletteBackgroundColor((*i)->tqcolorGroup().background()); widgets.clear(); if (okButton) { okButton->setEnabled(true); diff --git a/kmymoney2/widgets/klistviewsearchline.cpp b/kmymoney2/widgets/klistviewsearchline.cpp index b2d554c..8c01629 100644 --- a/kmymoney2/widgets/klistviewsearchline.cpp +++ b/kmymoney2/widgets/klistviewsearchline.cpp @@ -147,7 +147,7 @@ void KListViewSearchLine::updateSearch(const TQString &s) it.current() && !currentItem; ++it) { - if(d->listView->itemRect(it.current()).isValid()) + if(d->listView->tqitemRect(it.current()).isValid()) currentItem = it.current(); } } @@ -263,7 +263,7 @@ TQPopupMenu *KListViewSearchLine::createPopupMenu() for(int j = 0; j < header->mapToIndex(i); j++) if(d->listView->columnWidth(header->mapToSection(j))>0) visiblePosition++; - columnText = i18n("Column number %1","Column No. %1").arg(visiblePosition); + columnText = i18n("Column number %1","Column No. %1").tqarg(visiblePosition); } subMenu->insertItem(columnText, visibleColumns); if(d->searchColumns.isEmpty() || d->searchColumns.find(i) != d->searchColumns.end()) @@ -376,12 +376,12 @@ bool KListViewSearchLine::checkItemParentsVisible(TQListViewItem *item, TQListVi TQListViewItem * first = item; for(; item; item = item->nextSibling()) { - //What we pass to our children as highestHiddenParent: + //What we pass to our tqchildren as highestHiddenParent: TQListViewItem * hhp = highestHiddenParent ? highestHiddenParent : item->isVisible() ? 0L : item; bool childMatch = false; if(item->firstChild() && checkItemParentsVisible(item->firstChild(), hhp)) childMatch = true; - // Should this item be shown? It should if any children should be, or if it matches. + // Should this item be shown? It should if any tqchildren should be, or if it matches. if(childMatch || itemMatches(item, d->search)) { visible = true; @@ -393,7 +393,7 @@ bool KListViewSearchLine::checkItemParentsVisible(TQListViewItem *item, TQListVi for(TQListViewItem *hide = first; hide != item; hide = hide->nextSibling()) hide->setVisible(false); highestHiddenParent = 0; - // If we matched, than none of our children matched, yet the setVisible() call on our + // If we matched, than none of our tqchildren matched, yet the setVisible() call on our // ancestor unhid them, undo the damage: if(!childMatch) for(TQListViewItem *hide = item->firstChild(); hide; hide = hide->nextSibling()) diff --git a/kmymoney2/widgets/klistviewsearchline.h b/kmymoney2/widgets/klistviewsearchline.h index 7655c2b..1ecb94b 100644 --- a/kmymoney2/widgets/klistviewsearchline.h +++ b/kmymoney2/widgets/klistviewsearchline.h @@ -112,7 +112,7 @@ public slots: /** * When a search is active on a list that's organized into a tree view if * a parent or ancesestor of an item is does not match the search then it - * will be hidden and as such so too will any children that match. + * will be hidden and as such so too will any tqchildren that match. * * If this is set to true (the default) then the parents of matching items * will be shown. @@ -190,7 +190,7 @@ private: /** * This is used in case parent items of matching items should be visible. - * It makes a recursive call to all children. It returns true if at least + * It makes a recursive call to all tqchildren. It returns true if at least * one item in the subtree with the given root item is visible. */ bool checkItemParentsVisible(TQListViewItem *item, TQListViewItem *highestHiddenParent = 0); diff --git a/kmymoney2/widgets/kmymoneyaccountselector.cpp b/kmymoney2/widgets/kmymoneyaccountselector.cpp index b28a39f..e33a2e5 100644 --- a/kmymoney2/widgets/kmymoneyaccountselector.cpp +++ b/kmymoney2/widgets/kmymoneyaccountselector.cpp @@ -23,7 +23,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include +#include #include #include #include @@ -182,7 +182,7 @@ bool kMyMoneyAccountSelector::contains(const TQString& txt) const i18n("Security"); while((it_v = it.current()) != 0) { - TQRegExp exp(TQString("^(?:%1):%2$").arg(baseName).arg(TQRegExp::escape(txt))); + TQRegExp exp(TQString("^(?:%1):%2$").tqarg(baseName).tqarg(TQRegExp::escape(txt))); if(it_v->rtti() == 1) { KMyMoneyCheckListItem* it_c = dynamic_cast(it_v); if(exp.search(it_c->key(1, true)) != -1) { @@ -346,28 +346,28 @@ int AccountSet::load(kMyMoneyAccountSelector* selector) TQListViewItem* after = 0; // create the favorite section first and sort it to the beginning - key = TQString("A%1").arg(i18n("Favorites")); + key = TQString("A%1").tqarg(i18n("Favorites")); m_favorites = selector->newItem(i18n("Favorites"), key); for(int mask = 0x01; mask != KMyMoneyUtils::last; mask <<= 1) { TQListViewItem* item = 0; if((typeMask & mask & KMyMoneyUtils::asset) != 0) { ++m_count; - key = TQString("B%1").arg(i18n("Asset")); + key = TQString("B%1").tqarg(i18n("Asset")); item = selector->newItem(i18n("Asset accounts"), key); list = m_file->asset().accountList(); } if((typeMask & mask & KMyMoneyUtils::liability) != 0) { ++m_count; - key = TQString("C%1").arg(i18n("Liability")); + key = TQString("C%1").tqarg(i18n("Liability")); item = selector->newItem(i18n("Liability accounts"), key); list = m_file->liability().accountList(); } if((typeMask & mask & KMyMoneyUtils::income) != 0) { ++m_count; - key = TQString("D%1").arg(i18n("Income")); + key = TQString("D%1").tqarg(i18n("Income")); item = selector->newItem(i18n("Income categories"), key); list = m_file->income().accountList(); if(selector->selectionMode() == TQListView::Multi) { @@ -377,7 +377,7 @@ int AccountSet::load(kMyMoneyAccountSelector* selector) if((typeMask & mask & KMyMoneyUtils::expense) != 0) { ++m_count; - key = TQString("E%1").arg(i18n("Expense")); + key = TQString("E%1").tqarg(i18n("Expense")); item = selector->newItem(i18n("Expense categories"), key); list = m_file->expense().accountList(); if(selector->selectionMode() == TQListView::Multi) { @@ -387,7 +387,7 @@ int AccountSet::load(kMyMoneyAccountSelector* selector) if((typeMask & mask & KMyMoneyUtils::equity) != 0) { ++m_count; - key = TQString("F%1").arg(i18n("Equity")); + key = TQString("F%1").tqarg(i18n("Equity")); item = selector->newItem(i18n("Equity accounts"), key); list = m_file->equity().accountList(); } @@ -470,7 +470,7 @@ int AccountSet::load(kMyMoneyAccountSelector* selector, const TQString& baseName continue; TQString tmpKey; // the first character must be preset. Since we don't know any sort order here, we just use A - tmpKey = TQString("A%1%2%3").arg(baseName, MyMoneyFile::AccountSeperator, acc.name()); + tmpKey = TQString("A%1%2%3").tqarg(baseName, MyMoneyFile::AccountSeperator, acc.name()); selector->newItem(item, acc.name(), tmpKey, acc.id()); ++m_count; ++count; diff --git a/kmymoney2/widgets/kmymoneyaccounttree.cpp b/kmymoney2/widgets/kmymoneyaccounttree.cpp index e89553b..be2be0c 100644 --- a/kmymoney2/widgets/kmymoneyaccounttree.cpp +++ b/kmymoney2/widgets/kmymoneyaccounttree.cpp @@ -104,7 +104,7 @@ void KMyMoneyAccountTreeItem::fillColumns() } if(!m_account.value("VatRate").isEmpty()) { vatRate = MyMoneyMoney(m_account.value("VatRate")) * MyMoneyMoney(100,1); - setText(lv->vatCategoryColumn(), TQString("%1 %").arg(vatRate.formatMoney("", 1))); + setText(lv->vatCategoryColumn(), TQString("%1 %").tqarg(vatRate.formatMoney("", 1))); } break; default: diff --git a/kmymoney2/widgets/kmymoneyaccounttreebase.cpp b/kmymoney2/widgets/kmymoneyaccounttreebase.cpp index 03d5c41..48ecd28 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreebase.cpp +++ b/kmymoney2/widgets/kmymoneyaccounttreebase.cpp @@ -129,8 +129,8 @@ void KMyMoneyAccountTreeBase::showValue(void) void KMyMoneyAccountTreeBase::connectNotify(const char * /* s */) { // update drag and drop settings - m_accountConnections = (receivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyAccount&))) != 0); - m_institutionConnections = (receivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyInstitution&))) != 0); + m_accountConnections = (tqreceivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyAccount&))) != 0); + m_institutionConnections = (tqreceivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyInstitution&))) != 0); setDragEnabled(m_accountConnections | m_institutionConnections); setAcceptDrops(m_accountConnections | m_institutionConnections); } @@ -138,8 +138,8 @@ void KMyMoneyAccountTreeBase::connectNotify(const char * /* s */) void KMyMoneyAccountTreeBase::disconnectNotify(const char * /* s */) { // update drag and drop settings - m_accountConnections = (receivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyAccount&))) != 0); - m_institutionConnections = (receivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyInstitution&))) != 0); + m_accountConnections = (tqreceivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyAccount&))) != 0); + m_institutionConnections = (tqreceivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyInstitution&))) != 0); setDragEnabled(m_accountConnections | m_institutionConnections); setAcceptDrops(m_accountConnections | m_institutionConnections); } @@ -238,7 +238,7 @@ bool KMyMoneyAccountTreeBase::acceptDrag(TQDropEvent* event) const if((rc = (acceptDrops()) && (event->source() == viewport()))) { rc = false; KMyMoneyAccountTreeBaseItem* to = dynamic_cast(itemAt( contentsToViewport(event->pos()) )); - TQString fromId(event->encodedData("text/plain")); + TQString fromId(event->tqencodedData("text/plain")); const KMyMoneyAccountTreeBaseItem* from = findItem(fromId); // we can only move accounts around @@ -296,7 +296,7 @@ void KMyMoneyAccountTreeBase::slotObjectDropped(TQDropEvent* event, TQListViewIt KMyMoneyAccountTreeBaseItem* newParent = dynamic_cast(m_dropItem); if(newParent) { - TQString fromId(event->encodedData("text/plain")); + TQString fromId(event->tqencodedData("text/plain")); const KMyMoneyAccountTreeBaseItem* from = findItem(fromId); // we can only move accounts around @@ -380,7 +380,7 @@ void KMyMoneyAccountTreeBase::slotOpenFolder(void) m_autoopenTimer.stop(); if ( m_dropItem && !m_dropItem->isOpen() ) { m_dropItem->setOpen( TRUE ); - m_dropItem->repaint(); + m_dropItem->tqrepaint(); } } @@ -450,7 +450,7 @@ void KMyMoneyAccountTreeBase::contentsDragMoveEvent(TQDragMoveEvent* e) if (tmpRect != m_lastDropHighlighter) { cleanItemHighlighter(); m_lastDropHighlighter = tmpRect; - viewport()->repaint(tmpRect); + viewport()->tqrepaint(tmpRect); } } } @@ -497,12 +497,12 @@ void KMyMoneyAccountTreeBase::cleanItemHighlighter(void) if(m_lastDropHighlighter.isValid()) { TQRect rect=m_lastDropHighlighter; m_lastDropHighlighter = TQRect(); - // make sure, we repaint a bit more. that's important during + // make sure, we tqrepaint a bit more. that's important during // autoscroll. if we don't do that, parts of the highlighter // do not get removed rect.moveBy(-1, -1); rect.setSize(rect.size() + TQSize(2,2)); - viewport()->repaint(rect, true); + viewport()->tqrepaint(rect, true); } } @@ -514,7 +514,7 @@ void KMyMoneyAccountTreeBase::viewportPaintEvent(TQPaintEvent* e) TQPainter painter(viewport()); // This is where we actually draw the drop-highlighter - tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, m_lastDropHighlighter, colorGroup(), + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, m_lastDropHighlighter, tqcolorGroup(), TQStyle::Style_FocusAtBorder); } } @@ -684,7 +684,7 @@ void KMyMoneyAccountTreeBaseItem::adjustTotalValue(const MyMoneyMoney& diff) { m_totalValue += diff; - // if the entry has no children, + // if the entry has no tqchildren, // or it is the top entry // or it is currently not open // we need to display the value of it diff --git a/kmymoney2/widgets/kmymoneyaccounttreebase.h b/kmymoney2/widgets/kmymoneyaccounttreebase.h index 25113de..9843b9d 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreebase.h +++ b/kmymoney2/widgets/kmymoneyaccounttreebase.h @@ -74,10 +74,10 @@ public: void emitValueChanged(void) { emit valueChanged(); }; /** - * restores the layout from the config file + * restores the tqlayout from the config file * @param group the group to be used from the config file. * At destruction time, we will use this group name to save - * the layout. + * the tqlayout. */ void restoreLayout(const TQString& group); @@ -353,7 +353,7 @@ public: /** * If o is TRUE all child items are shown initially. The user can * hide them by clicking the - icon to the left of the item. If - * o is FALSE, the children of this item are initially hidden. + * o is FALSE, the tqchildren of this item are initially hidden. * The user can show them by clicking the + icon to the left of the item. * * Overrides KListViewItem::setOpen() and exchanges the value field diff --git a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp index d7584c5..950200e 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp +++ b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp @@ -57,14 +57,14 @@ void KMyMoneyAccountTreeForecast::showSummary(MyMoneyForecast& forecast) addColumn(i18n("Current"), -1); //if beginning of forecast is today, set the begin day to next cycle to avoid repeating the first cycle - if(TQDate::currentDate() < forecast.beginForecastDate()) { - daysToBeginDay = TQDate::currentDate().daysTo(forecast.beginForecastDate()); + if(TQDate::tqcurrentDate() < forecast.beginForecastDate()) { + daysToBeginDay = TQDate::tqcurrentDate().daysTo(forecast.beginForecastDate()); } else { daysToBeginDay = forecast.accountsCycle(); } for(int i = 0; ((i*forecast.accountsCycle())+daysToBeginDay) <= forecast.forecastDays(); ++i) { int intervalDays = ((i*forecast.accountsCycle())+daysToBeginDay); - TQString columnName = i18n("%1 days").arg(intervalDays, 0, 10); + TQString columnName = i18n("%1 days").tqarg(intervalDays, 0, 10); addColumn(columnName, -1); } @@ -84,7 +84,7 @@ void KMyMoneyAccountTreeForecast::showDetailed(MyMoneyForecast& forecast) addColumn(i18n("Current"), -1); for(int i = 1; i <= forecast.forecastDays(); ++i) { - TQDate forecastDate = TQDate::currentDate().addDays(i); + TQDate forecastDate = TQDate::tqcurrentDate().addDays(i); TQString columnName = KGlobal::locale()->formatDate(forecastDate, true); addColumn(columnName, -1); } @@ -103,22 +103,22 @@ void KMyMoneyAccountTreeForecast::showAdvanced(MyMoneyForecast& forecast) int daysToBeginDay; //if beginning of forecast is today, set the begin day to next cycle to avoid repeating the first cycle - if(TQDate::currentDate() < forecast.beginForecastDate()) { - daysToBeginDay = TQDate::currentDate().daysTo(forecast.beginForecastDate()); + if(TQDate::tqcurrentDate() < forecast.beginForecastDate()) { + daysToBeginDay = TQDate::tqcurrentDate().daysTo(forecast.beginForecastDate()); } else { daysToBeginDay = forecast.accountsCycle(); } //add columns for(int i = 1; ((i * forecast.accountsCycle()) + daysToBeginDay) <= forecast.forecastDays(); ++i) { - int col = addColumn(i18n("Min Bal %1").arg(i), -1); + int col = addColumn(i18n("Min Bal %1").tqarg(i), -1); setColumnAlignment(col, TQt::AlignRight); - addColumn(i18n("Min Date %1").arg(i), -1); + addColumn(i18n("Min Date %1").tqarg(i), -1); } for(int i = 1; ((i * forecast.accountsCycle()) + daysToBeginDay) <= forecast.forecastDays(); ++i) { - int col = addColumn(i18n("Max Bal %1").arg(i), -1); + int col = addColumn(i18n("Max Bal %1").tqarg(i), -1); setColumnAlignment(col, TQt::AlignRight); - addColumn(i18n("Max Date %1").arg(i), -1); + addColumn(i18n("Max Date %1").tqarg(i), -1); } int col = addColumn(i18n("Average"), -1); setColumnAlignment(col, TQt::AlignRight); @@ -205,8 +205,8 @@ void KMyMoneyAccountTreeForecastItem::updateSummary() MyMoneyFile* file = MyMoneyFile::instance(); int daysToBeginDay; - if(TQDate::currentDate() < m_forecast.beginForecastDate()) { - daysToBeginDay = TQDate::currentDate().daysTo(m_forecast.beginForecastDate()); + if(TQDate::tqcurrentDate() < m_forecast.beginForecastDate()) { + daysToBeginDay = TQDate::tqcurrentDate().daysTo(m_forecast.beginForecastDate()); } else { daysToBeginDay = m_forecast.accountsCycle(); } @@ -221,7 +221,7 @@ void KMyMoneyAccountTreeForecastItem::updateSummary() //add current balance column - TQDate summaryDate = TQDate::currentDate(); + TQDate summaryDate = TQDate::tqcurrentDate(); amountMM = m_forecast.forecastBalance(m_account, summaryDate); //calculate the balance in base currency for the total row @@ -231,7 +231,7 @@ void KMyMoneyAccountTreeForecastItem::updateSummary() it_c++; //iterate through all other columns - for(TQDate summaryDate = TQDate::currentDate().addDays(daysToBeginDay); summaryDate <= m_forecast.forecastEndDate();summaryDate = summaryDate.addDays(m_forecast.accountsCycle()), ++it_c) { + for(TQDate summaryDate = TQDate::tqcurrentDate().addDays(daysToBeginDay); summaryDate <= m_forecast.forecastEndDate();summaryDate = summaryDate.addDays(m_forecast.accountsCycle()), ++it_c) { amountMM = m_forecast.forecastBalance(m_account, summaryDate); //calculate the balance in base currency for the total row @@ -263,7 +263,7 @@ void KMyMoneyAccountTreeForecastItem::updateDetailed() int it_c = 1; // iterator for the columns of the listview - for(TQDate forecastDate = TQDate::currentDate(); forecastDate <= m_forecast.forecastEndDate(); ++it_c, forecastDate = forecastDate.addDays(1)) { + for(TQDate forecastDate = TQDate::tqcurrentDate(); forecastDate <= m_forecast.forecastEndDate(); ++it_c, forecastDate = forecastDate.addDays(1)) { MyMoneyMoney amountMM = m_forecast.forecastBalance(m_account, forecastDate); //calculate the balance in base currency for the total row @@ -329,7 +329,7 @@ void KMyMoneyAccountTreeForecastItem::adjustParentValue(int column, const MyMone m_values[column] += value; m_values[column] = m_values[column].convert(listView()->baseCurrency().smallestAccountFraction()); - // if the entry has no children, + // if the entry has no tqchildren, // or it is the top entry // or it is currently not open // we need to display the value of it diff --git a/kmymoney2/widgets/kmymoneybriefschedule.cpp b/kmymoney2/widgets/kmymoneybriefschedule.cpp index d77287b..a3e3a5f 100644 --- a/kmymoney2/widgets/kmymoneybriefschedule.cpp +++ b/kmymoney2/widgets/kmymoneybriefschedule.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include // ---------------------------------------------------------------------------- @@ -47,8 +47,8 @@ KMyMoneyBriefSchedule::KMyMoneyBriefSchedule(TQWidget *parent, const char *name : kScheduleBriefWidget(parent,name, WStyle_Customize | WStyle_NoBorder) { KIconLoader *ic = KGlobal::iconLoader(); - m_nextButton->setPixmap(BarIcon(TQString::fromLatin1("1rightarrow"))); - m_prevButton->setPixmap(BarIcon(TQString::fromLatin1("1leftarrow"))); + m_nextButton->setPixmap(BarIcon(TQString::tqfromLatin1("1rightarrow"))); + m_prevButton->setPixmap(BarIcon(TQString::tqfromLatin1("1leftarrow"))); connect(m_prevButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrevClicked())); connect(m_nextButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNextClicked())); @@ -94,8 +94,8 @@ void KMyMoneyBriefSchedule::loadSchedule() MyMoneySchedule sched = m_scheduleList[m_index]; m_indexLabel->setText(i18n("%1 of %2") - .arg(TQString::number(m_index+1)) - .arg(TQString::number(m_scheduleList.count()))); + .tqarg(TQString::number(m_index+1)) + .tqarg(TQString::number(m_scheduleList.count()))); m_name->setText(sched.name()); m_type->setText(KMyMoneyUtils::scheduleTypeToString(sched.type())); m_account->setText(sched.account().name()); @@ -107,18 +107,18 @@ void KMyMoneyBriefSchedule::loadSchedule() { int transactions = sched.paymentDates(m_date, sched.endDate()).count()-1; text = i18n("Payment on %1 for %2 with %3 transactions remaining occuring %4.") - .arg(KGlobal::locale()->formatDate(m_date, true)) - .arg(amount.formatMoney(sched.account().fraction())) - .arg(TQString::number(transactions)) - .arg(i18n(sched.occurenceToString())); + .tqarg(KGlobal::locale()->formatDate(m_date, true)) + .tqarg(amount.formatMoney(sched.account().fraction())) + .tqarg(TQString::number(transactions)) + .tqarg(i18n(sched.occurenceToString())); } else { text = i18n("Payment on %1 for %2 occuring %4.") - .arg(KGlobal::locale()->formatDate(m_date, true)) - .arg(amount.formatMoney(sched.account().fraction())) - .arg(i18n(sched.occurenceToString())); + .tqarg(KGlobal::locale()->formatDate(m_date, true)) + .tqarg(amount.formatMoney(sched.account().fraction())) + .tqarg(i18n(sched.occurenceToString())); } - if (m_date < TQDate::currentDate()) + if (m_date < TQDate::tqcurrentDate()) { if (sched.isOverdue()) { @@ -129,13 +129,13 @@ void KMyMoneyBriefSchedule::loadSchedule() if (m_date.isValid()) startD = m_date; - int days = startD.daysTo(TQDate::currentDate()); - int transactions = sched.paymentDates(startD, TQDate::currentDate()).count(); + int days = startD.daysTo(TQDate::tqcurrentDate()); + int transactions = sched.paymentDates(startD, TQDate::tqcurrentDate()).count(); text += "
"; text += i18n("%1 days overdue (%2 occurences).") - .arg(TQString::number(days)) - .arg(TQString::number(transactions)); + .tqarg(TQString::number(days)) + .tqarg(TQString::number(transactions)); text += ""; } } diff --git a/kmymoney2/widgets/kmymoneycalculator.cpp b/kmymoney2/widgets/kmymoneycalculator.cpp index 47d45ed..1a117fa 100644 --- a/kmymoney2/widgets/kmymoneycalculator.cpp +++ b/kmymoney2/widgets/kmymoneycalculator.cpp @@ -50,7 +50,7 @@ kMyMoneyCalculator::kMyMoneyCalculator(TQWidget* parent, const char *name) display->setBackgroundColor(TQColor("#BDFFB4")); display->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - display->setAlignment(TQt::AlignRight | TQt::AlignVCenter); + display->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); grid->addMultiCellWidget(display, 0, 0, 0, 4); buttons[0] = new KPushButton("0", this); @@ -337,7 +337,7 @@ const TQString kMyMoneyCalculator::result(void) const mask = "-%1"; break; } - txt = TQString(mask).arg(txt); + txt = TQString(mask).tqarg(txt); } return txt; } @@ -433,7 +433,7 @@ void kMyMoneyCalculator::setInitialValues(const TQString& value, TQKeyEvent* ev) if(operand.isEmpty()) operand = "0"; else if(negative) - operand = TQString("-%1").arg(operand); + operand = TQString("-%1").tqarg(operand); changeDisplay(operand); diff --git a/kmymoney2/widgets/kmymoneycalculator.h b/kmymoney2/widgets/kmymoneycalculator.h index 5e6d1ad..c015da3 100644 --- a/kmymoney2/widgets/kmymoneycalculator.h +++ b/kmymoney2/widgets/kmymoneycalculator.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/kmymoney2/widgets/kmymoneycalendar.cpp b/kmymoney2/widgets/kmymoneycalendar.cpp index 61b91fd..664548d 100644 --- a/kmymoney2/widgets/kmymoneycalendar.cpp +++ b/kmymoney2/widgets/kmymoneycalendar.cpp @@ -138,10 +138,10 @@ void kMyMoneyCalendar::init( const TQDate &dt ) setFontSize(10); line->setValidator(val); line->installEventFilter( this ); - yearForward->setPixmap(BarIcon(TQString::fromLatin1("2rightarrow"))); - yearBackward->setPixmap(BarIcon(TQString::fromLatin1("2leftarrow"))); - monthForward->setPixmap(BarIcon(TQString::fromLatin1("1rightarrow"))); - monthBackward->setPixmap(BarIcon(TQString::fromLatin1("1leftarrow"))); + yearForward->setPixmap(BarIcon(TQString::tqfromLatin1("2rightarrow"))); + yearBackward->setPixmap(BarIcon(TQString::tqfromLatin1("2leftarrow"))); + monthForward->setPixmap(BarIcon(TQString::tqfromLatin1("1rightarrow"))); + monthBackward->setPixmap(BarIcon(TQString::tqfromLatin1("1leftarrow"))); setDate(dt); // set button texts connect(table, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(dateChangedSlot(TQDate))); connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot())); @@ -200,7 +200,7 @@ kMyMoneyCalendar::resizeEvent(TQResizeEvent*) // ----- calculate button row height: for(count=0; countsizeHint(); + sizes[count]=buttons[count]->tqsizeHint(); buttonHeight=TQMAX(buttonHeight, sizes[count].height()); } else @@ -211,7 +211,7 @@ kMyMoneyCalendar::resizeEvent(TQResizeEvent*) for(count=0; countsizeHint(); + sizes[0]=line->tqsizeHint(); int week_width=d->selectWeek->fontMetrics().width(i18n("Week XX"))+((d->closeButton != 0L) ? 50 : 20); line->setGeometry(0, height()-sizes[0].height(), width()-week_width, sizes[0].height()); d->selectWeek->setGeometry(width()-week_width, height()-sizes[0].height(), week_width, sizes[0].height()); @@ -261,7 +261,7 @@ kMyMoneyCalendar::dateChangedSlot(TQDate date) { kdDebug() << "kMyMoneyCalendar::dateChangedSlot: date changed (" << date.year() << "/" << date.month() << "/" << date.day() << ")." << endl; line->setText(KGlobal::locale()->formatDate(date, true)); - d->selectWeek->setText(i18n("Week %1").arg(weekOfYear(date))); + d->selectWeek->setText(i18n("Week %1").tqarg(weekOfYear(date))); selectMonth->setText(MONTH_NAME(date.month(), date.year(), false)); selectYear->setText(date.toString("yyyy")); emit(dateChanged(date)); @@ -297,7 +297,7 @@ kMyMoneyCalendar::setDate(const TQDate& date) TQString temp; // ----- table->setDate(date); - d->selectWeek->setText(i18n("Week %1").arg(weekOfYear(date))); + d->selectWeek->setText(i18n("Week %1").tqarg(weekOfYear(date))); selectMonth->setText(MONTH_NAME(date.month(), date.year(), false)); temp.setNum(date.year()); selectYear->setText(temp); @@ -341,7 +341,7 @@ kMyMoneyCalendar::selectWeekClicked() KPopupFrame* popup = new KPopupFrame(this); KDateInternalWeekSelector* picker = new KDateInternalWeekSelector(/*fontsize, */popup); // ----- - picker->resize(picker->sizeHint()); + picker->resize(picker->tqsizeHint()); popup->setMainWidget(picker); connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); picker->setFocus(); @@ -380,7 +380,7 @@ kMyMoneyCalendar::selectMonthClicked() KPopupFrame* popup = new KPopupFrame(this); KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(/*fontsize, */popup); // ----- - picker->resize(picker->sizeHint()); + picker->resize(picker->tqsizeHint()); popup->setMainWidget(picker); picker->setFocus(); connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); @@ -412,7 +412,7 @@ kMyMoneyCalendar::selectYearClicked() KPopupFrame* popup = new KPopupFrame(this); KDateInternalYearSelector* picker = new KDateInternalYearSelector(fontsize, popup); // ----- - picker->resize(picker->sizeHint()); + picker->resize(picker->tqsizeHint()); popup->setMainWidget(picker); connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); picker->setFocus(); @@ -470,9 +470,9 @@ kMyMoneyCalendar::lineEnterPressed() } TQSize -kMyMoneyCalendar::sizeHint() const +kMyMoneyCalendar::tqsizeHint() const { - TQSize tableSize=table->sizeHint(); + TQSize tableSize=table->tqsizeHint(); TQWidget *buttons[]={ styleControl, yearBackward, @@ -492,14 +492,14 @@ kMyMoneyCalendar::sizeHint() const for(count=0; countsizeHint(); + sizes[count]=buttons[count]->tqsizeHint(); else sizes[count] = TQSize(0,0); if(buttons[count]==selectMonth) { TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); - cx+=TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().pixelMetric(TQStyle::PM_ButtonMargin)); + cx+=TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin)); } else { cx+=sizes[count].width(); } @@ -508,7 +508,7 @@ kMyMoneyCalendar::sizeHint() const // ----- calculate width hint: cx=TQMAX(cx, tableSize.width()); // line edit ignored // ----- calculate height hint: - cy+=tableSize.height()+line->sizeHint().height(); + cy+=tableSize.height()+line->tqsizeHint().height(); return TQSize(cx, cy); } @@ -540,7 +540,7 @@ kMyMoneyCalendar::setFontSize(int s) } TQFontMetrics metrics(selectMonth->fontMetrics()); for(int i=1; i <= 12; ++i) - { // maxMonthRect is used by sizeHint() + { // maxMonthRect is used by tqsizeHint() r=metrics.boundingRect(MONTH_NAME(i, 2000, false)); maxMonthRect.setWidth(TQMAX(r.width(), maxMonthRect.width())); maxMonthRect.setHeight(TQMAX(r.height(), maxMonthRect.height())); @@ -560,7 +560,7 @@ kMyMoneyCalendar::setCloseButton( bool enable ) TQToolTip::add(d->closeButton, i18n("Close")); d->closeButton->setPixmap( SmallIcon("remove") ); connect( d->closeButton, TQT_SIGNAL( clicked() ), - topLevelWidget(), TQT_SLOT( close() ) ); + tqtopLevelWidget(), TQT_SLOT( close() ) ); } else { delete d->closeButton; diff --git a/kmymoney2/widgets/kmymoneycalendar.h b/kmymoney2/widgets/kmymoneycalendar.h index a96a7c8..4b6f32d 100644 --- a/kmymoney2/widgets/kmymoneycalendar.h +++ b/kmymoney2/widgets/kmymoneycalendar.h @@ -105,7 +105,7 @@ public: * size hint, try adding 28 to each of the reported numbers of * pixels. **/ - TQSize sizeHint() const; + TQSize tqsizeHint() const; /** * Sets the date. @@ -144,7 +144,7 @@ public: /** * By calling this method with @p enable = true, KDatePicker will show * a little close-button in the upper button-row. Clicking the - * close-button will cause the KDatePicker's topLevelWidget()'s close() + * close-button will cause the KDatePicker's tqtopLevelWidget()'s close() * method being called. This is mostly useful for toplevel datepickers * without a window manager decoration. * @see #hasCloseButton diff --git a/kmymoney2/widgets/kmymoneycategory.cpp b/kmymoney2/widgets/kmymoneycategory.cpp index 1b33294..3e74bd3 100644 --- a/kmymoney2/widgets/kmymoneycategory.cpp +++ b/kmymoney2/widgets/kmymoneycategory.cpp @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include #include // ---------------------------------------------------------------------------- @@ -60,7 +60,7 @@ KMyMoneyCategory::KMyMoneyCategory(TQWidget* parent, const char * name, bool spl if(splitButton) { d->frame = new TQFrame(0); d->frame->setFocusProxy(this); - TQHBoxLayout* layout = new TQHBoxLayout(d->frame); + TQHBoxLayout* tqlayout = new TQHBoxLayout(d->frame); // make sure not to use our own overridden version of reparent() here KMyMoneyCombo::reparent(d->frame, getWFlags() & ~WType_Mask, TQPoint(0, 0), true); if(parent) @@ -72,8 +72,8 @@ KMyMoneyCategory::KMyMoneyCategory(TQWidget* parent, const char * name, bool spl KIcon::SizeSmall)), "", ""); d->splitButton = new KPushButton(splitButtonItem, d->frame, "splitButton"); - layout->addWidget(this, 5); - layout->addWidget(d->splitButton); + tqlayout->addWidget(this, 5); + tqlayout->addWidget(d->splitButton); } m_completion = new kMyMoneyAccountCompletion(this, 0); @@ -83,7 +83,7 @@ KMyMoneyCategory::KMyMoneyCategory(TQWidget* parent, const char * name, bool spl KMyMoneyCategory::~KMyMoneyCategory() { - // make sure to wipe out the frame, button and layout + // make sure to wipe out the frame, button and tqlayout if(d->frame && !d->frame->parentWidget()) d->frame->deleteLater(); diff --git a/kmymoney2/widgets/kmymoneycategory.h b/kmymoney2/widgets/kmymoneycategory.h index 34b5d14..fa2975c 100644 --- a/kmymoney2/widgets/kmymoneycategory.h +++ b/kmymoney2/widgets/kmymoneycategory.h @@ -79,7 +79,7 @@ public: * @code * KMyMoneyCategory* category = new KMyMoneyCategory; * category->reparent(newParent); - * layout->addWidget(category); + * tqlayout->addWidget(category); * table->setCellWidget(category); * @endcode * @@ -88,7 +88,7 @@ public: * @code * KMyMoneyCategory* category = new KMyMoneyCategory(0, 0, true); * category->reparent(newParent); - * layout->addWidget(category->parentWidget()); + * tqlayout->addWidget(category->parentWidget()); * table->setCellWidget(category->parentWidget()); * @endcode */ diff --git a/kmymoney2/widgets/kmymoneychecklistitem.cpp b/kmymoney2/widgets/kmymoneychecklistitem.cpp index 49b96fa..039d2c8 100644 --- a/kmymoney2/widgets/kmymoneychecklistitem.cpp +++ b/kmymoney2/widgets/kmymoneychecklistitem.cpp @@ -85,7 +85,7 @@ void KMyMoneyCheckListItem::stateChange(bool state) emit stateChanged(state); } -void KMyMoneyCheckListItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) +void KMyMoneyCheckListItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) { TQColorGroup _cg = cg; _cg.setColor(TQColorGroup::Base, backgroundColor()); @@ -95,7 +95,7 @@ void KMyMoneyCheckListItem::paintCell(TQPainter *p, const TQColorGroup &cg, int f.setBold(!isSelectable()); p->setFont(f); - TQCheckListItem::paintCell(p, _cg, column, width, alignment); + TQCheckListItem::paintCell(p, _cg, column, width, tqalignment); } const TQColor KMyMoneyCheckListItem::backgroundColor() diff --git a/kmymoney2/widgets/kmymoneychecklistitem.h b/kmymoney2/widgets/kmymoneychecklistitem.h index cbfb30f..26624f4 100644 --- a/kmymoney2/widgets/kmymoneychecklistitem.h +++ b/kmymoney2/widgets/kmymoneychecklistitem.h @@ -56,7 +56,7 @@ public: /** * use my own paint method */ - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); /** * use my own backgroundColor method diff --git a/kmymoney2/widgets/kmymoneycombo.cpp b/kmymoney2/widgets/kmymoneycombo.cpp index 37f4517..0d8ce4d 100644 --- a/kmymoney2/widgets/kmymoneycombo.cpp +++ b/kmymoney2/widgets/kmymoneycombo.cpp @@ -131,12 +131,12 @@ void KMyMoneyCombo::paintEvent(TQPaintEvent* ev) // is that length 1 is the blank case so no need to do painting if(str.length() > 1) { TQPainter p( this ); - const TQColorGroup & g = colorGroup(); + const TQColorGroup & g = tqcolorGroup(); p.setPen(g.text()); TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ); - re = TQStyle::visualRect(re, this); + re = TQStyle::tqvisualRect(re, this); p.setClipRect( re ); p.save(); p.setFont(font()); @@ -182,7 +182,7 @@ bool KMyMoneyCombo::isInArrowArea(const TQPoint& pos) const { TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow); - arrowRect = TQStyle::visualRect(arrowRect, this); + arrowRect = TQStyle::tqvisualRect(arrowRect, this); // Correction for motif style, where arrow is smaller // and thus has a rect that doesn't fit the button. @@ -267,7 +267,7 @@ void KMyMoneyCombo::focusOutEvent(TQFocusEvent* e) m_id = TQString(); if(!id.isEmpty()) emit itemSelected(m_id); - repaint(); + tqrepaint(); } m_inFocusOutEvent = false; } @@ -305,9 +305,9 @@ void KMyMoneyCombo::setSelectedItem(const TQString& id) update(); } -TQSize KMyMoneyCombo::sizeHint() const +TQSize KMyMoneyCombo::tqsizeHint() const { - return KComboBox::sizeHint(); + return KComboBox::tqsizeHint(); // I wanted to use the code below to adjust the size of the combo box // according to the largest item in the selector list. Apparently that @@ -325,11 +325,11 @@ TQSize KMyMoneyCombo::sizeHint() const if ( w > maxW ) maxW = w; - TQSize sizeHint = (style().sizeFromContents(TQStyle::CT_ComboBox, this, + TQSize tqsizeHint = (style().sizeFromContents(TQStyle::CT_ComboBox, this, TQSize(maxW, maxH)). expandedTo(TQApplication::globalStrut())); - return sizeHint; + return tqsizeHint; #endif } diff --git a/kmymoney2/widgets/kmymoneycombo.h b/kmymoney2/widgets/kmymoneycombo.h index 7581002..32f4ec5 100644 --- a/kmymoney2/widgets/kmymoneycombo.h +++ b/kmymoney2/widgets/kmymoneycombo.h @@ -143,7 +143,7 @@ public: /** * Overridden to support our own completion box */ - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected slots: virtual void slotItemSelected(const TQString& id); diff --git a/kmymoney2/widgets/kmymoneycompletion.cpp b/kmymoney2/widgets/kmymoneycompletion.cpp index 41fa082..fbcc8a5 100644 --- a/kmymoney2/widgets/kmymoneycompletion.cpp +++ b/kmymoney2/widgets/kmymoneycompletion.cpp @@ -76,7 +76,7 @@ void kMyMoneyCompletion::adjustSize(void) void kMyMoneyCompletion::adjustSize(const int count) { - int w = m_widget->sizeHint().width(); + int w = m_widget->tqsizeHint().width(); if(m_parent && w < m_parent->width()) w = m_parent->width(); diff --git a/kmymoney2/widgets/kmymoneycurrencyselector.cpp b/kmymoney2/widgets/kmymoneycurrencyselector.cpp index f99dd93..b2637a2 100644 --- a/kmymoney2/widgets/kmymoneycurrencyselector.cpp +++ b/kmymoney2/widgets/kmymoneycurrencyselector.cpp @@ -96,9 +96,9 @@ void KMyMoneySecuritySelector::update(const TQString& id) default: case FullName: if((*it).isCurrency()) { - display = TQString("%2 (%1)").arg((*it).id()).arg((*it).name()); + display = TQString("%2 (%1)").tqarg((*it).id()).tqarg((*it).name()); } else - display = TQString("%2 (%1)").arg((*it).tradingSymbol()).arg((*it).name()); + display = TQString("%2 (%1)").tqarg((*it).tradingSymbol()).tqarg((*it).name()); break; break; diff --git a/kmymoney2/widgets/kmymoneydateinput.cpp b/kmymoney2/widgets/kmymoneydateinput.cpp index 59c838c..37db28b 100644 --- a/kmymoney2/widgets/kmymoneydateinput.cpp +++ b/kmymoney2/widgets/kmymoneydateinput.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -72,12 +72,12 @@ bool KMyMoneyDateEdit::event(TQEvent* e) kMyMoneyDateInput::kMyMoneyDateInput(TQWidget *parent, const char *name, TQt::AlignmentFlags flags) : TQHBox(parent,name) { - m_qtalignment = flags; - m_date = TQDate::currentDate(); + m_qttqalignment = flags; + m_date = TQDate::tqcurrentDate(); dateEdit = new KMyMoneyDateEdit(m_date, this, "dateEdit"); setFocusProxy(dateEdit); - focusWidget()->installEventFilter(this); // To get dateEdit's FocusIn/Out and some KeyPress events + tqfocusWidget()->installEventFilter(this); // To get dateEdit's FocusIn/Out and some KeyPress events dateEdit->installEventFilter(this); // To get dateEdit's FocusIn/Out and some KeyPress events m_datePopup = new KPassivePopup(dateEdit, "datePopup"); @@ -165,13 +165,13 @@ void kMyMoneyDateInput::show(void) void kMyMoneyDateInput::fixSize(void) { - // According to a hint in the documentation of KDatePicker::sizeHint() + // According to a hint in the documentation of KDatePicker::tqsizeHint() // 28 pixels should be added in each direction to obtain a better // display of the month button. I decided, (22,14) is good // enough and save some space on the screen (ipwizard) - m_dateFrame->setFixedSize(m_datePicker->sizeHint() + TQSize(22, 14)); + m_dateFrame->setFixedSize(m_datePicker->tqsizeHint() + TQSize(22, 14)); - dateEdit->setMinimumWidth(dateEdit->minimumSizeHint().width() + 6); + dateEdit->setMinimumWidth(dateEdit->tqminimumSizeHint().width() + 6); } kMyMoneyDateInput::~kMyMoneyDateInput() @@ -191,7 +191,7 @@ void kMyMoneyDateInput::toggleDatePicker() } else { - TQPoint tmpPoint = mapToGlobal(m_dateButton->geometry().bottomRight()); + TQPoint tmpPoint = mapToGlobal(m_dateButton->tqgeometry().bottomRight()); // usually, the datepicker widget is shown underneath the dateEdit widget // if it does not fit on the screen, we show it above this widget @@ -200,7 +200,7 @@ void kMyMoneyDateInput::toggleDatePicker() tmpPoint.setY(tmpPoint.y() - h - m_dateButton->height()); } - if((m_qtalignment == TQt::AlignRight && tmpPoint.x()+w <= TQApplication::desktop()->width()) + if((m_qttqalignment == TQt::AlignRight && tmpPoint.x()+w <= TQApplication::desktop()->width()) || (tmpPoint.x()-w < 0) ) { m_dateFrame->setGeometry(tmpPoint.x()-width(), tmpPoint.y(), w, h); @@ -217,7 +217,7 @@ void kMyMoneyDateInput::toggleDatePicker() } else { - m_datePicker->setDate(TQDate::currentDate()); + m_datePicker->setDate(TQDate::tqcurrentDate()); } m_dateFrame->show(); } @@ -255,14 +255,14 @@ void kMyMoneyDateInput::keyPressEvent(TQKeyEvent * k) default: if(today.contains(KKey(k)) || k->key() == Key_T) { - slotDateChosen(TQDate::currentDate()); + slotDateChosen(TQDate::tqcurrentDate()); } break; } } /** - * This function receives all events that are sent to focusWidget(). + * This function receives all events that are sent to tqfocusWidget(). * Some KeyPress events are intercepted and passed to keyPressEvent. * Otherwise they would be consumed by TQDateEdit. */ @@ -337,7 +337,7 @@ void kMyMoneyDateInput::resetDate(void) setDate(m_prevDate); } -TQWidget* kMyMoneyDateInput::focusWidget(void) const +TQWidget* kMyMoneyDateInput::tqfocusWidget(void) const { TQWidget* w = dateEdit; while(w->focusProxy()) diff --git a/kmymoney2/widgets/kmymoneydateinput.h b/kmymoney2/widgets/kmymoneydateinput.h index d3c3f33..2b72936 100644 --- a/kmymoney2/widgets/kmymoneydateinput.h +++ b/kmymoney2/widgets/kmymoneydateinput.h @@ -77,7 +77,7 @@ public: void setDate(TQDate date); void loadDate(const TQDate& date); void resetDate(void); - TQWidget* focusWidget(void) const; + TQWidget* tqfocusWidget(void) const; virtual void setRange(const TQDate & min, const TQDate & max) { dateEdit->setRange(min, max); } void markAsBadDate(bool bad = false, const TQColor& = TQColor()); @@ -98,7 +98,7 @@ protected: void keyPressEvent(TQKeyEvent * k); void resizeEvent(TQResizeEvent*); - /** To intercept events sent to focusWidget() */ + /** To intercept events sent to tqfocusWidget() */ bool eventFilter(TQObject *o, TQEvent *e); protected slots: @@ -114,7 +114,7 @@ private: KDatePicker *m_datePicker; TQDate m_date; // The date ! TQDate m_prevDate; - TQt::AlignmentFlags m_qtalignment; + TQt::AlignmentFlags m_qttqalignment; TQVBox *m_dateFrame; KPushButton *m_dateButton; KPassivePopup *m_datePopup; diff --git a/kmymoney2/widgets/kmymoneydatetbl.cpp b/kmymoney2/widgets/kmymoneydatetbl.cpp index 37d1311..ccff3c6 100644 --- a/kmymoney2/widgets/kmymoneydatetbl.cpp +++ b/kmymoney2/widgets/kmymoneydatetbl.cpp @@ -80,7 +80,7 @@ kMyMoneyDateTbl::kMyMoneyDateTbl(TQWidget *parent, TQDate date_, const char* nam if(!date_.isValid()) { kdDebug() << "kMyMoneyDateTbl ctor: WARNING: Given date is invalid, using current date." << endl; - date_=TQDate::currentDate(); + date_=TQDate::tqcurrentDate(); } setFocusPolicy( TQ_StrongFocus ); @@ -168,8 +168,8 @@ kMyMoneyDateTbl::paintCell(TQPainter *painter, int row, int col) TQString weekStr = TQString::number(date.weekNumber(&year)); TQString yearStr = TQString::number(year); headerText = i18n("Week %1 for year %2.") - .arg(weekStr) - .arg(yearStr); + .tqarg(weekStr) + .tqarg(yearStr); painter->drawText(0, 0, w, h-1, AlignCenter, headerText, -1, &rect); @@ -307,7 +307,7 @@ kMyMoneyDateTbl::keyPressEvent( TQKeyEvent *e ) return; } if ( e->key() == TQt::Key_N ) { - setDate(TQDate::currentDate()); + setDate(TQDate::tqcurrentDate()); return; } @@ -352,7 +352,7 @@ kMyMoneyDateTbl::setFontSize(int size) } // ----- compare with a real wide number and add some space: - rect=metrics.boundingRect(TQString::fromLatin1("88")); + rect=metrics.boundingRect(TQString::tqfromLatin1("88")); maxCell.setWidth(TQMAX(maxCell.width()+2, rect.width())); maxCell.setHeight(TQMAX(maxCell.height()+4, rect.height())); } @@ -517,14 +517,14 @@ void kMyMoneyDateTbl::focusOutEvent( TQFocusEvent *e ) } TQSize -kMyMoneyDateTbl::sizeHint() const +kMyMoneyDateTbl::tqsizeHint() const { if (maxCell.height()>0 && maxCell.width()>0) { return TQSize(maxCell.width()*numCols()+2*frameWidth(), (maxCell.height()+2)*numRows()+2*frameWidth()); } else { - kdDebug() << "kMyMoneyDateTbl::sizeHint: obscure failure - " << endl; + kdDebug() << "kMyMoneyDateTbl::tqsizeHint: obscure failure - " << endl; return TQSize(-1, -1); } } diff --git a/kmymoney2/widgets/kmymoneydatetbl.h b/kmymoney2/widgets/kmymoneydatetbl.h index 7de402d..96e57ee 100644 --- a/kmymoney2/widgets/kmymoneydatetbl.h +++ b/kmymoney2/widgets/kmymoneydatetbl.h @@ -75,16 +75,16 @@ public: * The constructor. */ kMyMoneyDateTbl(TQWidget *parent=0, - TQDate date=TQDate::currentDate(), + TQDate date=TQDate::tqcurrentDate(), const char* name=0, WFlags f=0); /** * Returns a recommended size for the widget. * To save some time, the size of the largest used cell content is * calculated in each paintCell() call, since all calculations have * to be done there anyway. The size is stored in maxCell. The - * sizeHint() simply returns a multiple of maxCell. + * tqsizeHint() simply returns a multiple of maxCell. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** * Set the font size of the date table. */ diff --git a/kmymoney2/widgets/kmymoneyedit.cpp b/kmymoney2/widgets/kmymoneyedit.cpp index c3ad220..2cbb6b3 100644 --- a/kmymoney2/widgets/kmymoneyedit.cpp +++ b/kmymoney2/widgets/kmymoneyedit.cpp @@ -118,7 +118,7 @@ TQValidator::State kMyMoneyMoneyValidator::validate( TQString & input, int & _p // check for minus sign trailing the number TQRegExp trailingMinus("^([^-]*)\\w*-$"); if(s.find(trailingMinus) != -1) { - s = TQString("-%1").arg(trailingMinus.cap(1)); + s = TQString("-%1").tqarg(trailingMinus.cap(1)); } // check for the maximum allowed number of decimal places @@ -211,7 +211,7 @@ void kMyMoneyEdit::init(void) // Yes, just a simple double validator ! kMyMoneyMoneyValidator *validator = new kMyMoneyMoneyValidator(TQT_TQOBJECT(this)); m_edit->setValidator(validator); - m_edit->setAlignment(AlignRight | AlignVCenter); + m_edit->tqsetAlignment(AlignRight | AlignVCenter); m_calculatorFrame = new TQVBox(this, 0, WType_Popup); @@ -223,15 +223,15 @@ void kMyMoneyEdit::init(void) m_calculatorFrame->hide(); m_calcButton = new KPushButton(TQIconSet(TQPixmap(KGlobal::iconLoader()->iconPath("kcalc", -KIcon::SizeSmall))), TQString(""), this); - m_calcButton->setFixedWidth( m_calcButton->sizeHint().width() ); - m_calcButton->setFixedHeight(m_edit->sizeHint().height()); + m_calcButton->setFixedWidth( m_calcButton->tqsizeHint().width() ); + m_calcButton->setFixedHeight(m_edit->tqsizeHint().height()); m_calcButton->setFocusProxy(m_edit); TQPixmap pixmap; pixmap.loadFromData(resetButtonImage, sizeof(resetButtonImage), "PNG", 0); m_resetButton = new KPushButton(TQIconSet(pixmap), TQString(""), this); - m_resetButton->setFixedWidth( m_resetButton->sizeHint().width() ); - m_resetButton->setFixedHeight(m_edit->sizeHint().height()); + m_resetButton->setFixedWidth( m_resetButton->tqsizeHint().width() ); + m_resetButton->setFixedHeight(m_edit->tqsizeHint().height()); m_resetButton->setEnabled(false); m_resetButton->setFocusProxy(m_edit); @@ -477,7 +477,7 @@ void kMyMoneyEdit::calculatorOpen(TQKeyEvent* k) if(p.x() + w > TQApplication::desktop()->width()) p.setX(p.x() + width() - w); - TQRect r = m_calculator->geometry(); + TQRect r = m_calculator->tqgeometry(); r.moveTopLeft(p); m_calculatorFrame->setGeometry(r); m_calculatorFrame->show(); @@ -496,7 +496,7 @@ void kMyMoneyEdit::slotCalculatorResult(void) } } -TQWidget* kMyMoneyEdit::focusWidget(void) const +TQWidget* kMyMoneyEdit::tqfocusWidget(void) const { TQWidget* w = m_edit; while(w->focusProxy()) diff --git a/kmymoney2/widgets/kmymoneyedit.h b/kmymoney2/widgets/kmymoneyedit.h index 2aeea47..3aaacd1 100644 --- a/kmymoney2/widgets/kmymoneyedit.h +++ b/kmymoney2/widgets/kmymoneyedit.h @@ -184,7 +184,7 @@ public: */ int precision(void) { return m_prec; }; - TQWidget* focusWidget(void) const; + TQWidget* tqfocusWidget(void) const; /** * This method allows to modify the behavior of the widget diff --git a/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp b/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp index f9e5c6d..75f3491 100644 --- a/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp +++ b/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include +#include #include #include #include @@ -43,7 +43,7 @@ KMyMoneyForecastListViewItem::~KMyMoneyForecastListViewItem() { } -void KMyMoneyForecastListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) +void KMyMoneyForecastListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) { TQColorGroup _cg = cg; TQColor textColour; @@ -54,7 +54,7 @@ void KMyMoneyForecastListViewItem::paintCell(TQPainter *p, const TQColorGroup &c } _cg.setColor(TQColorGroup::Text, textColour); - KListViewItem::paintCell(p, _cg, column, width, alignment); + KListViewItem::paintCell(p, _cg, column, width, tqalignment); } void KMyMoneyForecastListViewItem::setNegative(bool isNegative) diff --git a/kmymoney2/widgets/kmymoneyforecastlistviewitem.h b/kmymoney2/widgets/kmymoneyforecastlistviewitem.h index fe5fd0a..6a08c61 100644 --- a/kmymoney2/widgets/kmymoneyforecastlistviewitem.h +++ b/kmymoney2/widgets/kmymoneyforecastlistviewitem.h @@ -52,7 +52,7 @@ public: /** * use my own paint method */ - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); private: diff --git a/kmymoney2/widgets/kmymoneygpgconfigdecl.ui b/kmymoney2/widgets/kmymoneygpgconfigdecl.ui index 359e04c..fd8efbc 100644 --- a/kmymoney2/widgets/kmymoneygpgconfigdecl.ui +++ b/kmymoney2/widgets/kmymoneygpgconfigdecl.ui @@ -53,13 +53,13 @@ The <i>Recovery encryption</i> group is only accessible, if the nece RichText - + WordBreak|AlignTop - layout7 + tqlayout7 @@ -109,7 +109,7 @@ The <i>Recovery encryption</i> group is only accessible, if the nece - layout8 + tqlayout8 @@ -133,7 +133,7 @@ The <i>Recovery encryption</i> group is only accessible, if the nece Expanding - + 51 20 @@ -168,7 +168,7 @@ This mechanism is provided for the case that you have lost your key and cannot a RichText - + WordBreak|AlignTop @@ -184,7 +184,7 @@ This mechanism is provided for the case that you have lost your key and cannot a Expanding - + 21 16 diff --git a/kmymoney2/widgets/kmymoneylineedit.cpp b/kmymoney2/widgets/kmymoneylineedit.cpp index 254d400..2250c30 100644 --- a/kmymoney2/widgets/kmymoneylineedit.cpp +++ b/kmymoney2/widgets/kmymoneylineedit.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include // ---------------------------------------------------------------------------- // KDE Includes @@ -35,11 +35,11 @@ #include "kmymoneylineedit.h" -kMyMoneyLineEdit::kMyMoneyLineEdit(TQWidget *w, const char* name, bool forceMonetaryDecimalSymbol, int alignment) : +kMyMoneyLineEdit::kMyMoneyLineEdit(TQWidget *w, const char* name, bool forceMonetaryDecimalSymbol, int tqalignment) : KLineEdit(w, name), m_forceMonetaryDecimalSymbol(forceMonetaryDecimalSymbol) { - setAlignment(alignment); + tqsetAlignment(tqalignment); } kMyMoneyLineEdit::~kMyMoneyLineEdit() @@ -69,7 +69,7 @@ void kMyMoneyLineEdit::focusOutEvent(TQFocusEvent *ev) // force update of hint if(text().isEmpty()) - repaint(); + tqrepaint(); } void kMyMoneyLineEdit::keyReleaseEvent(TQKeyEvent* k) @@ -141,7 +141,7 @@ void kMyMoneyLineEdit::drawContents( TQPainter *p) f.setItalic(true); f.setWeight(TQFont::Light); p->setFont(f); - p->setPen(palette().disabled().text()); + p->setPen(tqpalette().disabled().text()); p->drawText(topLeft, m_hint); diff --git a/kmymoney2/widgets/kmymoneylineedit.h b/kmymoney2/widgets/kmymoneylineedit.h index f0331f6..e97205d 100644 --- a/kmymoney2/widgets/kmymoneylineedit.h +++ b/kmymoney2/widgets/kmymoneylineedit.h @@ -51,11 +51,11 @@ public: * @param w pointer to parent * @param name pointer to name of object * @param forceMonetaryDecimalSymbol if @a true, the numeric keypad comma key will have a fixed - * value and does not follow the keyboard layout (default: @p false) - * @param alignment Controls the alignment of the text. Default is TQt::AlignLeft | TQt::AlignVCenter. + * value and does not follow the keyboard tqlayout (default: @p false) + * @param tqalignment Controls the tqalignment of the text. Default is TQt::AlignLeft | TQt::AlignVCenter. * See TQt::AlignmentFlags for other possible values. */ - kMyMoneyLineEdit(TQWidget *w = 0, const char* name = 0, bool forceMonetaryDecimalSymbol = false, int alignment = (AlignLeft | AlignVCenter)); + kMyMoneyLineEdit(TQWidget *w = 0, const char* name = 0, bool forceMonetaryDecimalSymbol = false, int tqalignment = (AlignLeft | AlignVCenter)); ~kMyMoneyLineEdit(); /** @@ -91,7 +91,7 @@ protected: * out the currently selected monetary decimal symbol instead of the * key defined by the keymap. * - * Example: If you have set the keymap (keyboard layout) as English, then + * Example: If you have set the keymap (keyboard tqlayout) as English, then * the numeric keypad will send a period but if you have set the keymap to * be German, the same key will send a comma. * @@ -104,7 +104,7 @@ protected: * out the currently selected monetary decimal symbol instead of the * key defined by the keymap. * - * Example: If you have set the keymap (keyboard layout) as English, then + * Example: If you have set the keymap (keyboard tqlayout) as English, then * the numeric keypad will send a period but if you have set the keymap to * be German, the same key will send a comma. * diff --git a/kmymoney2/widgets/kmymoneylistviewitem.cpp b/kmymoney2/widgets/kmymoneylistviewitem.cpp index 492ec9d..2ed4377 100644 --- a/kmymoney2/widgets/kmymoneylistviewitem.cpp +++ b/kmymoney2/widgets/kmymoneylistviewitem.cpp @@ -23,7 +23,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include +#include // ---------------------------------------------------------------------------- // KDE Includes @@ -71,7 +71,7 @@ TQString KMyMoneyListViewItem::key(int column, bool ascending) const } -void KMyMoneyListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) +void KMyMoneyListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) { TQColorGroup _cg = cg; _cg.setColor(TQColorGroup::Base, backgroundColor()); @@ -79,7 +79,7 @@ void KMyMoneyListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int c // make sure to bypass KListViewItem::paintCell() as // we don't like it's logic - that's why we do this // here ;-) (ipwizard) - TQListViewItem::paintCell(p, _cg, column, width, alignment); + TQListViewItem::paintCell(p, _cg, column, width, tqalignment); } const TQColor KMyMoneyListViewItem::backgroundColor() diff --git a/kmymoney2/widgets/kmymoneylistviewitem.h b/kmymoney2/widgets/kmymoneylistviewitem.h index 015a002..72e41ea 100644 --- a/kmymoney2/widgets/kmymoneylistviewitem.h +++ b/kmymoney2/widgets/kmymoneylistviewitem.h @@ -55,7 +55,7 @@ public: /** * use my own paint method */ - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); /** * use my own backgroundColor method diff --git a/kmymoney2/widgets/kmymoneyonlinequoteconfigdecl.ui b/kmymoney2/widgets/kmymoneyonlinequoteconfigdecl.ui index 88f95f7..2392f80 100644 --- a/kmymoney2/widgets/kmymoneyonlinequoteconfigdecl.ui +++ b/kmymoney2/widgets/kmymoneyonlinequoteconfigdecl.ui @@ -12,7 +12,7 @@ 487 - + 0 0 @@ -71,7 +71,7 @@ - layout3 + tqlayout3 @@ -174,7 +174,7 @@ - layout15 + tqlayout15 @@ -206,7 +206,7 @@ Expanding - + 240 20 diff --git a/kmymoney2/widgets/kmymoneyreportconfigtab1decl.ui b/kmymoney2/widgets/kmymoneyreportconfigtab1decl.ui index a023c37..4a84ee7 100644 --- a/kmymoney2/widgets/kmymoneyreportconfigtab1decl.ui +++ b/kmymoney2/widgets/kmymoneyreportconfigtab1decl.ui @@ -27,7 +27,7 @@ - layout35 + tqlayout35 @@ -53,7 +53,7 @@ - layout36 + tqlayout36 @@ -110,7 +110,7 @@ Expanding - + 20 20 diff --git a/kmymoney2/widgets/kmymoneyreportconfigtab2decl.ui b/kmymoney2/widgets/kmymoneyreportconfigtab2decl.ui index ef5ea58..04b6e71 100644 --- a/kmymoney2/widgets/kmymoneyreportconfigtab2decl.ui +++ b/kmymoney2/widgets/kmymoneyreportconfigtab2decl.ui @@ -27,7 +27,7 @@ - layout10 + tqlayout10 @@ -35,7 +35,7 @@ - layout9 + tqlayout9 @@ -226,7 +226,7 @@ Expanding - + 94 21 @@ -269,7 +269,7 @@ Expanding - + 20 40 diff --git a/kmymoney2/widgets/kmymoneyreportconfigtab3decl.ui b/kmymoney2/widgets/kmymoneyreportconfigtab3decl.ui index 7c4c06f..6b23280 100644 --- a/kmymoney2/widgets/kmymoneyreportconfigtab3decl.ui +++ b/kmymoney2/widgets/kmymoneyreportconfigtab3decl.ui @@ -35,7 +35,7 @@ - layout11 + tqlayout11 @@ -125,7 +125,7 @@ Expanding - + 358 16 @@ -136,7 +136,7 @@ - layout4 + tqlayout4 @@ -174,7 +174,7 @@ m_checkMemo - + 0 0 @@ -235,7 +235,7 @@ m_checkNumber - + 0 0 @@ -252,7 +252,7 @@ m_checkPayee - + 0 0 @@ -269,7 +269,7 @@ m_checkCategory - + 0 0 @@ -316,7 +316,7 @@ Expanding - + 205 20 @@ -327,7 +327,7 @@ - layout10 + tqlayout10 @@ -386,7 +386,7 @@ Expanding - + 20 16 diff --git a/kmymoney2/widgets/kmymoneyreportconfigtabchartdecl.ui b/kmymoney2/widgets/kmymoneyreportconfigtabchartdecl.ui index 9e1fda3..452e69c 100644 --- a/kmymoney2/widgets/kmymoneyreportconfigtabchartdecl.ui +++ b/kmymoney2/widgets/kmymoneyreportconfigtabchartdecl.ui @@ -27,7 +27,7 @@ - layout5 + tqlayout5 @@ -92,7 +92,7 @@ Expanding - + 121 20 @@ -136,7 +136,7 @@ - layout6 + tqlayout6 @@ -182,7 +182,7 @@ Expanding - + 121 20 @@ -201,7 +201,7 @@ Expanding - + 20 20 diff --git a/kmymoney2/widgets/kmymoneyreportcontroldecl.ui b/kmymoney2/widgets/kmymoneyreportcontroldecl.ui index d13da36..00ba7e0 100644 --- a/kmymoney2/widgets/kmymoneyreportcontroldecl.ui +++ b/kmymoney2/widgets/kmymoneyreportcontroldecl.ui @@ -29,7 +29,7 @@ buttonChart - + 75 0 @@ -46,7 +46,7 @@ buttonConfigure - + 75 0 @@ -63,7 +63,7 @@ buttonNew - + 75 0 @@ -80,7 +80,7 @@ buttonCopy - + 75 0 @@ -97,7 +97,7 @@ buttonExport - + 75 0 @@ -114,7 +114,7 @@ buttonDelete - + 75 0 @@ -131,7 +131,7 @@ buttonClose - + 75 0 diff --git a/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp b/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp index 9f6d131..4599eb5 100644 --- a/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp +++ b/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp @@ -59,7 +59,7 @@ kMyMoneyScheduledCalendar::kMyMoneyScheduledCalendar(TQWidget *parent, const cha setUserButton1(true, pb1); - init( TQDate::currentDate() ); + init( TQDate::tqcurrentDate() ); connect(m_scheduledDateTable, TQT_SIGNAL(enterClicked(const MyMoneySchedule&, const TQDate&)), this, TQT_SIGNAL(enterClicked(const MyMoneySchedule&, const TQDate&))); diff --git a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp index f15773c..5562d31 100644 --- a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp +++ b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp @@ -176,7 +176,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/, for (iter=schedules.begin(); iter!=schedules.end(); ++iter) { MyMoneySchedule schedule = *iter; - if (theDate < TQDate::currentDate()) + if (theDate < TQDate::tqcurrentDate()) { if (schedule.isOverdue()) { @@ -238,7 +238,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/, if (billSchedules.count() >= 1) { - text += i18n("%1 Bills.").arg(TQString::number(billSchedules.count())); + text += i18n("%1 Bills.").tqarg(TQString::number(billSchedules.count())); } } @@ -254,7 +254,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/, { if(!text.isEmpty()) text += " "; - text += i18n("%1 Deposits.").arg(TQString::number(depositSchedules.count())); + text += i18n("%1 Deposits.").tqarg(TQString::number(depositSchedules.count())); } } @@ -270,7 +270,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/, { if(!text.isEmpty()) text += " "; - text += i18n("%1 Transfers.").arg(TQString::number(transferSchedules.count())); + text += i18n("%1 Transfers.").tqarg(TQString::number(transferSchedules.count())); } } } @@ -286,7 +286,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/, for (iter=transferSchedules.begin(); iter!=transferSchedules.end(); ++iter) { MyMoneySchedule schedule = *iter; - if (theDate < TQDate::currentDate()) + if (theDate < TQDate::tqcurrentDate()) { if (schedule.isOverdue()) { @@ -301,7 +301,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/, for (iter=depositSchedules.begin(); iter!=depositSchedules.end(); ++iter) { MyMoneySchedule schedule = *iter; - if (theDate < TQDate::currentDate()) + if (theDate < TQDate::tqcurrentDate()) { if (schedule.isOverdue()) { @@ -316,7 +316,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/, for (iter=billSchedules.begin(); iter!=billSchedules.end(); ++iter) { MyMoneySchedule schedule = *iter; - if (theDate < TQDate::currentDate()) + if (theDate < TQDate::tqcurrentDate()) { if (schedule.isOverdue()) { diff --git a/kmymoney2/widgets/kmymoneyscheduleddatetbl.h b/kmymoney2/widgets/kmymoneyscheduleddatetbl.h index f2b9c27..e607ad0 100644 --- a/kmymoney2/widgets/kmymoneyscheduleddatetbl.h +++ b/kmymoney2/widgets/kmymoneyscheduleddatetbl.h @@ -46,7 +46,7 @@ class kMyMoneyScheduledDateTbl : public kMyMoneyDateTbl TQ_OBJECT public: kMyMoneyScheduledDateTbl(TQWidget *parent=0, - TQDate date=TQDate::currentDate(), + TQDate date=TQDate::tqcurrentDate(), const char* name=0, WFlags f=0); ~kMyMoneyScheduledDateTbl(); diff --git a/kmymoney2/widgets/kmymoneyselector.cpp b/kmymoney2/widgets/kmymoneyselector.cpp index cd110ed..17428ce 100644 --- a/kmymoney2/widgets/kmymoneyselector.cpp +++ b/kmymoney2/widgets/kmymoneyselector.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include +#include #include #include #include @@ -319,7 +319,7 @@ void KMyMoneySelector::removeItem(const TQString& id) it++; } - // get rid of top items that just lost the last children (e.g. Favorites) + // get rid of top items that just lost the last tqchildren (e.g. Favorites) it = TQListViewItemIterator(m_listView, TQListViewItemIterator::NotSelectable); while((it_v = it.current()) != 0) { if(it_v->rtti() == 1) { @@ -536,14 +536,14 @@ int KMyMoneySelector::slotMakeCompletion(const TQRegExp& exp) TQListViewItem* it_v; // The logic used here seems to be awkward. The problem is, that - // TQListViewItem::setVisible works recursively on all it's children - // and grand-children. + // TQListViewItem::setVisible works recursively on all it's tqchildren + // and grand-tqchildren. // // The way out of this is as follows: Make all items visible. // Then go through the list again and perform the checks. - // If an item does not have any children (last leaf in the tree view) + // If an item does not have any tqchildren (last leaf in the tree view) // perform the check. Then check recursively on the parent of this - // leaf that it has no visible children. If that is the case, make the + // leaf that it has no visible tqchildren. If that is the case, make the // parent invisible and continue this check with it's parent. while((it_v = it.current()) != 0) { it_v->setVisible(true); @@ -558,12 +558,12 @@ int KMyMoneySelector::slotMakeCompletion(const TQRegExp& exp) if(it_v->firstChild() == 0) { if(!match(exp, it_v)) { // this is a node which does not contain the - // text and does not have children. So we can + // text and does not have tqchildren. So we can // safely hide it. Then we check, if the parent - // has more children which are still visible. If + // has more tqchildren which are still visible. If // none are found, the parent node is hidden also. We // continue until the top of the tree or until we - // find a node that still has visible children. + // find a node that still has visible tqchildren. bool hide = true; while(hide) { it_v->setVisible(false); @@ -587,7 +587,7 @@ int KMyMoneySelector::slotMakeCompletion(const TQRegExp& exp) if(!firstMatch) { firstMatch = it_v; } - // a node with children contains the text. We want + // a node with tqchildren contains the text. We want // to display all child nodes in this case, so we need // to advance the iterator to the next sibling of the // current node. This could well be the sibling of a @@ -606,7 +606,7 @@ int KMyMoneySelector::slotMakeCompletion(const TQRegExp& exp) } while(it.current() && it.current() != item); } else { - // It's a node with children that does not match. We don't + // It's a node with tqchildren that does not match. We don't // change it's status here. ++it; } @@ -661,7 +661,7 @@ void KMyMoneySelector::slotListRightMouse(TQListViewItem* it_v, const TQPoint& p KMyMoneyCheckListItem* it_c = static_cast(it_v); if(it_c->type() == TQCheckListItem::CheckBox) { // the following is copied from TQCheckListItem::activate() et al - int boxsize = m_listView->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, m_listView); + int boxsize = m_listView->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, m_listView); int align = m_listView->columnAlignment( 0 ); int marg = m_listView->itemMargin(); int y = 0; @@ -675,7 +675,7 @@ void KMyMoneySelector::slotListRightMouse(TQListViewItem* it_v, const TQPoint& p // columns might have been swapped r.moveBy( m_listView->header()->sectionPos( 0 ), 0 ); - TQPoint topLeft = m_listView->itemRect(it_v).topLeft(); //### inefficient? + TQPoint topLeft = m_listView->tqitemRect(it_v).topLeft(); //### inefficient? TQPoint p = m_listView->mapFromGlobal( pos ) - topLeft; int xdepth = m_listView->treeStepSize() * (it_v->depth() + (m_listView->rootIsDecorated() ? 1 : 0)) diff --git a/kmymoney2/widgets/kmymoneytitlelabel.cpp b/kmymoney2/widgets/kmymoneytitlelabel.cpp index 4abef85..db3dba2 100644 --- a/kmymoney2/widgets/kmymoneytitlelabel.cpp +++ b/kmymoney2/widgets/kmymoneytitlelabel.cpp @@ -91,7 +91,7 @@ void KMyMoneyTitleLabel::drawContents(TQPainter *p) TQLabel::drawContents(p); // then draw text on top - tqstyle().drawItem( p, contentsRect(), alignment(), colorGroup(), isEnabled(), + tqstyle().drawItem( p, contentsRect(), tqalignment(), tqcolorGroup(), isEnabled(), 0, TQString(" ")+m_text, -1, &m_textColor ); } diff --git a/kmymoney2/widgets/kmymoneywizard.cpp b/kmymoney2/widgets/kmymoneywizard.cpp index 220bc2e..0c038bc 100644 --- a/kmymoney2/widgets/kmymoneywizard.cpp +++ b/kmymoney2/widgets/kmymoneywizard.cpp @@ -17,7 +17,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include +#include #include #include #include @@ -132,7 +132,7 @@ KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, W m_helpButton->setIconSet( SmallIconSet( "help" ) ); } - // create button layout + // create button tqlayout m_buttonLayout = new TQHBoxLayout; m_buttonLayout->addWidget(m_helpButton); m_buttonLayout->addStretch(1); @@ -141,21 +141,21 @@ KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, W m_buttonLayout->addWidget(m_finishButton); m_buttonLayout->addWidget(m_cancelButton); - // create wizard layout + // create wizard tqlayout m_wizardLayout = new TQVBoxLayout(this, 6, 0, "wizardLayout"); m_titleLabel = new KMyMoneyTitleLabel(this, "titleLabel"); m_wizardLayout->addWidget(m_titleLabel); TQHBoxLayout* hboxLayout = new TQHBoxLayout(0, 0, 6, "hboxLayout"); - // create stage layout and frame + // create stage tqlayout and frame m_stepFrame = new TQFrame(this, "stepFrame"); m_stepFrame->setPaletteBackgroundColor(KGlobalSettings::highlightColor()); m_stepLayout = new TQVBoxLayout(m_stepFrame, 11, 6, "stepLayout"); m_stepLayout->addWidget(new TQLabel("", m_stepFrame)); m_stepLayout->addItem(new TQSpacerItem(20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); m_stepLabel = new TQLabel(m_stepFrame, "stepLabel"); - m_stepLabel->setAlignment(TQt::AlignHCenter); + m_stepLabel->tqsetAlignment(TQt::AlignHCenter); m_stepLayout->addWidget(m_stepLabel); hboxLayout->addWidget(m_stepFrame); @@ -169,7 +169,7 @@ KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, W m_stepPalette.setColor( TQPalette::Disabled, role, color ); m_stepLabel->setPalette(m_stepPalette); - // create page layout + // create page tqlayout m_pageLayout = new TQVBoxLayout(0, 0, 6, "pageLayout"); // the page will be inserted later dynamically above this line @@ -183,7 +183,7 @@ KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, W hboxLayout->addLayout(m_pageLayout); m_wizardLayout->addLayout(hboxLayout); - resize(TQSize(770, 520).expandedTo(minimumSizeHint())); + resize(TQSize(770, 520).expandedTo(tqminimumSizeHint())); clearWState(WState_Polished); m_titleLabel->setText("No Title specified"); @@ -207,7 +207,7 @@ void KMyMoneyWizard::addStep(const TQString& text) { TQLabel* step = new TQLabel(text, m_stepFrame); step->setFrameStyle(TQFrame::Panel | TQFrame::Raised); - step->setAlignment(TQt::AlignHCenter); + step->tqsetAlignment(TQt::AlignHCenter); step->setFrameStyle(TQFrame::Box | TQFrame::Sunken); step->setMargin(2); step->setPalette( m_stepPalette ); @@ -271,7 +271,7 @@ void KMyMoneyWizard::updateStepCount(void) hiddenAdjust++; ++step; } - m_stepLabel->setText(i18n("Step %1 of %2").arg(m_step - hiddenAdjust).arg(stepCount)); + m_stepLabel->setText(i18n("Step %1 of %2").tqarg(m_step - hiddenAdjust).tqarg(stepCount)); } void KMyMoneyWizard::setFirstPage(KMyMoneyWizardPage* page) diff --git a/kmymoney2/widgets/kmymoneywizard.h b/kmymoney2/widgets/kmymoneywizard.h index 7e12d48..803061e 100644 --- a/kmymoney2/widgets/kmymoneywizard.h +++ b/kmymoney2/widgets/kmymoneywizard.h @@ -22,7 +22,7 @@ #include #include -#include +#include class TQVBoxLayout; class TQHBoxLayout; class TQLabel; @@ -289,7 +289,7 @@ protected: * @author Thomas Baumgart (C) 2006 * * This is a base class for implementation of the KMyMoneyWizard. It provides - * the following layout of a wizard: + * the following tqlayout of a wizard: * * @code * +-wizardLayout-----------------------------------------------+ diff --git a/kmymoney2/widgets/kschedulebriefwidget.ui b/kmymoney2/widgets/kschedulebriefwidget.ui index fff3bef..209e727 100644 --- a/kmymoney2/widgets/kschedulebriefwidget.ui +++ b/kmymoney2/widgets/kschedulebriefwidget.ui @@ -56,7 +56,7 @@ - layout5 + tqlayout5 @@ -86,7 +86,7 @@ Expanding - + 40 0 @@ -111,7 +111,7 @@ Expanding - + 70 0 @@ -130,7 +130,7 @@ - layout7 + tqlayout7 @@ -140,13 +140,13 @@ textLabel1 - + 60 0 - + 60 32767 @@ -160,13 +160,13 @@ textLabel2 - + 60 0 - + 60 32767 @@ -221,7 +221,7 @@ 0 - + 60 0 @@ -274,7 +274,7 @@ Expanding - + 35 0 @@ -334,7 +334,7 @@ Expanding - + 43 0 diff --git a/kmymoney2/widgets/register.cpp b/kmymoney2/widgets/register.cpp index ef1c956..b01513e 100644 --- a/kmymoney2/widgets/register.cpp +++ b/kmymoney2/widgets/register.cpp @@ -665,7 +665,7 @@ void Register::slotAutoColumnSizing(int section) size += "0"; continue; } - size += TQString("%1").arg((columnWidth(i) * 100) / w); + size += TQString("%1").tqarg((columnWidth(i) * 100) / w); } qDebug("size = %s", size.data()); m_account.setValue("kmm-ledger-column-width", size); @@ -1292,9 +1292,9 @@ void Register::resize(int col) kMyMoneyEdit* valField = new kMyMoneyEdit; dateField->setFont(KMyMoneyGlobalSettings::listCellFont()); - setColumnWidth(DateColumn, dateField->minimumSizeHint().width()); + setColumnWidth(DateColumn, dateField->tqminimumSizeHint().width()); valField->setMinimumWidth(ewidth); - ewidth = valField->minimumSizeHint().width(); + ewidth = valField->tqminimumSizeHint().width(); if(swidth > 0) { swidth = columnWidth(SecurityColumn) + 40; @@ -1354,7 +1354,7 @@ void Register::adjustColumn(int col) Q_UNUSED(col) #else TQString msg = "%1 adjusting column %2"; - ::timetrace((msg.arg("Start").arg(col)).ascii()); + ::timetrace((msg.tqarg("Start").tqarg(col)).ascii()); TQHeader *topHeader = horizontalHeader(); TQFontMetrics cellFontMetrics(KMyMoneyGlobalSettings::listCellFont()); @@ -1428,7 +1428,7 @@ void Register::repaintItems(RegisterItem* first, RegisterItem* last) TQRect tmp = m_lastRepaintRect | r; if(abs(tmp.height()) > 3000) { - // make sure that the previously triggered repaint has been done before we + // make sure that the previously triggered tqrepaint has been done before we // trigger the next. Not having this used to cause some trouble when changing // the focus within a 2000 item ledger from the last to the first item. TQApplication::eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 10); @@ -1616,7 +1616,7 @@ bool Register::setFocusItem(RegisterItem* focusItem) if(focusItem && focusItem->canHaveFocus()) { if(m_focusItem) { m_focusItem->setFocus(false); - // issue a repaint here only if we move the focus + // issue a tqrepaint here only if we move the focus if(m_focusItem != focusItem) repaintItems(m_focusItem); } @@ -2265,7 +2265,7 @@ void Register::addGroupMarkers(void) switch(primarySortKey()) { case KMyMoneyRegister::PostDateSort: case KMyMoneyRegister::EntryDateSort: - today = TQDate::currentDate(); + today = TQDate::tqcurrentDate(); thisMonth.setYMD(today.year(), today.month(), 1); lastMonth = thisMonth.addMonths(-1); yesterday = today.addDays(-1); @@ -2290,7 +2290,7 @@ void Register::addGroupMarkers(void) MyMoneyMoney balance(m_account.value("lastStatementBalance")); if(m_account.accountGroup() == MyMoneyAccount::Liability) balance = -balance; - TQString txt = i18n("Online Statement Balance: %1").arg(balance.formatMoney(m_account.fraction())); + TQString txt = i18n("Online Statement Balance: %1").tqarg(balance.formatMoney(m_account.fraction())); new KMyMoneyRegister::StatementGroupMarker(this, KMyMoneyRegister::Deposit, TQDate::fromString(m_account.value("lastImportedTransactionDate"), Qt::ISODate), txt); } @@ -2309,9 +2309,9 @@ void Register::addGroupMarkers(void) new KMyMoneyRegister::SimpleDateGroupMarker(this, today.addDays(1), i18n("Future transactions")); } if(KMyMoneyGlobalSettings::showFiscalMarker()) { - TQDate currentFiscalYear(TQDate::currentDate().year(), KMyMoneyGlobalSettings::firstFiscalMonth(), KMyMoneyGlobalSettings::firstFiscalDay()); + TQDate currentFiscalYear(TQDate::tqcurrentDate().year(), KMyMoneyGlobalSettings::firstFiscalMonth(), KMyMoneyGlobalSettings::firstFiscalDay()); - if(TQDate::currentDate() < currentFiscalYear) + if(TQDate::tqcurrentDate() < currentFiscalYear) currentFiscalYear = currentFiscalYear.addYears(-1); TQDate previousFiscalYear = currentFiscalYear.addYears(-1); new KMyMoneyRegister::FiscalYearGroupMarker(this, currentFiscalYear, i18n("Current fiscal year")); diff --git a/kmymoney2/widgets/scheduledtransaction.cpp b/kmymoney2/widgets/scheduledtransaction.cpp index cb47fdb..c954b85 100644 --- a/kmymoney2/widgets/scheduledtransaction.cpp +++ b/kmymoney2/widgets/scheduledtransaction.cpp @@ -44,7 +44,7 @@ StdTransactionScheduled::StdTransactionScheduled(Register *parent, const MyMoney bool StdTransactionScheduled::paintRegisterCellSetup(TQPainter* painter, int& row, int& col, TQRect& cellRect, TQRect& textRect, TQColorGroup& cg, TQBrush& brush) { TQRect r(cellRect); - cg = m_parent->palette().disabled(); + cg = m_parent->tqpalette().disabled(); bool rc = Transaction::paintRegisterCellSetup(painter, row, col, cellRect, textRect, cg, brush); return rc; diff --git a/kmymoney2/widgets/stdtransactionmatched.cpp b/kmymoney2/widgets/stdtransactionmatched.cpp index 833c88e..352999e 100644 --- a/kmymoney2/widgets/stdtransactionmatched.cpp +++ b/kmymoney2/widgets/stdtransactionmatched.cpp @@ -140,7 +140,7 @@ void StdTransactionMatched::registerCellText(TQString& txt, int& align, int row, case DetailColumn: align |= TQt::AlignLeft; - txt = TQString("%1 %2").arg(matchedTransaction.postDate().toString(Qt::ISODate)).arg(matchedTransaction.memo()); + txt = TQString("%1 %2").tqarg(matchedTransaction.postDate().toString(Qt::ISODate)).tqarg(matchedTransaction.memo()); break; case PaymentColumn: @@ -181,7 +181,7 @@ void StdTransactionMatched::registerCellText(TQString& txt, int& align, int row, memo = memo.left(pos-1); } } - txt = TQString("%1 %2").arg(postDate.toString(Qt::ISODate)).arg(memo); + txt = TQString("%1 %2").tqarg(postDate.toString(Qt::ISODate)).tqarg(memo); break; case PaymentColumn: diff --git a/kmymoney2/widgets/stdtransactionmatched.h b/kmymoney2/widgets/stdtransactionmatched.h index fbcb694..2340c68 100644 --- a/kmymoney2/widgets/stdtransactionmatched.h +++ b/kmymoney2/widgets/stdtransactionmatched.h @@ -20,7 +20,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include +#include // ---------------------------------------------------------------------------- // KDE Includes diff --git a/kmymoney2/widgets/transaction.cpp b/kmymoney2/widgets/transaction.cpp index b4ac7cd..5811a8c 100644 --- a/kmymoney2/widgets/transaction.cpp +++ b/kmymoney2/widgets/transaction.cpp @@ -243,7 +243,7 @@ void Transaction::markAsErronous(TQPainter* painter, int /* row */, int /* col * bool Transaction::paintRegisterCellSetup(TQPainter* painter, int& row, int& col, TQRect& cellRect, TQRect& textRect, TQColorGroup& cg, TQBrush& brush) { if(m_reducedIntensity) - cg = m_parent->palette().disabled(); + cg = m_parent->tqpalette().disabled(); if(m_alternate) cg.setColor(TQColorGroup::Base, KMyMoneyGlobalSettings::listColor()); @@ -508,7 +508,7 @@ int Transaction::formRowHeight(void) const kMyMoneyDateInput dateInput; KMyMoneyCategory category(0,0,true); - return TQMAX(dateInput.sizeHint().height(), category.sizeHint().height()); + return TQMAX(dateInput.tqsizeHint().height(), category.tqsizeHint().height()); } return m_formRowHeight; } @@ -598,7 +598,7 @@ void Transaction::setupRegisterPalette(TQMap& editWidgets) setupPalette(palette, editWidgets); } -TQWidget* Transaction::focusWidget(TQWidget* w) const +TQWidget* Transaction::tqfocusWidget(TQWidget* w) const { if(w) { while(w->focusProxy()) @@ -664,10 +664,10 @@ bool Transaction::maybeTip(const TQPoint& cpos, int row, int col, TQRect& r, TQS // qDebug("p is in r = %d", r.contains(cpos)); if(r.contains(cpos) && m_erronous) { if(m_transaction.splits().count() < 2) { - msg = TQString("%1").arg(i18n("Transaction is missing a category assignment.")); + msg = TQString("%1").tqarg(i18n("Transaction is missing a category assignment.")); } else { const MyMoneySecurity& sec = MyMoneyFile::instance()->security(m_account.currencyId()); - msg = TQString("%1").arg(i18n("The transaction has a missing assignment of %1.").arg(m_transaction.splitSum().abs().formatMoney(m_account, sec))); + msg = TQString("%1").tqarg(i18n("The transaction has a missing assignment of %1.").tqarg(m_transaction.splitSum().abs().formatMoney(m_account, sec))); } return true; } @@ -690,9 +690,9 @@ bool Transaction::maybeTip(const TQPoint& cpos, int row, int col, TQRect& r, TQS TQString category = file->accountToCategory(acc.id()); TQString amount = ((*it_s).value() * factor).formatMoney(acc, sec); - txt += TQString("%1%2").arg(category, amount); + txt += TQString("%1%2").tqarg(category, amount); } - msg = TQString("%1
").arg(txt); + msg = TQString("%1
").tqarg(txt); return true; } @@ -880,7 +880,7 @@ StdTransaction::StdTransaction(Register *parent, const MyMoneyTransaction& trans addon = i18n("Yield"); } if(!addon.isEmpty()) { - m_payee += TQString(" (%1)").arg(addon); + m_payee += TQString(" (%1)").tqarg(addon); } m_payeeHeader = i18n("Activity"); m_category = i18n("Investment transaction"); @@ -1253,34 +1253,34 @@ void StdTransaction::tabOrderInForm(TQWidgetList& tabOrderWidgets) const TQWidget* w; while(it_s != taborder.constEnd()) { if(*it_s == "account") { - tabOrderWidgets.append(focusWidget(m_form->cellWidget(0, ValueColumn1))); + tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(0, ValueColumn1))); } else if(*it_s == "cashflow") { - tabOrderWidgets.append(focusWidget(m_form->cellWidget(1, LabelColumn1))); + tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(1, LabelColumn1))); } else if(*it_s == "payee") { - tabOrderWidgets.append(focusWidget(m_form->cellWidget(1, ValueColumn1))); + tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(1, ValueColumn1))); } else if(*it_s == "category") { // make sure to have the category field and the split button as seperate tab order widgets // ok, we have to have some internal knowledge about the KMyMoneyCategory object, but // it's one of our own widgets, so we actually don't care. Just make sure, that we don't // go haywire when someone changes the KMyMoneyCategory object ... w = m_form->cellWidget(2, ValueColumn1); - tabOrderWidgets.append(focusWidget(w)); + tabOrderWidgets.append(tqfocusWidget(w)); w = dynamic_cast(w->child("splitButton")); if(w) tabOrderWidgets.append(w); } else if(*it_s == "memo") { - tabOrderWidgets.append(focusWidget(m_form->cellWidget(3, ValueColumn1))); + tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(3, ValueColumn1))); } else if(*it_s == "number") { if(haveNumberField()) { - if((w = focusWidget(m_form->cellWidget(1, ValueColumn2)))) + if((w = tqfocusWidget(m_form->cellWidget(1, ValueColumn2)))) tabOrderWidgets.append(w); } } else if(*it_s == "date") { - tabOrderWidgets.append(focusWidget(m_form->cellWidget(2, ValueColumn2))); + tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(2, ValueColumn2))); } else if(*it_s == "amount") { - tabOrderWidgets.append(focusWidget(m_form->cellWidget(3, ValueColumn2))); + tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(3, ValueColumn2))); } else if(*it_s == "state") { - tabOrderWidgets.append(focusWidget(m_form->cellWidget(5, ValueColumn2))); + tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(5, ValueColumn2))); } ++it_s; } @@ -1315,31 +1315,31 @@ void StdTransaction::tabOrderInRegister(TQWidgetList& tabOrderWidgets) const while(it_s != taborder.constEnd()) { if(*it_s == "number") { if(haveNumberField()) { - if((w = focusWidget(m_parent->cellWidget(m_startRow + 0, NumberColumn)))) + if((w = tqfocusWidget(m_parent->cellWidget(m_startRow + 0, NumberColumn)))) tabOrderWidgets.append(w); } } else if(*it_s == "date") { - tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, DateColumn))); + tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, DateColumn))); } else if(*it_s == "payee") { - tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, DetailColumn))); + tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, DetailColumn))); } else if(*it_s == "category") { // make sure to have the category field and the split button as seperate tab order widgets // ok, we have to have some internal knowledge about the KMyMoneyCategory object, but // it's one of our own widgets, so we actually don't care. Just make sure, that we don't // go haywire when someone changes the KMyMoneyCategory object ... w = m_parent->cellWidget(m_startRow + 1, DetailColumn); - tabOrderWidgets.append(focusWidget(w)); + tabOrderWidgets.append(tqfocusWidget(w)); w = dynamic_cast(w->child("splitButton")); if(w) tabOrderWidgets.append(w); } else if(*it_s == "memo") { - tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 2, DetailColumn))); + tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 2, DetailColumn))); } else if(*it_s == "payment") { - tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, PaymentColumn))); + tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, PaymentColumn))); } else if(*it_s == "deposit") { - tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, DepositColumn))); + tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, DepositColumn))); } else if(*it_s == "state") { - tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 1, DateColumn))); + tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 1, DateColumn))); } ++it_s; } @@ -1533,7 +1533,7 @@ bool InvestTransaction::formCellText(TQString& txt, int& align, int row, int col if((fieldEditable = haveShares()) == true) { txt = m_split.shares().abs().formatMoney("", MyMoneyMoney::denomToPrec(m_security.smallestAccountFraction())); } else if(haveSplitRatio()) { - txt = TQString("1 / %1").arg(m_split.shares().abs().formatMoney("", -1)); + txt = TQString("1 / %1").tqarg(m_split.shares().abs().formatMoney("", -1)); } break; } @@ -1712,7 +1712,7 @@ void InvestTransaction::registerCellText(TQString& txt, int& align, int row, int if(haveShares()) txt = m_split.shares().abs().formatMoney("", MyMoneyMoney::denomToPrec(m_security.smallestAccountFraction())); else if(haveSplitRatio()) { - txt = TQString("1 / %1").arg(m_split.shares().abs().formatMoney("", -1)); + txt = TQString("1 / %1").tqarg(m_split.shares().abs().formatMoney("", -1)); } break; @@ -1929,54 +1929,54 @@ void InvestTransaction::arrangeWidgetsInForm(TQMap& editWid void InvestTransaction::tabOrderInForm(TQWidgetList& tabOrderWidgets) const { // activity - tabOrderWidgets.append(focusWidget(m_form->cellWidget(0, ValueColumn1))); + tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(0, ValueColumn1))); // date - tabOrderWidgets.append(focusWidget(m_form->cellWidget(0, ValueColumn2))); + tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(0, ValueColumn2))); // security - tabOrderWidgets.append(focusWidget(m_form->cellWidget(1, ValueColumn1))); + tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(1, ValueColumn1))); // shares - tabOrderWidgets.append(focusWidget(m_form->cellWidget(1, ValueColumn2))); + tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(1, ValueColumn2))); // account - tabOrderWidgets.append(focusWidget(m_form->cellWidget(2, ValueColumn1))); + tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(2, ValueColumn1))); // price - tabOrderWidgets.append(focusWidget(m_form->cellWidget(2, ValueColumn2))); + tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(2, ValueColumn2))); // make sure to have the fee category field and the split button as seperate tab order widgets // ok, we have to have some internal knowledge about the KMyMoneyCategory object, but // it's one of our own widgets, so we actually don't care. Just make sure, that we don't // go haywire when someone changes the KMyMoneyCategory object ... TQWidget* w = m_form->cellWidget(3, ValueColumn1); - tabOrderWidgets.append(focusWidget(w)); + tabOrderWidgets.append(tqfocusWidget(w)); w = dynamic_cast(w->child("splitButton")); if(w) tabOrderWidgets.append(w); // fee amount - tabOrderWidgets.append(focusWidget(m_form->cellWidget(3, ValueColumn2))); + tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(3, ValueColumn2))); // the same applies for the interest categories w = m_form->cellWidget(4, ValueColumn1); - tabOrderWidgets.append(focusWidget(w)); + tabOrderWidgets.append(tqfocusWidget(w)); w = dynamic_cast(w->child("splitButton")); if(w) tabOrderWidgets.append(w); // interest amount - tabOrderWidgets.append(focusWidget(m_form->cellWidget(4, ValueColumn2))); + tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(4, ValueColumn2))); // memo - tabOrderWidgets.append(focusWidget(m_form->cellWidget(5, ValueColumn1))); + tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(5, ValueColumn1))); // total - tabOrderWidgets.append(focusWidget(m_form->cellWidget(5, ValueColumn2))); + tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(5, ValueColumn2))); // state - tabOrderWidgets.append(focusWidget(m_form->cellWidget(6, ValueColumn2))); + tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(6, ValueColumn2))); } void InvestTransaction::arrangeWidgetsInRegister(TQMap& editWidgets) @@ -2009,45 +2009,45 @@ void InvestTransaction::tabOrderInRegister(TQWidgetList& tabOrderWidgets) const TQWidget* w; // date - tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, DateColumn))); + tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, DateColumn))); // security - tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, SecurityColumn))); + tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, SecurityColumn))); // activity - tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, DetailColumn))); + tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, DetailColumn))); // shares - tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, QuantityColumn))); + tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, QuantityColumn))); // price - tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, PriceColumn))); + tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, PriceColumn))); // asset account - tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 1, DetailColumn))); + tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 1, DetailColumn))); // make sure to have the category fields and the split button as seperate tab order widgets // ok, we have to have some internal knowledge about the KMyMoneyCategory object, but // it's one of our own widgets, so we actually don't care. Just make sure, that we don't // go haywire when someone changes the KMyMoneyCategory object ... w = m_parent->cellWidget(m_startRow + 2, DetailColumn); // interest account - tabOrderWidgets.append(focusWidget(w)); + tabOrderWidgets.append(tqfocusWidget(w)); w = dynamic_cast(w->child("splitButton")); if(w) tabOrderWidgets.append(w); // interest amount - tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 2, QuantityColumn))); + tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 2, QuantityColumn))); w = m_parent->cellWidget(m_startRow + 3, DetailColumn); // fee account - tabOrderWidgets.append(focusWidget(w)); + tabOrderWidgets.append(tqfocusWidget(w)); w = dynamic_cast(w->child("splitButton")); if(w) tabOrderWidgets.append(w); // fee amount - tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 3, QuantityColumn))); + tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 3, QuantityColumn))); // memo - tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 4, DetailColumn))); + tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 4, DetailColumn))); // status - tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 1, DateColumn))); + tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 1, DateColumn))); } int InvestTransaction::numRowsRegister(bool expanded) const diff --git a/kmymoney2/widgets/transaction.h b/kmymoney2/widgets/transaction.h index 6e266c7..a24c864 100644 --- a/kmymoney2/widgets/transaction.h +++ b/kmymoney2/widgets/transaction.h @@ -21,7 +21,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include +#include // ---------------------------------------------------------------------------- // KDE Includes @@ -183,7 +183,7 @@ public: virtual KMyMoneyRegister::Action actionType(void) const = 0; - TQWidget* focusWidget(TQWidget*) const; + TQWidget* tqfocusWidget(TQWidget*) const; void arrangeWidget(TQTable* tbl, int row, int col, TQWidget* w) const; bool haveNumberField(void) const; diff --git a/kmymoney2/widgets/transactionform.cpp b/kmymoney2/widgets/transactionform.cpp index 3b05e30..b1d55cd 100644 --- a/kmymoney2/widgets/transactionform.cpp +++ b/kmymoney2/widgets/transactionform.cpp @@ -22,9 +22,9 @@ #include #include #include -#include +#include #include -#include +#include // ---------------------------------------------------------------------------- // KDE Includes @@ -237,8 +237,8 @@ void TransactionForm::slotSetTransaction(KMyMoneyRegister::Transaction* transact kMyMoneyDateInput dateInput(0, "editDate"); KMyMoneyCategory category(0, "category", true); - // extract the maximal sizeHint height - int height = TQMAX(dateInput.sizeHint().height(), category.sizeHint().height()); + // extract the maximal tqsizeHint height + int height = TQMAX(dateInput.tqsizeHint().height(), category.tqsizeHint().height()); for(int row = 0; row < numRows(); ++row) { if(!transaction || transaction->showRowInForm(row)) { @@ -273,7 +273,7 @@ TabBar* TransactionForm::tabBar(TQWidget* parent) // create the tab bar m_tabBar = new TabBar( parent ); m_tabBar->setSignalEmission(TabBar::SignalAlways); - m_tabBar->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, m_tabBar->sizePolicy().hasHeightForWidth() ) ); + m_tabBar->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, m_tabBar->sizePolicy().hasHeightForWidth() ) ); connect(m_tabBar, TQT_SIGNAL(tabSelected(int)), this, TQT_SLOT(slotActionSelected(int))); } return m_tabBar; @@ -387,9 +387,9 @@ TQSize TransactionForm::tableSize(void) const rowPos(numRows()-1) + rowHeight(numRows()-1) + 10); } -TQSize TransactionForm::sizeHint(void) const +TQSize TransactionForm::tqsizeHint(void) const { - // I've taken this from qtable.cpp, TQTable::sizeHint() + // I've taken this from qtable.cpp, TQTable::tqsizeHint() int vmargin = TQApplication::reverseLayout() ? rightMargin() : leftMargin(); return TQSize(tableSize().width() + vmargin + 5, tableSize().height() + topMargin() + 10); } @@ -403,7 +403,7 @@ void TransactionForm::adjustColumn(Column col) if(col == ValueColumn2) { kMyMoneyDateInput dateInput; kMyMoneyEdit valInput; - w = TQMAX(dateInput.sizeHint().width(), valInput.sizeHint().width()); + w = TQMAX(dateInput.tqsizeHint().width(), valInput.tqsizeHint().width()); } if(m_transaction) { @@ -416,7 +416,7 @@ void TransactionForm::adjustColumn(Column col) m_transaction->formCellText(txt, align, i, static_cast(col), 0); TQWidget* cw = cellWidget(i, col); if(cw) { - w = TQMAX(w, cw->sizeHint().width()+10); + w = TQMAX(w, cw->tqsizeHint().width()+10); } w = TQMAX(w, fontMetrics.width(txt)+10); } diff --git a/kmymoney2/widgets/transactionform.h b/kmymoney2/widgets/transactionform.h index 2884439..f07a1e4 100644 --- a/kmymoney2/widgets/transactionform.h +++ b/kmymoney2/widgets/transactionform.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -135,7 +135,7 @@ public: void paintFocus(TQPainter* /*p*/, const TQRect& /*cr*/ ) {} TQSize tableSize(void) const; - TQSize sizeHint(void) const; + TQSize tqsizeHint(void) const; void adjustColumn(Column col); void clear(void); diff --git a/kmymoney2/widgets/transactionsortoption.ui b/kmymoney2/widgets/transactionsortoption.ui index 393e0bc..fc91754 100644 --- a/kmymoney2/widgets/transactionsortoption.ui +++ b/kmymoney2/widgets/transactionsortoption.ui @@ -22,7 +22,7 @@ - layout3 + tqlayout3 @@ -57,7 +57,7 @@ - layout5 + tqlayout5 @@ -73,7 +73,7 @@ Expanding - + 20 67 @@ -106,7 +106,7 @@ Expanding - + 21 67 @@ -117,7 +117,7 @@ - layout4 + tqlayout4 @@ -152,7 +152,7 @@ - layout6 + tqlayout6 @@ -168,7 +168,7 @@ Expanding - + 20 67 @@ -201,7 +201,7 @@ Expanding - + 20 67 -- cgit v1.2.1