diff options
Diffstat (limited to 'kmymoney2/widgets')
26 files changed, 66 insertions, 66 deletions
diff --git a/kmymoney2/widgets/kaccounttemplateselectordecl.cpp b/kmymoney2/widgets/kaccounttemplateselectordecl.cpp index 14170c7..c4c683e 100644 --- a/kmymoney2/widgets/kaccounttemplateselectordecl.cpp +++ b/kmymoney2/widgets/kaccounttemplateselectordecl.cpp @@ -47,28 +47,28 @@ KAccountTemplateSelectorDecl::KAccountTemplateSelectorDecl( TQWidget* parent, co m_groupList->setFullWidth( TRUE ); KAccountTemplateSelectorDeclLayout->addWidget( m_groupList ); - tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3"); + layout3 = new TQHBoxLayout( 0, 0, 6, "layout3"); groupBox1 = new TQGroupBox( this, "groupBox1" ); groupBox1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 2, groupBox1->sizePolicy().hasHeightForWidth() ) ); groupBox1->setColumnLayout(0, Qt::Vertical ); - groupBox1->tqlayout()->setSpacing( 6 ); - groupBox1->tqlayout()->setMargin( 11 ); - groupBox1Layout = new TQVBoxLayout( groupBox1->tqlayout() ); + groupBox1->layout()->setSpacing( 6 ); + groupBox1->layout()->setMargin( 11 ); + groupBox1Layout = new TQVBoxLayout( groupBox1->layout() ); groupBox1Layout->setAlignment( 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->setReadOnly( TRUE ); groupBox1Layout->addWidget( m_description ); - tqlayout3->addWidget( groupBox1 ); + layout3->addWidget( groupBox1 ); groupBox2 = new TQGroupBox( this, "groupBox2" ); groupBox2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 2, groupBox2->sizePolicy().hasHeightForWidth() ) ); groupBox2->setColumnLayout(0, Qt::Vertical ); - groupBox2->tqlayout()->setSpacing( 6 ); - groupBox2->tqlayout()->setMargin( 11 ); - groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() ); + groupBox2->layout()->setSpacing( 6 ); + groupBox2->layout()->setMargin( 11 ); + groupBox2Layout = new TQVBoxLayout( groupBox2->layout() ); groupBox2Layout->setAlignment( TQt::AlignTop ); m_accountList = new KListView( groupBox2, "m_accountList" ); @@ -80,8 +80,8 @@ KAccountTemplateSelectorDecl::KAccountTemplateSelectorDecl( TQWidget* parent, co m_accountList->setRootIsDecorated( TRUE ); m_accountList->setFullWidth( TRUE ); groupBox2Layout->addWidget( m_accountList ); - tqlayout3->addWidget( groupBox2 ); - KAccountTemplateSelectorDeclLayout->addLayout( tqlayout3 ); + layout3->addWidget( groupBox2 ); + KAccountTemplateSelectorDeclLayout->addLayout( layout3 ); languageChange(); resize( TQSize(546, 346).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); diff --git a/kmymoney2/widgets/kaccounttemplateselectordecl.ui b/kmymoney2/widgets/kaccounttemplateselectordecl.ui index a028765..cc5b9da 100644 --- a/kmymoney2/widgets/kaccounttemplateselectordecl.ui +++ b/kmymoney2/widgets/kaccounttemplateselectordecl.ui @@ -74,7 +74,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> diff --git a/kmymoney2/widgets/kbudgetvaluesdecl.cpp b/kmymoney2/widgets/kbudgetvaluesdecl.cpp index d5d3382..f33b87f 100644 --- a/kmymoney2/widgets/kbudgetvaluesdecl.cpp +++ b/kmymoney2/widgets/kbudgetvaluesdecl.cpp @@ -169,20 +169,20 @@ KBudgetValuesDecl::KBudgetValuesDecl( TQWidget* parent, const char* name, WFlags KBudgetValuesDeclLayout->addWidget( m_firstItemStack, 0, 3 ); - tqlayout12 = new TQVBoxLayout( 0, 0, 6, "tqlayout12"); + layout12 = new TQVBoxLayout( 0, 0, 6, "layout12"); m_clearButton = new KPushButton( this, "m_clearButton" ); - tqlayout12->addWidget( m_clearButton ); + layout12->addWidget( m_clearButton ); spacer7 = new TQSpacerItem( 20, 21, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout12->addItem( spacer7 ); + layout12->addItem( spacer7 ); - KBudgetValuesDeclLayout->addMultiCellLayout( tqlayout12, 0, 5, 1, 1 ); + KBudgetValuesDeclLayout->addMultiCellLayout( layout12, 0, 5, 1, 1 ); m_periodGroup = new TQButtonGroup( this, "m_periodGroup" ); m_periodGroup->setColumnLayout(0, Qt::Vertical ); - m_periodGroup->tqlayout()->setSpacing( 6 ); - m_periodGroup->tqlayout()->setMargin( 11 ); - m_periodGroupLayout = new TQVBoxLayout( m_periodGroup->tqlayout() ); + m_periodGroup->layout()->setSpacing( 6 ); + m_periodGroup->layout()->setMargin( 11 ); + m_periodGroupLayout = new TQVBoxLayout( m_periodGroup->layout() ); m_periodGroupLayout->setAlignment( TQt::AlignTop ); m_monthlyButton = new TQRadioButton( m_periodGroup, "m_monthlyButton" ); diff --git a/kmymoney2/widgets/kbudgetvaluesdecl.ui b/kmymoney2/widgets/kbudgetvaluesdecl.ui index fb767ea..7f0ea54 100644 --- a/kmymoney2/widgets/kbudgetvaluesdecl.ui +++ b/kmymoney2/widgets/kbudgetvaluesdecl.ui @@ -282,7 +282,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1" rowspan="6" colspan="1"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <vbox> <property name="name"> diff --git a/kmymoney2/widgets/kmymoneyaccounttreebase.cpp b/kmymoney2/widgets/kmymoneyaccounttreebase.cpp index 03d5c41..fc08cdc 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreebase.cpp +++ b/kmymoney2/widgets/kmymoneyaccounttreebase.cpp @@ -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(), + style().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, m_lastDropHighlighter, colorGroup(), TQStyle::Style_FocusAtBorder); } } diff --git a/kmymoney2/widgets/kmymoneyaccounttreebase.h b/kmymoney2/widgets/kmymoneyaccounttreebase.h index f44837b..25113de 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreebase.h +++ b/kmymoney2/widgets/kmymoneyaccounttreebase.h @@ -74,10 +74,10 @@ public: void emitValueChanged(void) { emit valueChanged(); }; /** - * restores the tqlayout from the config file + * restores the layout 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 tqlayout. + * the layout. */ void restoreLayout(const TQString& group); diff --git a/kmymoney2/widgets/kmymoneycalendar.cpp b/kmymoney2/widgets/kmymoneycalendar.cpp index 61b91fd..7aae4ad 100644 --- a/kmymoney2/widgets/kmymoneycalendar.cpp +++ b/kmymoney2/widgets/kmymoneycalendar.cpp @@ -210,8 +210,8 @@ kMyMoneyCalendar::resizeEvent(TQResizeEvent*) // ----- calculate size of the month button: for(count=0; count<NoOfButtons; ++count) { if(buttons[count]==selectMonth) { - TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); - sizes[count].setWidth(TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().pixelMetric(TQStyle::PM_ButtonMargin))); + TQSize metricBound = style().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); + sizes[count].setWidth(TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::style().pixelMetric(TQStyle::PM_ButtonMargin))); } } // ----- place the buttons: @@ -498,8 +498,8 @@ kMyMoneyCalendar::sizeHint() const 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)); + TQSize metricBound = style().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); + cx+=TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::style().pixelMetric(TQStyle::PM_ButtonMargin)); } else { cx+=sizes[count].width(); } diff --git a/kmymoney2/widgets/kmymoneycategory.cpp b/kmymoney2/widgets/kmymoneycategory.cpp index 3e74bd3..39f4b63 100644 --- a/kmymoney2/widgets/kmymoneycategory.cpp +++ b/kmymoney2/widgets/kmymoneycategory.cpp @@ -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* tqlayout = new TQHBoxLayout(d->frame); + TQHBoxLayout* layout = 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"); - tqlayout->addWidget(this, 5); - tqlayout->addWidget(d->splitButton); + layout->addWidget(this, 5); + layout->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 tqlayout + // make sure to wipe out the frame, button and layout if(d->frame && !d->frame->parentWidget()) d->frame->deleteLater(); diff --git a/kmymoney2/widgets/kmymoneycategory.h b/kmymoney2/widgets/kmymoneycategory.h index fa2975c..34b5d14 100644 --- a/kmymoney2/widgets/kmymoneycategory.h +++ b/kmymoney2/widgets/kmymoneycategory.h @@ -79,7 +79,7 @@ public: * @code * KMyMoneyCategory* category = new KMyMoneyCategory; * category->reparent(newParent); - * tqlayout->addWidget(category); + * layout->addWidget(category); * table->setCellWidget(category); * @endcode * @@ -88,7 +88,7 @@ public: * @code * KMyMoneyCategory* category = new KMyMoneyCategory(0, 0, true); * category->reparent(newParent); - * tqlayout->addWidget(category->parentWidget()); + * layout->addWidget(category->parentWidget()); * table->setCellWidget(category->parentWidget()); * @endcode */ diff --git a/kmymoney2/widgets/kmymoneycombo.cpp b/kmymoney2/widgets/kmymoneycombo.cpp index 37f4517..f8b6489 100644 --- a/kmymoney2/widgets/kmymoneycombo.cpp +++ b/kmymoney2/widgets/kmymoneycombo.cpp @@ -134,7 +134,7 @@ void KMyMoneyCombo::paintEvent(TQPaintEvent* ev) const TQColorGroup & g = colorGroup(); p.setPen(g.text()); - TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, + TQRect re = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ); re = TQStyle::visualRect(re, this); p.setClipRect( re ); @@ -180,7 +180,7 @@ void KMyMoneyCombo::mousePressEvent(TQMouseEvent *e) bool KMyMoneyCombo::isInArrowArea(const TQPoint& pos) const { - TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, + TQRect arrowRect = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow); arrowRect = TQStyle::visualRect(arrowRect, this); diff --git a/kmymoney2/widgets/kmymoneygpgconfigdecl.ui b/kmymoney2/widgets/kmymoneygpgconfigdecl.ui index 4e6e762..359e04c 100644 --- a/kmymoney2/widgets/kmymoneygpgconfigdecl.ui +++ b/kmymoney2/widgets/kmymoneygpgconfigdecl.ui @@ -59,7 +59,7 @@ The <i>Recovery encryption</i> group is only accessible, if the nece </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -109,7 +109,7 @@ The <i>Recovery encryption</i> group is only accessible, if the nece </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> diff --git a/kmymoney2/widgets/kmymoneylineedit.cpp b/kmymoney2/widgets/kmymoneylineedit.cpp index 5907782..c99ad02 100644 --- a/kmymoney2/widgets/kmymoneylineedit.cpp +++ b/kmymoney2/widgets/kmymoneylineedit.cpp @@ -141,7 +141,7 @@ void kMyMoneyLineEdit::drawContents( TQPainter *p) f.setItalic(true); f.setWeight(TQFont::Light); p->setFont(f); - p->setPen(tqpalette().disabled().text()); + p->setPen(palette().disabled().text()); p->drawText(topLeft, m_hint); diff --git a/kmymoney2/widgets/kmymoneylineedit.h b/kmymoney2/widgets/kmymoneylineedit.h index 30d079e..f0331f6 100644 --- a/kmymoney2/widgets/kmymoneylineedit.h +++ b/kmymoney2/widgets/kmymoneylineedit.h @@ -51,7 +51,7 @@ 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 tqlayout (default: @p false) + * 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. * See TQt::AlignmentFlags for other possible values. */ @@ -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 tqlayout) as English, then + * Example: If you have set the keymap (keyboard layout) 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 tqlayout) as English, then + * Example: If you have set the keymap (keyboard layout) 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/kmymoneyonlinequoteconfigdecl.ui b/kmymoney2/widgets/kmymoneyonlinequoteconfigdecl.ui index 9e11973..88f95f7 100644 --- a/kmymoney2/widgets/kmymoneyonlinequoteconfigdecl.ui +++ b/kmymoney2/widgets/kmymoneyonlinequoteconfigdecl.ui @@ -71,7 +71,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -174,7 +174,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> diff --git a/kmymoney2/widgets/kmymoneyreportconfigtab1decl.ui b/kmymoney2/widgets/kmymoneyreportconfigtab1decl.ui index 9081a17..a023c37 100644 --- a/kmymoney2/widgets/kmymoneyreportconfigtab1decl.ui +++ b/kmymoney2/widgets/kmymoneyreportconfigtab1decl.ui @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout35</cstring> + <cstring>layout35</cstring> </property> <hbox> <property name="name"> @@ -53,7 +53,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout36</cstring> + <cstring>layout36</cstring> </property> <hbox> <property name="name"> diff --git a/kmymoney2/widgets/kmymoneyreportconfigtab2decl.ui b/kmymoney2/widgets/kmymoneyreportconfigtab2decl.ui index a847537..ef5ea58 100644 --- a/kmymoney2/widgets/kmymoneyreportconfigtab2decl.ui +++ b/kmymoney2/widgets/kmymoneyreportconfigtab2decl.ui @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -35,7 +35,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> diff --git a/kmymoney2/widgets/kmymoneyreportconfigtab3decl.ui b/kmymoney2/widgets/kmymoneyreportconfigtab3decl.ui index 4e3cc5b..7c4c06f 100644 --- a/kmymoney2/widgets/kmymoneyreportconfigtab3decl.ui +++ b/kmymoney2/widgets/kmymoneyreportconfigtab3decl.ui @@ -35,7 +35,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -136,7 +136,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -327,7 +327,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <grid> <property name="name"> diff --git a/kmymoney2/widgets/kmymoneyreportconfigtabchartdecl.ui b/kmymoney2/widgets/kmymoneyreportconfigtabchartdecl.ui index 7f8bdd7..9e1fda3 100644 --- a/kmymoney2/widgets/kmymoneyreportconfigtabchartdecl.ui +++ b/kmymoney2/widgets/kmymoneyreportconfigtabchartdecl.ui @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -136,7 +136,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> diff --git a/kmymoney2/widgets/kmymoneyselector.cpp b/kmymoney2/widgets/kmymoneyselector.cpp index b32adcb..9b1d819 100644 --- a/kmymoney2/widgets/kmymoneyselector.cpp +++ b/kmymoney2/widgets/kmymoneyselector.cpp @@ -661,7 +661,7 @@ void KMyMoneySelector::slotListRightMouse(TQListViewItem* it_v, const TQPoint& p KMyMoneyCheckListItem* it_c = static_cast<KMyMoneyCheckListItem*>(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->style().pixelMetric(TQStyle::PM_CheckListButtonSize, m_listView); int align = m_listView->columnAlignment( 0 ); int marg = m_listView->itemMargin(); int y = 0; diff --git a/kmymoney2/widgets/kmymoneytitlelabel.cpp b/kmymoney2/widgets/kmymoneytitlelabel.cpp index 4abef85..f852c76 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(), + style().drawItem( p, contentsRect(), alignment(), colorGroup(), isEnabled(), 0, TQString(" ")+m_text, -1, &m_textColor ); } diff --git a/kmymoney2/widgets/kmymoneywizard.cpp b/kmymoney2/widgets/kmymoneywizard.cpp index 24f9fbc..ff00c78 100644 --- a/kmymoney2/widgets/kmymoneywizard.cpp +++ b/kmymoney2/widgets/kmymoneywizard.cpp @@ -132,7 +132,7 @@ KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, W m_helpButton->setIconSet( SmallIconSet( "help" ) ); } - // create button tqlayout + // create button layout m_buttonLayout = new TQHBoxLayout; m_buttonLayout->addWidget(m_helpButton); m_buttonLayout->addStretch(1); @@ -141,14 +141,14 @@ KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, W m_buttonLayout->addWidget(m_finishButton); m_buttonLayout->addWidget(m_cancelButton); - // create wizard tqlayout + // create wizard layout 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 tqlayout and frame + // create stage layout and frame m_stepFrame = new TQFrame(this, "stepFrame"); m_stepFrame->setPaletteBackgroundColor(KGlobalSettings::highlightColor()); m_stepLayout = new TQVBoxLayout(m_stepFrame, 11, 6, "stepLayout"); @@ -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 tqlayout + // create page layout m_pageLayout = new TQVBoxLayout(0, 0, 6, "pageLayout"); // the page will be inserted later dynamically above this line diff --git a/kmymoney2/widgets/kmymoneywizard.h b/kmymoney2/widgets/kmymoneywizard.h index 803061e..7983955 100644 --- a/kmymoney2/widgets/kmymoneywizard.h +++ b/kmymoney2/widgets/kmymoneywizard.h @@ -289,7 +289,7 @@ protected: * @author Thomas Baumgart (C) 2006 * * This is a base class for implementation of the KMyMoneyWizard. It provides - * the following tqlayout of a wizard: + * the following layout of a wizard: * * @code * +-wizardLayout-----------------------------------------------+ diff --git a/kmymoney2/widgets/kschedulebriefwidget.ui b/kmymoney2/widgets/kschedulebriefwidget.ui index 29f5b75..fff3bef 100644 --- a/kmymoney2/widgets/kschedulebriefwidget.ui +++ b/kmymoney2/widgets/kschedulebriefwidget.ui @@ -56,7 +56,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -130,7 +130,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> diff --git a/kmymoney2/widgets/scheduledtransaction.cpp b/kmymoney2/widgets/scheduledtransaction.cpp index c954b85..cb47fdb 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->tqpalette().disabled(); + cg = m_parent->palette().disabled(); bool rc = Transaction::paintRegisterCellSetup(painter, row, col, cellRect, textRect, cg, brush); return rc; diff --git a/kmymoney2/widgets/transaction.cpp b/kmymoney2/widgets/transaction.cpp index daf080f..b4ac7cd 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->tqpalette().disabled(); + cg = m_parent->palette().disabled(); if(m_alternate) cg.setColor(TQColorGroup::Base, KMyMoneyGlobalSettings::listColor()); diff --git a/kmymoney2/widgets/transactionsortoption.ui b/kmymoney2/widgets/transactionsortoption.ui index 8a85462..393e0bc 100644 --- a/kmymoney2/widgets/transactionsortoption.ui +++ b/kmymoney2/widgets/transactionsortoption.ui @@ -22,7 +22,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -57,7 +57,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -117,7 +117,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -152,7 +152,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> |