diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-06 00:54:43 -0600 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-02 19:04:47 +0200 |
commit | ab32d1dcfb2ee4c59ee3cfdc697adfb717ea91b9 (patch) | |
tree | f1579b1f398b3c8e19d8114e87dd2fef3b407651 /kdeui | |
parent | c1a037c8d0250886e3e984d6171d798b5a60dc9d (diff) | |
download | tdelibs-ab32d1dcfb2ee4c59ee3cfdc697adfb717ea91b9.tar.gz tdelibs-ab32d1dcfb2ee4c59ee3cfdc697adfb717ea91b9.zip |
Rename tqsetAlignment to fix bindings
(cherry picked from commit b212a1de50010bf9f8ff93123281a6956291cdf2)
Diffstat (limited to 'kdeui')
-rw-r--r-- | kdeui/kaboutdialog.cpp | 10 | ||||
-rw-r--r-- | kdeui/kauthicon.cpp | 2 | ||||
-rw-r--r-- | kdeui/kcharselect.cpp | 6 | ||||
-rw-r--r-- | kdeui/kcolordialog.cpp | 12 | ||||
-rw-r--r-- | kdeui/kdatewidget.cpp | 2 | ||||
-rw-r--r-- | kdeui/kedittoolbar.cpp | 2 | ||||
-rw-r--r-- | kdeui/kfontdialog.cpp | 2 | ||||
-rw-r--r-- | kdeui/kkeydialog.cpp | 2 | ||||
-rw-r--r-- | kdeui/knuminput.cpp | 10 | ||||
-rw-r--r-- | kdeui/kpanelapplet.cpp | 2 | ||||
-rw-r--r-- | kdeui/kpanelapplet.h | 2 | ||||
-rw-r--r-- | kdeui/kpanelextension.cpp | 2 | ||||
-rw-r--r-- | kdeui/kpanelextension.h | 2 | ||||
-rw-r--r-- | kdeui/kpassdlg.cpp | 16 | ||||
-rw-r--r-- | kdeui/kpassivepopup.cpp | 6 | ||||
-rw-r--r-- | kdeui/ksqueezedtextlabel.cpp | 4 | ||||
-rw-r--r-- | kdeui/ksqueezedtextlabel.h | 2 | ||||
-rw-r--r-- | kdeui/kstatusbar.cpp | 4 | ||||
-rw-r--r-- | kdeui/kstatusbar.h | 2 | ||||
-rw-r--r-- | kdeui/ksystemtray.cpp | 2 | ||||
-rw-r--r-- | kdeui/ktip.cpp | 4 | ||||
-rw-r--r-- | kdeui/ktoolbarlabelaction.cpp | 2 | ||||
-rw-r--r-- | kdeui/tests/kbuttonboxtest.cpp | 12 | ||||
-rw-r--r-- | kdeui/tests/kcompletiontest.cpp | 2 | ||||
-rw-r--r-- | kdeui/tests/kwizardtest.cpp | 2 |
25 files changed, 57 insertions, 57 deletions
diff --git a/kdeui/kaboutdialog.cpp b/kdeui/kaboutdialog.cpp index 6a05ec0dc..d1bb45168 100644 --- a/kdeui/kaboutdialog.cpp +++ b/kdeui/kaboutdialog.cpp @@ -106,7 +106,7 @@ KAboutContributor::KAboutContributor( TQWidget *_parent, const char *wname, connect(kurl, TQT_SIGNAL(leftClickedURL(const TQString &)), TQT_SLOT(urlClickedSlot(const TQString &))); - mLabel[3]->tqsetAlignment( AlignTop ); + mLabel[3]->setAlignment( AlignTop ); fontChange( font() ); updateLayout(); @@ -314,7 +314,7 @@ KAboutContainerBase::KAboutContainerBase( int layoutType, TQWidget *_parent, if( layoutType & AbtTitle ) { mTitleLabel = new TQLabel( this, "title" ); - mTitleLabel->tqsetAlignment(AlignCenter); + mTitleLabel->setAlignment(AlignCenter); mTopLayout->addWidget( mTitleLabel ); mTopLayout->addSpacing( KDialog::spacingHint() ); } @@ -905,7 +905,7 @@ void KAboutContainer::addTitle( const TQString &title, int tqalignment, { label->setFrameStyle(TQFrame::Panel | TQFrame::Raised); } - label->tqsetAlignment( tqalignment ); + label->setAlignment( tqalignment ); } @@ -924,7 +924,7 @@ void KAboutContainer::addImage( const TQString &fileName, int tqalignment ) pix = logo; label->setPixmap( pix ); } - label->tqsetAlignment( tqalignment ); + label->setAlignment( tqalignment ); } #if 0 @@ -1326,7 +1326,7 @@ KAboutWidget::KAboutWidget(TQWidget *_parent, const char *_name) cont->setText(i18n("Other Contributors:")); logo->setText(i18n("(No logo available)")); logo->setFrameStyle(TQFrame::Panel | TQFrame::Raised); - version->tqsetAlignment(AlignCenter); + version->setAlignment(AlignCenter); // ----- connect(author, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)), TQT_SLOT(sendEmailSlot(const TQString&, const TQString&))); diff --git a/kdeui/kauthicon.cpp b/kdeui/kauthicon.cpp index fe267a754..647009f25 100644 --- a/kdeui/kauthicon.cpp +++ b/kdeui/kauthicon.cpp @@ -113,7 +113,7 @@ KAuthIcon::KAuthIcon(TQWidget *parent, const char *name) lockLabel->setText(lockText); else lockLabel->setText(openLockText); - lockLabel->tqsetAlignment(AlignCenter); + lockLabel->setAlignment(AlignCenter); lockLabel->setMinimumSize(lockLabel->sizeHint()); lockLabel->setText(lockText); diff --git a/kdeui/kcharselect.cpp b/kdeui/kcharselect.cpp index 1540b2622..3a5ababce 100644 --- a/kdeui/kcharselect.cpp +++ b/kdeui/kcharselect.cpp @@ -382,7 +382,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f TQLabel* const lFont = new TQLabel( i18n( "Font:" ), bar ); lFont->resize( lFont->sizeHint() ); - lFont->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter ); + lFont->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); lFont->setMaximumWidth( lFont->sizeHint().width() ); fontCombo = new TQComboBox( true, bar ); @@ -393,7 +393,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f TQLabel* const lTable = new TQLabel( i18n( "Table:" ), bar ); lTable->resize( lTable->sizeHint() ); - lTable->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter ); + lTable->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); lTable->setMaximumWidth( lTable->sizeHint().width() ); tableSpinBox = new TQSpinBox( 0, 255, 1, bar ); @@ -403,7 +403,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f TQLabel* const lUnicode = new TQLabel( i18n( "&Unicode code point:" ), bar ); lUnicode->resize( lUnicode->sizeHint() ); - lUnicode->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter ); + lUnicode->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); lUnicode->setMaximumWidth( lUnicode->sizeHint().width() ); const TQRegExp rx( "[a-fA-F0-9]{1,4}" ); diff --git a/kdeui/kcolordialog.cpp b/kdeui/kcolordialog.cpp index 0dac47756..fbafb4715 100644 --- a/kdeui/kcolordialog.cpp +++ b/kdeui/kcolordialog.cpp @@ -1003,7 +1003,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) // add the HSV fields // label = new TQLabel( i18n("H:"), page ); - label->tqsetAlignment(AlignRight | AlignVCenter); + label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 0, 2); d->hedit = new KColorSpinBox( 0, 359, 1, page ); d->hedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->hedit) ) ); @@ -1012,7 +1012,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) TQT_SLOT( slotHSVChanged() ) ); label = new TQLabel( i18n("S:"), page ); - label->tqsetAlignment(AlignRight | AlignVCenter); + label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 1, 2); d->sedit = new KColorSpinBox( 0, 255, 1, page ); d->sedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->sedit) ) ); @@ -1021,7 +1021,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) TQT_SLOT( slotHSVChanged() ) ); label = new TQLabel( i18n("V:"), page ); - label->tqsetAlignment(AlignRight | AlignVCenter); + label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 2, 2); d->vedit = new KColorSpinBox( 0, 255, 1, page ); d->vedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->vedit) ) ); @@ -1033,7 +1033,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) // add the RGB fields // label = new TQLabel( i18n("R:"), page ); - label->tqsetAlignment(AlignRight | AlignVCenter); + label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 0, 4); d->redit = new KColorSpinBox( 0, 255, 1, page ); d->redit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->redit) ) ); @@ -1042,7 +1042,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) TQT_SLOT( slotRGBChanged() ) ); label = new TQLabel( i18n("G:"), page ); - label->tqsetAlignment(AlignRight | AlignVCenter); + label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget( label, 1, 4); d->gedit = new KColorSpinBox( 0, 255,1, page ); d->gedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->gedit) ) ); @@ -1051,7 +1051,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) TQT_SLOT( slotRGBChanged() ) ); label = new TQLabel( i18n("B:"), page ); - label->tqsetAlignment(AlignRight | AlignVCenter); + label->setAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 2, 4); d->bedit = new KColorSpinBox( 0, 255, 1, page ); d->bedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->bedit) ) ); diff --git a/kdeui/kdatewidget.cpp b/kdeui/kdatewidget.cpp index 5636c6596..ba46a599b 100644 --- a/kdeui/kdatewidget.cpp +++ b/kdeui/kdatewidget.cpp @@ -37,7 +37,7 @@ public: KDateWidgetSpinBox(int min, int max, TQWidget *parent) : TQSpinBox(min, max, 1, parent) { - editor()->tqsetAlignment(TQt::AlignRight); + editor()->setAlignment(TQt::AlignRight); } }; diff --git a/kdeui/kedittoolbar.cpp b/kdeui/kedittoolbar.cpp index ad03a2b7d..664e206bd 100644 --- a/kdeui/kedittoolbar.cpp +++ b/kdeui/kedittoolbar.cpp @@ -853,7 +853,7 @@ void KEditToolbarWidget::setupLayout() connect(m_downAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotDownButton())); d->m_helpArea = new TQLabel(this); - d->m_helpArea->tqsetAlignment( TQt::WordBreak ); + d->m_helpArea->setAlignment( TQt::WordBreak ); // now start with our layouts TQVBoxLayout *top_layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); diff --git a/kdeui/kfontdialog.cpp b/kdeui/kfontdialog.cpp index 61377830b..a5609a81e 100644 --- a/kdeui/kfontdialog.cpp +++ b/kdeui/kfontdialog.cpp @@ -295,7 +295,7 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name, //i18n: This is a classical test phrase. (It contains all letters from A to Z.) sampleEdit->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog")); sampleEdit->setMinimumHeight( sampleEdit->fontMetrics().lineSpacing() ); - sampleEdit->tqsetAlignment(Qt::AlignCenter); + sampleEdit->setAlignment(Qt::AlignCenter); gridLayout->addMultiCellWidget(sampleEdit, 4, 4, 0, 2); TQString sampleEditWhatsThisText = i18n("This sample text illustrates the current settings. " diff --git a/kdeui/kkeydialog.cpp b/kdeui/kkeydialog.cpp index ceab2a0ad..84d367a65 100644 --- a/kdeui/kkeydialog.cpp +++ b/kdeui/kkeydialog.cpp @@ -439,7 +439,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) d->lInfo = new TQLabel(d->fCArea); //resize(0,0); - //d->lInfo->tqsetAlignment( AlignCenter ); + //d->lInfo->setAlignment( AlignCenter ); //d->lInfo->setEnabled( false ); //d->lInfo->hide(); grid->addMultiCellWidget( d->lInfo, 2, 2, 0, 3 ); diff --git a/kdeui/knuminput.cpp b/kdeui/knuminput.cpp index 98df35c82..19c3268af 100644 --- a/kdeui/knuminput.cpp +++ b/kdeui/knuminput.cpp @@ -108,7 +108,7 @@ void KNumInput::setLabel(const TQString & label, int a) else { if (m_label) m_label->setText(label); else m_label = new TQLabel(label, this, "KNumInput::TQLabel"); - m_label->tqsetAlignment((a & (~(AlignTop|AlignBottom|AlignVCenter))) + m_label->setAlignment((a & (~(AlignTop|AlignBottom|AlignVCenter))) | AlignVCenter); // if no vertical tqalignment set, use Top tqalignment if(!(a & (AlignTop|AlignBottom|AlignVCenter))) @@ -204,7 +204,7 @@ void KNumInput::setSteps(int minor, int major) KIntSpinBox::KIntSpinBox(TQWidget *parent, const char *name) : TQSpinBox(0, 99, 1, parent, name) { - editor()->tqsetAlignment(AlignRight); + editor()->setAlignment(AlignRight); val_base = 10; setValue(0); } @@ -217,7 +217,7 @@ KIntSpinBox::KIntSpinBox(int lower, int upper, int step, int value, int base, TQWidget* parent, const char* name) : TQSpinBox(lower, upper, step, parent, name) { - editor()->tqsetAlignment(AlignRight); + editor()->setAlignment(AlignRight); val_base = base; setValue(value); } @@ -996,7 +996,7 @@ public: KDoubleSpinBox::KDoubleSpinBox( TQWidget * parent, const char * name ) : TQSpinBox( parent, name ) { - editor()->tqsetAlignment( Qt::AlignRight ); + editor()->setAlignment( Qt::AlignRight ); d = new Private(); updateValidator(); connect( this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)) ); @@ -1007,7 +1007,7 @@ KDoubleSpinBox::KDoubleSpinBox( double lower, double upper, double step, TQWidget * parent, const char * name ) : TQSpinBox( parent, name ) { - editor()->tqsetAlignment( Qt::AlignRight ); + editor()->setAlignment( Qt::AlignRight ); d = new Private(); setRange( lower, upper, step, precision ); setValue( value ); diff --git a/kdeui/kpanelapplet.cpp b/kdeui/kpanelapplet.cpp index ece71ad54..f04cd2177 100644 --- a/kdeui/kpanelapplet.cpp +++ b/kdeui/kpanelapplet.cpp @@ -78,7 +78,7 @@ void KPanelApplet::setPosition( Position p ) positionChange( p ); } -void KPanelApplet::tqsetAlignment( Alignment a ) +void KPanelApplet::setAlignment( Alignment a ) { if( _tqalignment == a ) return; _tqalignment = a; diff --git a/kdeui/kpanelapplet.h b/kdeui/kpanelapplet.h index 34adf910a..53a081aa5 100644 --- a/kdeui/kpanelapplet.h +++ b/kdeui/kpanelapplet.h @@ -224,7 +224,7 @@ public: /** * @internal **/ - void tqsetAlignment( Alignment a ); + void setAlignment( Alignment a ); signals: /** diff --git a/kdeui/kpanelextension.cpp b/kdeui/kpanelextension.cpp index d3dc33c54..e9cd564bd 100644 --- a/kdeui/kpanelextension.cpp +++ b/kdeui/kpanelextension.cpp @@ -71,7 +71,7 @@ void KPanelExtension::setPosition( Position p ) positionChange( p ); } -void KPanelExtension::tqsetAlignment( Alignment a ) +void KPanelExtension::setAlignment( Alignment a ) { if( _tqalignment == a ) return; _tqalignment = a; diff --git a/kdeui/kpanelextension.h b/kdeui/kpanelextension.h index fc7ba301b..01f87125d 100644 --- a/kdeui/kpanelextension.h +++ b/kdeui/kpanelextension.h @@ -189,7 +189,7 @@ public: /** * @internal **/ - void tqsetAlignment( Alignment a ); + void setAlignment( Alignment a ); /** * @internal * @since 3.1 diff --git a/kdeui/kpassdlg.cpp b/kdeui/kpassdlg.cpp index e57d5d15b..a1845128c 100644 --- a/kdeui/kpassdlg.cpp +++ b/kdeui/kpassdlg.cpp @@ -354,13 +354,13 @@ void KPasswordDialog::init() if (!pix.isNull()) { lbl = new TQLabel(m_pMain); lbl->setPixmap(pix); - lbl->tqsetAlignment(AlignHCenter|AlignVCenter); + lbl->setAlignment(AlignHCenter|AlignVCenter); lbl->setFixedSize(lbl->sizeHint()); m_pGrid->addWidget(lbl, 0, 0, (TQ_Alignment)AlignCenter); } m_pHelpLbl = new TQLabel(m_pMain); - m_pHelpLbl->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak); + m_pHelpLbl->setAlignment(AlignLeft|AlignVCenter|WordBreak); m_pGrid->addWidget(m_pHelpLbl, 0, 2, (TQ_Alignment)AlignLeft); m_pGrid->addRowSpacing(1, 10); m_pGrid->setRowStretch(1, 12); @@ -371,7 +371,7 @@ void KPasswordDialog::init() // Row 3: Password editor #1 lbl = new TQLabel(m_pMain); - lbl->tqsetAlignment(AlignLeft|AlignVCenter); + lbl->setAlignment(AlignLeft|AlignVCenter); lbl->setText(i18n("&Password:")); lbl->setFixedSize(lbl->sizeHint()); m_pGrid->addWidget(lbl, 7, 0, (TQ_Alignment)AlignLeft); @@ -402,7 +402,7 @@ void KPasswordDialog::init() } else if (m_Type == NewPassword) { m_pGrid->addRowSpacing(8, 10); lbl = new TQLabel(m_pMain); - lbl->tqsetAlignment(AlignLeft|AlignVCenter); + lbl->setAlignment(AlignLeft|AlignVCenter); lbl->setText(i18n("&Verify:")); lbl->setFixedSize(lbl->sizeHint()); m_pGrid->addWidget(lbl, 9, 0, (TQ_Alignment)AlignLeft); @@ -424,7 +424,7 @@ void KPasswordDialog::init() strengthBox->setSpacing(10); m_pGrid->addMultiCellWidget(strengthBox, 11, 11, 0, 2); TQLabel* const passStrengthLabel = new TQLabel(strengthBox); - passStrengthLabel->tqsetAlignment(AlignLeft|AlignVCenter); + passStrengthLabel->setAlignment(AlignLeft|AlignVCenter); passStrengthLabel->setText(i18n("Password strength meter:")); d->m_strengthBar = new KProgress(100, strengthBox, "PasswordStrengthMeter"); d->m_strengthBar->setPercentageVisible(false); @@ -443,7 +443,7 @@ void KPasswordDialog::init() m_pGrid->setRowStretch(12, 12); d->m_MatchLabel = new TQLabel(m_pMain); - d->m_MatchLabel->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak); + d->m_MatchLabel->setAlignment(AlignLeft|AlignVCenter|WordBreak); m_pGrid->addMultiCellWidget(d->m_MatchLabel, 13, 13, 0, 2); d->m_MatchLabel->setText(i18n("Passwords do not match")); @@ -490,12 +490,12 @@ void KPasswordDialog::addLine(TQString key, TQString value) return; TQLabel *lbl = new TQLabel(key, m_pMain); - lbl->tqsetAlignment(AlignLeft|AlignTop); + lbl->setAlignment(AlignLeft|AlignTop); lbl->setFixedSize(lbl->sizeHint()); m_pGrid->addWidget(lbl, m_Row+2, 0, (TQ_Alignment)AlignLeft); lbl = new TQLabel(value, m_pMain); - lbl->tqsetAlignment(AlignTop|WordBreak); + lbl->setAlignment(AlignTop|WordBreak); lbl->setFixedSize(275, lbl->heightForWidth(275)); m_pGrid->addWidget(lbl, m_Row+2, 2, (TQ_Alignment)AlignLeft); ++m_Row; diff --git a/kdeui/kpassivepopup.cpp b/kdeui/kpassivepopup.cpp index 06bf8f0a3..b348e1040 100644 --- a/kdeui/kpassivepopup.cpp +++ b/kdeui/kpassivepopup.cpp @@ -138,7 +138,7 @@ TQVBox * KPassivePopup::standardView( const TQString& caption, hb->setSpacing( KDialog::spacingHint() ); ttlIcon = new TQLabel( hb, "title_icon" ); ttlIcon->setPixmap( icon ); - ttlIcon->tqsetAlignment( AlignLeft ); + ttlIcon->setAlignment( AlignLeft ); } if ( !caption.isEmpty() ) { @@ -146,14 +146,14 @@ TQVBox * KPassivePopup::standardView( const TQString& caption, TQFont fnt = ttl->font(); fnt.setBold( true ); ttl->setFont( fnt ); - ttl->tqsetAlignment( Qt::AlignHCenter ); + ttl->setAlignment( Qt::AlignHCenter ); if ( hb ) hb->setStretchFactor( ttl, 10 ); // enforce centering } if ( !text.isEmpty() ) { msg = new TQLabel( text, vb, "msg_label" ); - msg->tqsetAlignment( AlignLeft ); + msg->setAlignment( AlignLeft ); } return vb; diff --git a/kdeui/ksqueezedtextlabel.cpp b/kdeui/ksqueezedtextlabel.cpp index 2d24a34c8..fc2ea9660 100644 --- a/kdeui/ksqueezedtextlabel.cpp +++ b/kdeui/ksqueezedtextlabel.cpp @@ -73,11 +73,11 @@ void KSqueezedTextLabel::squeezeTextToLabel() { } } -void KSqueezedTextLabel::tqsetAlignment( int tqalignment ) +void KSqueezedTextLabel::setAlignment( int tqalignment ) { // save fullText and restore it TQString tmpFull(fullText); - TQLabel::tqsetAlignment(tqalignment); + TQLabel::setAlignment(tqalignment); fullText = tmpFull; } diff --git a/kdeui/ksqueezedtextlabel.h b/kdeui/ksqueezedtextlabel.h index 25cea3d89..9ad81d9dd 100644 --- a/kdeui/ksqueezedtextlabel.h +++ b/kdeui/ksqueezedtextlabel.h @@ -58,7 +58,7 @@ public: /** * Overridden for internal reasons; the API remains unaffected. */ - virtual void tqsetAlignment( int ); + virtual void setAlignment( int ); public slots: void setText( const TQString & ); diff --git a/kdeui/kstatusbar.cpp b/kdeui/kstatusbar.cpp index a04cbf875..696f1294c 100644 --- a/kdeui/kstatusbar.cpp +++ b/kdeui/kstatusbar.cpp @@ -42,7 +42,7 @@ KStatusBarLabel::KStatusBarLabel( const TQString& text, int _id, setLineWidth (0); setFrameStyle (TQFrame::NoFrame); - tqsetAlignment( AlignHCenter | AlignVCenter | SingleLine ); + setAlignment( AlignHCenter | AlignVCenter | SingleLine ); connect (this, TQT_SIGNAL(itemPressed(int)), parent, TQT_SIGNAL(pressed(int))); connect (this, TQT_SIGNAL(itemReleased(int)), parent, TQT_SIGNAL(released(int))); @@ -129,7 +129,7 @@ void KStatusBar::setItemAlignment (int id, int align) KStatusBarLabel *l = items[id]; if (l) { - l->tqsetAlignment(align); + l->setAlignment(align); } else kdDebug() << "KStatusBar::setItemAlignment: bad item id: " << id << endl; diff --git a/kdeui/kstatusbar.h b/kdeui/kstatusbar.h index bacc700bb..81304cf46 100644 --- a/kdeui/kstatusbar.h +++ b/kdeui/kstatusbar.h @@ -168,7 +168,7 @@ public: /** * Sets the tqalignment of item @p id. By default all fields are aligned - * @p AlignHCenter | @p AlignVCenter. See TQLabel::tqsetAlignment for details. + * @p AlignHCenter | @p AlignVCenter. See TQLabel::setAlignment for details. * */ void setItemAlignment(int id, int align); diff --git a/kdeui/ksystemtray.cpp b/kdeui/ksystemtray.cpp index e354b95a2..6928d4df7 100644 --- a/kdeui/ksystemtray.cpp +++ b/kdeui/ksystemtray.cpp @@ -96,7 +96,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) d->on_all_desktops = false; } setCaption( KGlobal::instance()->aboutData()->programName()); - tqsetAlignment( tqalignment() | Qt::AlignVCenter | Qt::AlignHCenter ); + setAlignment( tqalignment() | Qt::AlignVCenter | Qt::AlignHCenter ); // Handle the possibility that the requested system tray size is something other than 22x22 pixels, per the Free Desktop specifications setScaledContents(true); diff --git a/kdeui/ktip.cpp b/kdeui/ktip.cpp index f8e30fcd1..5792db879 100644 --- a/kdeui/ktip.cpp +++ b/kdeui/ktip.cpp @@ -223,7 +223,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) titlePane->setBackgroundPixmap(locate("data", "kdeui/pics/ktip-background.png")); titlePane->setText(i18n("Did you know...?\n")); titlePane->setFont(TQFont(KGlobalSettings::generalFont().family(), 20, TQFont::Bold)); - titlePane->tqsetAlignment(TQLabel::AlignCenter); + titlePane->setAlignment(TQLabel::AlignCenter); pl->addWidget(titlePane, 100); } @@ -268,7 +268,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) TQLabel *l = new TQLabel(hbox); l->setPixmap(img); l->setBackgroundColor(mBlendedColor); - l->tqsetAlignment(Qt::AlignRight | Qt::AlignBottom); + l->setAlignment(Qt::AlignRight | Qt::AlignBottom); resize(550, 230); TQSize sh = size(); diff --git a/kdeui/ktoolbarlabelaction.cpp b/kdeui/ktoolbarlabelaction.cpp index 005ce559e..8fb5a1341 100644 --- a/kdeui/ktoolbarlabelaction.cpp +++ b/kdeui/ktoolbarlabelaction.cpp @@ -84,7 +84,7 @@ void KToolBarLabelAction::init() /* these lines were copied from Konqueror's KonqDraggableLabel class in konq_misc.cc */ d->m_label->setBackgroundMode(TQt::PaletteButton); - d->m_label->tqsetAlignment((TQApplication::reverseLayout() + d->m_label->setAlignment((TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | Qt::AlignVCenter | TQt::ShowPrefix ); d->m_label->adjustSize(); diff --git a/kdeui/tests/kbuttonboxtest.cpp b/kdeui/tests/kbuttonboxtest.cpp index 75295079f..1773c47f9 100644 --- a/kdeui/tests/kbuttonboxtest.cpp +++ b/kdeui/tests/kbuttonboxtest.cpp @@ -37,7 +37,7 @@ int main(int argc, char **argv) { "the window!\n" "Press OK or Cancel when done" , w); - l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); @@ -65,7 +65,7 @@ int main(int argc, char **argv) { TQLabel *l = new TQLabel("Another common dialog\n\n"\ "OK and Cancel are right aligned\n"\ "Try resizing the window!", w); - l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); @@ -91,7 +91,7 @@ int main(int argc, char **argv) { TQLabel *l = new TQLabel("Another common dialog\n\n"\ "OK and Cancel are middle aligned\n"\ "Try resizing the window!", w); - l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); @@ -120,7 +120,7 @@ int main(int argc, char **argv) { "the maximum width for all buttons\n" "since it will look ugly -- " "anyway, it works", w); - l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); @@ -152,7 +152,7 @@ int main(int argc, char **argv) { "prevent this strange effect as seen\n" "the former example!" ,w); - l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); @@ -182,7 +182,7 @@ int main(int argc, char **argv) { "to make vertically aligned buttons\n" "too?" ,w); - l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); l->setMinimumSize(l->sizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w, KButtonBox::Vertical); diff --git a/kdeui/tests/kcompletiontest.cpp b/kdeui/tests/kcompletiontest.cpp index fd44307d3..bdd47ab48 100644 --- a/kdeui/tests/kcompletiontest.cpp +++ b/kdeui/tests/kcompletiontest.cpp @@ -42,7 +42,7 @@ Form1::Form1( TQWidget* parent, const char* name ) GroupBox1->layout()->setSpacing( 0 ); GroupBox1->layout()->setMargin( 0 ); GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() ); - GroupBox1Layout->tqsetAlignment( Qt::AlignTop ); + GroupBox1Layout->setAlignment( Qt::AlignTop ); GroupBox1Layout->setSpacing( 6 ); GroupBox1Layout->setMargin( 11 ); diff --git a/kdeui/tests/kwizardtest.cpp b/kdeui/tests/kwizardtest.cpp index dd9e9eeaf..91974263e 100644 --- a/kdeui/tests/kwizardtest.cpp +++ b/kdeui/tests/kwizardtest.cpp @@ -37,7 +37,7 @@ int main(int argc, char **argv) TQString msg = TQString("This is page %1 out of 10").arg(i); TQLabel *label = new TQLabel(msg, p); TQHBoxLayout *layout = new TQHBoxLayout(p, 5); - label->tqsetAlignment(Qt::AlignCenter); + label->setAlignment(Qt::AlignCenter); label->setFixedSize(300, 200); layout->addWidget(label); TQString title = TQString("%1. page").arg(i); |