From b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:51:21 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- lib/widgets/fancylistviewitem.cpp | 6 +-- lib/widgets/flagboxes.cpp | 20 ++++----- lib/widgets/kdevhtmlpart.cpp | 4 +- lib/widgets/processwidget.cpp | 10 ++--- lib/widgets/processwidget.h | 2 +- lib/widgets/propeditor/pcheckbox.cpp | 4 +- lib/widgets/propeditor/pcolorbutton.cpp | 4 +- lib/widgets/propeditor/pcolorcombo.cpp | 4 +- lib/widgets/propeditor/pcombobox.cpp | 4 +- lib/widgets/propeditor/pdateedit.cpp | 4 +- lib/widgets/propeditor/pdatetimeedit.cpp | 4 +- lib/widgets/propeditor/pdoublenuminput.cpp | 6 +-- lib/widgets/propeditor/pfontbutton.cpp | 6 +-- lib/widgets/propeditor/pfontcombo.cpp | 4 +- lib/widgets/propeditor/plineedit.cpp | 4 +- lib/widgets/propeditor/plinestyleedit.cpp | 4 +- lib/widgets/propeditor/ppixmapedit.cpp | 6 +-- lib/widgets/propeditor/ppointedit.cpp | 8 ++-- lib/widgets/propeditor/prectedit.cpp | 8 ++-- lib/widgets/propeditor/property.h | 2 +- lib/widgets/propeditor/propertyeditor.cpp | 16 +++---- lib/widgets/propeditor/propertywidgetproxy.cpp | 2 +- lib/widgets/propeditor/psizeedit.cpp | 8 ++-- lib/widgets/propeditor/psizepolicyedit.cpp | 8 ++-- lib/widgets/propeditor/pspinbox.cpp | 4 +- lib/widgets/propeditor/pstringlistedit.cpp | 6 +-- lib/widgets/propeditor/psymbolcombo.cpp | 10 ++--- lib/widgets/propeditor/purledit.cpp | 4 +- lib/widgets/propeditor/pyesnobutton.cpp | 4 +- lib/widgets/propeditor/qeditlistbox.cpp | 4 +- lib/widgets/propeditor/qfloatinput.cpp | 2 +- lib/widgets/qcomboview.cpp | 62 +++++++++++++------------- lib/widgets/qcomboview.h | 2 +- lib/widgets/resizablecombo.cpp | 2 +- 34 files changed, 124 insertions(+), 124 deletions(-) (limited to 'lib/widgets') diff --git a/lib/widgets/fancylistviewitem.cpp b/lib/widgets/fancylistviewitem.cpp index ef911ca0..6956636e 100644 --- a/lib/widgets/fancylistviewitem.cpp +++ b/lib/widgets/fancylistviewitem.cpp @@ -108,13 +108,13 @@ void FancyListViewItem::paintCell( TQPainter *painter, const TQColorGroup &cg, if ( isEnabled() || !lv ) p->setPen( cg.highlightedText() ); else if ( !isEnabled() && lv) - p->setPen( lv->tqpalette().disabled().highlightedText() ); + p->setPen( lv->palette().disabled().highlightedText() ); } { if ( isEnabled() || !lv ) p->setPen( cg.text() ); else if ( !isEnabled() && lv) - p->setPen( lv->tqpalette().disabled().text() ); + p->setPen( lv->palette().disabled().text() ); int iconWidth = 0; @@ -129,7 +129,7 @@ void FancyListViewItem::paintCell( TQPainter *painter, const TQColorGroup &cg, else if ( align & AlignTop ) yo = 0; -// respect horizontal tqalignment when there is no text for an item. +// respect horizontal alignment when there is no text for an item. if ( t.isEmpty() ) { if ( align & AlignRight ) xo = width - 2 * marg - iconWidth; diff --git a/lib/widgets/flagboxes.cpp b/lib/widgets/flagboxes.cpp index 038d7936..648001b5 100644 --- a/lib/widgets/flagboxes.cpp +++ b/lib/widgets/flagboxes.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -72,7 +72,7 @@ void FlagListToolTip::maybeTip(const TQPoint &pos) FlagListItem *flitem = static_cast(item); if (item) - tip(listbox->tqitemRect(item), flitem->desc); + tip(listbox->itemRect(item), flitem->desc); } @@ -306,22 +306,22 @@ FlagPathEdit::FlagPathEdit( TQWidget * parent, TQString pathDelimiter, { TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1); topLayout->addWidget(new TQLabel(description, this)); - TQBoxLayout *tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); + TQBoxLayout *layout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); if (delimiter.isEmpty()) { url = new KURLRequester(this); url->setMode(mode); - tqlayout->addWidget(url); + layout->addWidget(url); } else { edit = new KLineEdit(this); - tqlayout->addWidget(edit); + layout->addWidget(edit); details = new TQPushButton("...", this); details->setMaximumWidth(30); connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPathDetails())); - tqlayout->addWidget(details); + layout->addWidget(details); } TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); @@ -532,16 +532,16 @@ FlagListEdit::FlagListEdit( TQWidget * parent, TQString listDelimiter, FlagEditC { TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1); topLayout->addWidget(new TQLabel(description, this)); - TQBoxLayout *tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); + TQBoxLayout *layout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); edit = new KLineEdit(this); - tqlayout->addWidget(edit); + layout->addWidget(edit); if (! listDelimiter.isEmpty()) { details = new TQPushButton("...", this); details->setMaximumWidth(30); connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showListDetails())); - tqlayout->addWidget(details); + layout->addWidget(details); } TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); @@ -624,7 +624,7 @@ void FlagSpinEdit::setText( const TQString text ) TQString FlagSpinEdit::text( ) { - return TQString("%1").tqarg(spb->value()); + return TQString("%1").arg(spb->value()); } TQString FlagSpinEdit::flags( ) diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp index bb9bc892..bb476fdb 100644 --- a/lib/widgets/kdevhtmlpart.cpp +++ b/lib/widgets/kdevhtmlpart.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include @@ -495,7 +495,7 @@ void KDevHTMLPart::slotCopy( ) { TQString text = selectedText(); text.replace( TQChar( 0xa0 ), ' ' ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); cb->setText(text); connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp index 1b4cb3ab..f28e4ec7 100644 --- a/lib/widgets/processwidget.cpp +++ b/lib/widgets/processwidget.cpp @@ -73,7 +73,7 @@ void ProcessListBoxItem::paint(TQPainter *p) { TQColor dim, warn, err, back; if (listBox()) { - const TQColorGroup& group = listBox()->tqpalette().active(); + const TQColorGroup& group = listBox()->palette().active(); if (isSelected()) { back = group.button(); warn = group.buttonText(); @@ -227,7 +227,7 @@ void ProcessWidget::childFinished(bool normal, int status) if (normal) { if (status) { - s = i18n("*** Exited with status: %1 ***").tqarg(status); + s = i18n("*** Exited with status: %1 ***").arg(status); t = ProcessListBoxItem::Error; } else { s = i18n("*** Exited normally ***"); @@ -249,12 +249,12 @@ void ProcessWidget::childFinished(bool normal, int status) } -TQSize ProcessWidget::tqminimumSizeHint() const +TQSize ProcessWidget::minimumSizeHint() const { - // I'm not sure about this, but when I don't use override tqminimumSizeHint(), + // I'm not sure about this, but when I don't use override minimumSizeHint(), // the initial size in clearly too small - return TQSize( TQListBox::tqsizeHint().width(), + return TQSize( TQListBox::sizeHint().width(), (fontMetrics().lineSpacing()+2)*4 ); } diff --git a/lib/widgets/processwidget.h b/lib/widgets/processwidget.h index 5c33dd86..814db870 100644 --- a/lib/widgets/processwidget.h +++ b/lib/widgets/processwidget.h @@ -109,7 +109,7 @@ signals: void rowSelected(int row); protected: - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; void maybeScrollToBottom(); protected slots: diff --git a/lib/widgets/propeditor/pcheckbox.cpp b/lib/widgets/propeditor/pcheckbox.cpp index 4a12d575..22c9a9c2 100644 --- a/lib/widgets/propeditor/pcheckbox.cpp +++ b/lib/widgets/propeditor/pcheckbox.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "pcheckbox.h" -#include +#include #include #include @@ -36,7 +36,7 @@ PCheckBox::PCheckBox(MultiProperty *property, TQWidget *parent, const char *name { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQCheckBox(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); diff --git a/lib/widgets/propeditor/pcolorbutton.cpp b/lib/widgets/propeditor/pcolorbutton.cpp index bb927a08..5050791d 100644 --- a/lib/widgets/propeditor/pcolorbutton.cpp +++ b/lib/widgets/propeditor/pcolorbutton.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "pcolorbutton.h" -#include +#include #include #ifndef PURE_QT @@ -45,7 +45,7 @@ PColorButton::PColorButton(MultiProperty* property, TQWidget* parent, const char connect(m_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeColor())); #endif - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); } diff --git a/lib/widgets/propeditor/pcolorcombo.cpp b/lib/widgets/propeditor/pcolorcombo.cpp index b0c82de3..73ad6bc8 100644 --- a/lib/widgets/propeditor/pcolorcombo.cpp +++ b/lib/widgets/propeditor/pcolorcombo.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "pcolorcombo.h" -#include +#include #include #include @@ -31,7 +31,7 @@ PColorCombo::PColorCombo(MultiProperty *property, TQWidget *parent, const char * { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KColorCombo(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int))); diff --git a/lib/widgets/propeditor/pcombobox.cpp b/lib/widgets/propeditor/pcombobox.cpp index fa21678b..2ba2cd57 100644 --- a/lib/widgets/propeditor/pcombobox.cpp +++ b/lib/widgets/propeditor/pcombobox.cpp @@ -20,7 +20,7 @@ #include "pcombobox.h" #include -#include +#include namespace PropertyLib{ @@ -40,7 +40,7 @@ void PComboBox::init(bool rw) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQComboBox(rw, this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); fillBox(); diff --git a/lib/widgets/propeditor/pdateedit.cpp b/lib/widgets/propeditor/pdateedit.cpp index 64bbde18..ef96e430 100644 --- a/lib/widgets/propeditor/pdateedit.cpp +++ b/lib/widgets/propeditor/pdateedit.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include namespace PropertyLib{ @@ -30,7 +30,7 @@ PDateEdit::PDateEdit(MultiProperty* property, TQWidget* parent, const char* name { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQDateEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(updateProperty(const TQDate&))); diff --git a/lib/widgets/propeditor/pdatetimeedit.cpp b/lib/widgets/propeditor/pdatetimeedit.cpp index 59df2440..0aa88262 100644 --- a/lib/widgets/propeditor/pdatetimeedit.cpp +++ b/lib/widgets/propeditor/pdatetimeedit.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include namespace PropertyLib{ @@ -29,7 +29,7 @@ PDateTimeEdit::PDateTimeEdit(MultiProperty* property, TQWidget* parent, const ch { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQDateTimeEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(updateProperty(const TQDateTime&))); diff --git a/lib/widgets/propeditor/pdoublenuminput.cpp b/lib/widgets/propeditor/pdoublenuminput.cpp index e48475de..12c58616 100644 --- a/lib/widgets/propeditor/pdoublenuminput.cpp +++ b/lib/widgets/propeditor/pdoublenuminput.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include namespace PropertyLib{ @@ -43,7 +43,7 @@ PDoubleNumInput::PDoubleNumInput(MultiProperty *property, TQWidget *parent, cons m_edit = new TQFloatInput(-999999, 999999, 0.01, 2, this ); connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); #endif - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); /* m_edit->setMinValue(-999999999); m_edit->setMaxValue(+999999999); m_edit->setPrecision(2);*/ @@ -78,7 +78,7 @@ void PDoubleNumInput::updateProperty(double val) void PDoubleNumInput::updateProperty(int val) { #ifdef PURE_QT - TQString format = TQString("%.%1f").tqarg( m_edit->digits() ); + TQString format = TQString("%.%1f").arg( m_edit->digits() ); TQString strVal = TQString().sprintf(format.latin1(), (val/(float)pow(m_edit->digits(),10)) ); emit propertyChanged(m_property, TQVariant(strVal)); diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp index e54e401f..edfb0b3c 100644 --- a/lib/widgets/propeditor/pfontbutton.cpp +++ b/lib/widgets/propeditor/pfontbutton.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "pfontbutton.h" -#include +#include #include #include @@ -38,7 +38,7 @@ PFontButton::PFontButton(MultiProperty* property, TQWidget* parent, const char* { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KFontRequester(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); #ifndef PURE_QT m_edit->button()->setText(i18n("...")); #endif @@ -61,7 +61,7 @@ void PFontButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, fi.family() + (fi.bold() ? i18n(" Bold") : TQString("")) + (fi.italic() ? i18n(" Italic") : TQString("")) + - " " + TQString("%1").tqarg(fi.pointSize()) ); + " " + TQString("%1").arg(fi.pointSize()) ); } void PFontButton::setValue(const TQVariant& value, bool emitChange) diff --git a/lib/widgets/propeditor/pfontcombo.cpp b/lib/widgets/propeditor/pfontcombo.cpp index 51b44e8c..2e5a5da3 100644 --- a/lib/widgets/propeditor/pfontcombo.cpp +++ b/lib/widgets/propeditor/pfontcombo.cpp @@ -25,7 +25,7 @@ #include #endif -#include +#include #ifdef PURE_QT #include @@ -38,7 +38,7 @@ PFontCombo::PFontCombo(MultiProperty *property, TQWidget *parent, const char *na { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KFontCombo(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); /*adymo: KFontCombo seems to have a bug: when it is not editable, the signals diff --git a/lib/widgets/propeditor/plineedit.cpp b/lib/widgets/propeditor/plineedit.cpp index 2c4fabc9..3d28a6da 100644 --- a/lib/widgets/propeditor/plineedit.cpp +++ b/lib/widgets/propeditor/plineedit.cpp @@ -20,7 +20,7 @@ #include "plineedit.h" #include -#include +#include namespace PropertyLib{ @@ -29,7 +29,7 @@ PLineEdit::PLineEdit(MultiProperty *property, TQWidget *parent, const char *name { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateProperty(const TQString&))); diff --git a/lib/widgets/propeditor/plinestyleedit.cpp b/lib/widgets/propeditor/plinestyleedit.cpp index a47dc614..3fc3315a 100644 --- a/lib/widgets/propeditor/plinestyleedit.cpp +++ b/lib/widgets/propeditor/plinestyleedit.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include namespace PropertyLib { @@ -131,7 +131,7 @@ PLineStyleEdit::PLineStyleEdit(MultiProperty* property, TQWidget* parent, const { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQComboBox(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); m_edit->insertItem(TQPixmap(nopen)); diff --git a/lib/widgets/propeditor/ppixmapedit.cpp b/lib/widgets/propeditor/ppixmapedit.cpp index 20f943e8..6217ed07 100644 --- a/lib/widgets/propeditor/ppixmapedit.cpp +++ b/lib/widgets/propeditor/ppixmapedit.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ #include "ppixmapedit.h" -#include +#include #include #include #include @@ -46,7 +46,7 @@ PPixmapEdit::PPixmapEdit(MultiProperty* property, TQWidget* parent, const char* { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQLabel(this); - m_edit->tqsetAlignment(TQt::AlignTop); + m_edit->setAlignment(TQt::AlignTop); m_edit->resize(width(), height()-1); m_edit->setBackgroundMode(TQt::PaletteBase); m_edit->installEventFilter(this); @@ -54,7 +54,7 @@ PPixmapEdit::PPixmapEdit(MultiProperty* property, TQWidget* parent, const char* m_button = new TQPushButton(i18n("..."), this); m_button->resize(height(), height()-8); m_button->move(width() - m_button->width() -1, 0); - m_button->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed); + m_button->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed); l->addWidget(m_edit); l->addWidget(m_button); m_popup = new TQLabel(0, 0, TQt::WStyle_NoBorder|TQt::WX11BypassWM|WStyle_StaysOnTop); diff --git a/lib/widgets/propeditor/ppointedit.cpp b/lib/widgets/propeditor/ppointedit.cpp index 4e85d214..950da89b 100644 --- a/lib/widgets/propeditor/ppointedit.cpp +++ b/lib/widgets/propeditor/ppointedit.cpp @@ -20,7 +20,7 @@ #include "ppointedit.h" #include -#include +#include #include namespace PropertyLib{ @@ -29,7 +29,7 @@ PPointEdit::PPointEdit(MultiProperty* property, TQWidget* parent, const char* na { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); m_edit->setReadOnly(true); @@ -45,13 +45,13 @@ void PPointEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").tqarg(value.toPoint().x()).tqarg(value.toPoint().y())); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y())); } void PPointEdit::setValue(const TQVariant& value, bool emitChange) { m_value = value; - m_edit->setText(TQString("[ %1, %2 ]").tqarg(value.toPoint().x()).tqarg(value.toPoint().y())); + m_edit->setText(TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y())); if (emitChange) emit propertyChanged(m_property, value); diff --git a/lib/widgets/propeditor/prectedit.cpp b/lib/widgets/propeditor/prectedit.cpp index d7a5fa01..c9f5388e 100644 --- a/lib/widgets/propeditor/prectedit.cpp +++ b/lib/widgets/propeditor/prectedit.cpp @@ -20,7 +20,7 @@ #include "prectedit.h" #include -#include +#include #include namespace PropertyLib{ @@ -29,7 +29,7 @@ PRectEdit::PRectEdit(MultiProperty* property, TQWidget* parent, const char* name { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); m_edit->setReadOnly(true); @@ -45,13 +45,13 @@ void PRectEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2, %3, %4 ]").tqarg(value.toRect().x()).tqarg(value.toRect().y()).tqarg(value.toRect().width()).tqarg(value.toRect().height())); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height())); } void PRectEdit::setValue(const TQVariant& value, bool emitChange) { m_value = value; - m_edit->setText(TQString("[ %1, %2, %3, %4 ]").tqarg(value.toRect().x()).tqarg(value.toRect().y()).tqarg(value.toRect().width()).tqarg(value.toRect().height())); + m_edit->setText(TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height())); if (emitChange) emit propertyChanged(m_property, value); diff --git a/lib/widgets/propeditor/property.h b/lib/widgets/propeditor/property.h index 48c6987f..a94ea4cb 100644 --- a/lib/widgets/propeditor/property.h +++ b/lib/widgets/propeditor/property.h @@ -105,7 +105,7 @@ public: //predefined custom types ValueFromList = 2000 /** -#include +#include #include #include #include @@ -196,7 +196,7 @@ PropertyEditor::PropertyEditor(TQWidget *parent, const char *name) #else m_undoButton->setPixmap( TQPixmap("undo.xpm") ); #endif - m_undoButton->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); + m_undoButton->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); m_undoButton->resize(m_undoButton->height(), m_undoButton->height()); m_undoButton->hide(); connect(m_undoButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(undo())); @@ -270,7 +270,7 @@ void PropertyEditor::addChildProperties(PropertyItem *parent) machine(prop); } -// qWarning("seeking tqchildren: count: %d", prop->details.count()); +// qWarning("seeking children: count: %d", prop->details.count()); parent->setOpen(true); for (TQValueList::iterator it = prop->details.begin(); it != prop->details.end(); ++it) @@ -301,7 +301,7 @@ void PropertyEditor::propertyValueChanged(Property *property) m_currentEditWidget->setValue(property->value(), false); else { -// tqrepaint all items +// repaint all items TQListViewItemIterator it(this); while (it.current()) { @@ -360,11 +360,11 @@ void PropertyEditor::showEditor(PropertyItem *item) void PropertyEditor::placeEditor(PropertyItem *item) { - TQRect r = tqitemRect(item); + TQRect r = itemRect(item); if (!r.size().isValid()) { ensureItemVisible(item); - r = tqitemRect(item); + r = itemRect(item); } r.setX(header()->sectionPos(1)); @@ -386,7 +386,7 @@ void PropertyEditor::placeEditor(PropertyItem *item) m_currentEditLayout->addWidget(editor, 0, 0); m_currentEditLayout->addWidget(m_undoButton, 0, 1); m_currentEditArea->resize(r.size()); -// m_currentEditLayout->tqinvalidate(); +// m_currentEditLayout->invalidate(); moveChild(m_currentEditArea, r.x(), r.y()); m_currentEditWidget = editor; } @@ -447,7 +447,7 @@ Machine *PropertyEditor::machine(MultiProperty *property) m_registeredForType[name] = PropertyMachineFactory::getInstance()->machineForProperty(property); connect(m_registeredForType[name]->propertyEditor, TQT_SIGNAL(propertyChanged(MultiProperty*, const TQVariant&)), this, TQT_SLOT(propertyChanged(MultiProperty*, const TQVariant&))); - m_registeredForType[name]->propertyEditor->reparent(m_currentEditArea, 0, m_currentEditArea->tqchildrenRect().topLeft()); + m_registeredForType[name]->propertyEditor->reparent(m_currentEditArea, 0, m_currentEditArea->childrenRect().topLeft()); m_registeredForType[name]->propertyEditor->hide(); } return m_registeredForType[name]; diff --git a/lib/widgets/propeditor/propertywidgetproxy.cpp b/lib/widgets/propeditor/propertywidgetproxy.cpp index 813708ca..c891672e 100644 --- a/lib/widgets/propeditor/propertywidgetproxy.cpp +++ b/lib/widgets/propeditor/propertywidgetproxy.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "propertywidgetproxy.h" -#include +#include #include "propertywidget.h" #include "propertymachinefactory.h" diff --git a/lib/widgets/propeditor/psizeedit.cpp b/lib/widgets/propeditor/psizeedit.cpp index 5558c3f3..1077a4be 100644 --- a/lib/widgets/propeditor/psizeedit.cpp +++ b/lib/widgets/propeditor/psizeedit.cpp @@ -20,7 +20,7 @@ #include "psizeedit.h" #include -#include +#include #include namespace PropertyLib{ @@ -30,7 +30,7 @@ PSizeEdit::PSizeEdit(MultiProperty *property, TQWidget *parent, const char *name { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); m_edit->setReadOnly(true); @@ -46,13 +46,13 @@ void PSizeEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").tqarg(value.toSize().width()).tqarg(value.toSize().height())); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height())); } void PSizeEdit::setValue(const TQVariant& value, bool emitChange) { m_value = value; - m_edit->setText(TQString("[ %1, %2 ]").tqarg(value.toSize().width()).tqarg(value.toSize().height())); + m_edit->setText(TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height())); if (emitChange) emit propertyChanged(m_property, value); diff --git a/lib/widgets/propeditor/psizepolicyedit.cpp b/lib/widgets/propeditor/psizepolicyedit.cpp index 94847d2a..640c873f 100644 --- a/lib/widgets/propeditor/psizepolicyedit.cpp +++ b/lib/widgets/propeditor/psizepolicyedit.cpp @@ -20,7 +20,7 @@ #include "psizepolicyedit.h" #include -#include +#include #include #include @@ -31,7 +31,7 @@ PSizePolicyEdit::PSizePolicyEdit(MultiProperty* property, const TQMaptqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); m_edit->setReadOnly(true); @@ -47,13 +47,13 @@ void PSizePolicyEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQR p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("%1/%2/%3/%4").tqarg(findValueDescription(value.toSizePolicy().horData())).tqarg(findValueDescription(value.toSizePolicy().verData())).tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch())); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("%1/%2/%3/%4").arg(findValueDescription(value.toSizePolicy().horData())).arg(findValueDescription(value.toSizePolicy().verData())).arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch())); } void PSizePolicyEdit::setValue(const TQVariant& value, bool emitChange) { m_value = value; - m_edit->setText(TQString("%1/%2/%3/%4").tqarg(findValueDescription(value.toSizePolicy().horData())).tqarg(findValueDescription(value.toSizePolicy().verData())).tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch())); + m_edit->setText(TQString("%1/%2/%3/%4").arg(findValueDescription(value.toSizePolicy().horData())).arg(findValueDescription(value.toSizePolicy().verData())).arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch())); if (emitChange) emit propertyChanged(m_property, value); diff --git a/lib/widgets/propeditor/pspinbox.cpp b/lib/widgets/propeditor/pspinbox.cpp index e9c25325..3dfc5abe 100644 --- a/lib/widgets/propeditor/pspinbox.cpp +++ b/lib/widgets/propeditor/pspinbox.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include namespace PropertyLib{ @@ -31,7 +31,7 @@ PSpinBox::PSpinBox(MultiProperty *property, TQWidget *parent, const char *name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQSpinBox(INT_MIN, INT_MAX, 1, this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); diff --git a/lib/widgets/propeditor/pstringlistedit.cpp b/lib/widgets/propeditor/pstringlistedit.cpp index fda16a8b..2b0fc8f8 100644 --- a/lib/widgets/propeditor/pstringlistedit.cpp +++ b/lib/widgets/propeditor/pstringlistedit.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "pstringlistedit.h" -#include +#include #include #include #include @@ -43,10 +43,10 @@ PStringListEdit::PStringListEdit(MultiProperty *property, TQWidget *parent, cons edit = new KLineEdit(this); edit->setReadOnly(true); - edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(edit); pbSelect = new TQPushButton("...", this); - pbSelect->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); + pbSelect->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); l->addWidget(pbSelect); connect(pbSelect, TQT_SIGNAL(clicked()), this, TQT_SLOT(showEditor())); diff --git a/lib/widgets/propeditor/psymbolcombo.cpp b/lib/widgets/propeditor/psymbolcombo.cpp index 7e79945a..25fe3ebd 100644 --- a/lib/widgets/propeditor/psymbolcombo.cpp +++ b/lib/widgets/propeditor/psymbolcombo.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include +#include #include #include #include @@ -40,11 +40,11 @@ PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char { l = new TQHBoxLayout(this); m_edit = new KLineEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); m_edit->setMaxLength(1); l->addWidget(m_edit); m_select = new TQPushButton("...", this); - m_select->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); + m_select->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); l->addWidget(m_select); #ifdef PURE_QT @@ -58,7 +58,7 @@ PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char TQVariant PSymbolCombo::value() const { if (!(m_edit->text().isNull())) - return TQVariant(TQString("%1").tqarg(m_edit->text().tqat(0).tqunicode())); + return TQVariant(TQString("%1").arg(m_edit->text().at(0).unicode())); else return TQVariant(0); } @@ -109,7 +109,7 @@ void PSymbolCombo::selectChar() void PSymbolCombo::updateProperty(const TQString& val) { - emit propertyChanged(m_property, TQVariant(TQString("%1").tqarg(val.tqat(0).tqunicode()))); + emit propertyChanged(m_property, TQVariant(TQString("%1").arg(val.at(0).unicode()))); } void PSymbolCombo::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value) diff --git a/lib/widgets/propeditor/purledit.cpp b/lib/widgets/propeditor/purledit.cpp index df8316cd..0625aa38 100644 --- a/lib/widgets/propeditor/purledit.cpp +++ b/lib/widgets/propeditor/purledit.cpp @@ -26,7 +26,7 @@ #include #endif #include -#include +#include namespace PropertyLib{ @@ -47,7 +47,7 @@ PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent, const c m_mode = mode; connect( m_select, TQT_SIGNAL(clicked()),this,TQT_SLOT(select())); #endif - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); } TQVariant PUrlEdit::value() const diff --git a/lib/widgets/propeditor/pyesnobutton.cpp b/lib/widgets/propeditor/pyesnobutton.cpp index 614b751b..7e96f772 100644 --- a/lib/widgets/propeditor/pyesnobutton.cpp +++ b/lib/widgets/propeditor/pyesnobutton.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "pyesnobutton.h" -#include +#include #include #include @@ -37,7 +37,7 @@ PYesNoButton::PYesNoButton(MultiProperty* property, TQWidget* parent, const char TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQPushButton(this); m_edit->setToggleButton(true); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); connect(m_edit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateProperty(bool))); diff --git a/lib/widgets/propeditor/qeditlistbox.cpp b/lib/widgets/propeditor/qeditlistbox.cpp index fda5a006..d8c8bcdf 100644 --- a/lib/widgets/propeditor/qeditlistbox.cpp +++ b/lib/widgets/propeditor/qeditlistbox.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include @@ -92,7 +92,7 @@ void QEditListBox::init( bool checkAtEntering, int buttons, servNewButton = servRemoveButton = servUpButton = servDownButton = 0L; - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, + setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); TQWidget * gb = this; diff --git a/lib/widgets/propeditor/qfloatinput.cpp b/lib/widgets/propeditor/qfloatinput.cpp index 1922ea6a..f2fefed8 100644 --- a/lib/widgets/propeditor/qfloatinput.cpp +++ b/lib/widgets/propeditor/qfloatinput.cpp @@ -38,7 +38,7 @@ TQFloatInput::TQFloatInput( int min, int max, float step, int digits, TQString TQFloatInput::mapValueToText( int value ) { - TQString format = TQString("%.%1f").tqarg( m_digits ); + TQString format = TQString("%.%1f").arg( m_digits ); return TQString().sprintf(format.latin1(), (value/(float)pow(m_digits,10)) ); } diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp index 2dcfb9f3..113c8d38 100644 --- a/lib/widgets/qcomboview.cpp +++ b/lib/widgets/qcomboview.cpp @@ -39,7 +39,7 @@ public: QComboViewData( QComboView *cb ): current(0), lView( 0 ), combo( cb ) { duplicatesEnabled = TRUE; - cb->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); + cb->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); } inline TQListView * listView() { return lView; } @@ -68,7 +68,7 @@ public: TQLineEdit * ed; // /bin/ed rules! TQTimer *completionTimer; - TQSize tqsizeHint; + TQSize sizeHint; private: bool usinglView; @@ -81,14 +81,14 @@ void QComboViewData::updateLinedGeometry() { if ( !ed || !combo ) return; - TQRect r = TQStyle::tqvisualRect( combo->tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, combo, + TQRect r = TQStyle::visualRect( combo->tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, combo, TQStyle::SC_ComboBoxEditField), combo ); // qWarning("updateLinedGeometry(): currentItem is %d", combo->currentItem() == 0 ? 0 : 1); const TQPixmap *pix = combo->currentItem() ? combo->currentItem()->pixmap(0) : 0; if ( pix && pix->width() < r.width() ) r.setLeft( r.left() + pix->width() + 4 ); - if ( r != ed->tqgeometry() ) + if ( r != ed->geometry() ) ed->setGeometry( r ); } @@ -204,7 +204,7 @@ void QComboView::clear() d->current = 0; if ( d->ed ) { - d->ed->setText( TQString::tqfromLatin1("") ); + d->ed->setText( TQString::fromLatin1("") ); d->updateLinedGeometry(); } currentChanged(); @@ -269,13 +269,13 @@ void QComboView::setAutoResize( bool enable ) reimp This implementation caches the size hint to avoid resizing when - the contents change dynamically. To tqinvalidate the cached value + the contents change dynamically. To invalidate the cached value call setFont(). */ -TQSize QComboView::tqsizeHint() const +TQSize QComboView::sizeHint() const { - if ( isVisible() && d->tqsizeHint.isValid() ) - return d->tqsizeHint; + if ( isVisible() && d->sizeHint.isValid() ) + return d->sizeHint; constPolish(); // int i, w; @@ -290,10 +290,10 @@ TQSize QComboView::tqsizeHint() const maxW = w; } */ - d->tqsizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, this, + d->sizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, this, TQSize(maxW, maxH)).expandedTo(TQApplication::globalStrut())); - return d->tqsizeHint; + return d->sizeHint; } @@ -385,7 +385,7 @@ void QComboView::setPalette( const TQPalette &palette ) void QComboView::setFont( const TQFont &font ) { - d->tqsizeHint = TQSize(); // tqinvalidate size hint + d->sizeHint = TQSize(); // invalidate size hint TQWidget::setFont( font ); d->listView()->setFont( font ); if (d->ed) @@ -412,7 +412,7 @@ void QComboView::resizeEvent( TQResizeEvent * e ) void QComboView::paintEvent( TQPaintEvent * ) { TQPainter p( this ); - const TQColorGroup & g = tqcolorGroup(); + const TQColorGroup & g = colorGroup(); p.setPen(g.text()); TQStyle::SFlags flags = TQStyle::Style_Default; @@ -428,7 +428,7 @@ void QComboView::paintEvent( TQPaintEvent * ) } // bool reverse = TQApplication::reverseLayout(); - tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g, + tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g, flags, TQStyle::SC_All, (d->arrowDown ? TQStyle::SC_ComboBoxArrow : @@ -436,7 +436,7 @@ void QComboView::paintEvent( TQPaintEvent * ) TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ); - re = TQStyle::tqvisualRect(re, this); + re = TQStyle::visualRect(re, this); p.setClipRect( re ); if ( !d->ed ) { @@ -445,14 +445,14 @@ void QComboView::paintEvent( TQPaintEvent * ) // we calculate the TQListBoxTexts height (ignoring strut) int itemh = d->listView()->fontMetrics().lineSpacing() + 2; p.translate( re.x(), re.y() + (re.height() - itemh)/2 ); - item->paintCell( &p, d->listView()->tqcolorGroup(), 0, width(), AlignLeft | AlignVCenter ); + item->paintCell( &p, d->listView()->colorGroup(), 0, width(), AlignLeft | AlignVCenter ); } } else if ( d->listView() && d->listView()->currentItem( ) && d->current ) { TQListViewItem * item = d->current ; const TQPixmap *pix = item->pixmap(0); if ( pix ) { p.fillRect( re.x(), re.y(), pix->width() + 4, re.height(), - tqcolorGroup().brush( TQColorGroup::Base ) ); + colorGroup().brush( TQColorGroup::Base ) ); p.drawPixmap( re.x() + 2, re.y() + ( re.height() - pix->height() ) / 2, *pix ); } @@ -474,7 +474,7 @@ void QComboView::mousePressEvent( TQMouseEvent *e ) } TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow); - arrowRect = TQStyle::tqvisualRect(arrowRect, this); + arrowRect = TQStyle::visualRect(arrowRect, this); // Correction for motif style, where arrow is smaller // and thus has a rect that doesn't fit the button. @@ -489,7 +489,7 @@ void QComboView::mousePressEvent( TQMouseEvent *e ) if ( arrowRect.contains( e->pos() ) ) { d->arrowPressed = TRUE; d->arrowDown = TRUE; - tqrepaint( FALSE ); + repaint( FALSE ); } TQTimer::singleShot( 200, this, TQT_SLOT(internalClickTimeout())); d->shortClick = TRUE; @@ -700,12 +700,12 @@ static int listHeight( TQListView *l, int /*sl*/ ) prefH = ch * l->firstChild()->height(); } else - prefH = l->tqsizeHint().height(); + prefH = l->sizeHint().height(); if (l->header()->isVisible()) - prefH += l->header()->tqsizeHint().height(); + prefH += l->header()->sizeHint().height(); -// return prefH < l->tqsizeHint().height() ? prefH : l->tqsizeHint().height(); +// return prefH < l->sizeHint().height() ? prefH : l->sizeHint().height(); return prefH+2; } @@ -727,7 +727,7 @@ void QComboView::popup() lb->installEventFilter( this ); lb->viewport()->installEventFilter( this ); d->mouseWasInsidePopup = FALSE; -// int w = lb->variableWidth() ? lb->tqsizeHint().width() : width(); +// int w = lb->variableWidth() ? lb->sizeHint().width() : width(); int w = width(); int h = listHeight( lb, d->sizeLimit ); TQRect screen = TQApplication::desktop()->availableGeometry( const_cast(this) ); @@ -790,7 +790,7 @@ void QComboView::updateMask() { TQPainter p( &bm, this ); - tqstyle().tqdrawComplexControlMask(TQStyle::CC_ComboBox, &p, this, rect()); + tqstyle().drawComplexControlMask(TQStyle::CC_ComboBox, &p, this, rect()); } setMask( bm ); @@ -808,7 +808,7 @@ void QComboView::popDownListView() d->listView()->setCurrentItem( d->current ); if ( d->arrowDown ) { d->arrowDown = FALSE; - tqrepaint( FALSE ); + repaint( FALSE ); } d->poppedUp = FALSE; } @@ -904,21 +904,21 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow); - arrowRect = TQStyle::tqvisualRect(arrowRect, this); + arrowRect = TQStyle::visualRect(arrowRect, this); if ( arrowRect.contains( comboPos ) ) { if ( !d->arrowDown ) { d->arrowDown = TRUE; - tqrepaint( FALSE ); + repaint( FALSE ); } } else { if ( d->arrowDown ) { d->arrowDown = FALSE; - tqrepaint( FALSE ); + repaint( FALSE ); } } } } else if ((e->state() & ( Qt::RightButton | Qt::LeftButton | Qt::MidButton ) ) == 0 && - tqstyle().tqstyleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) { + tqstyle().styleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) { // qWarning("event filter:: emu"); TQWidget *mouseW = TQApplication::widgetAt( e->globalPos(), TRUE ); // if ( mouseW == d->listView()->viewport() ) { //### @@ -948,7 +948,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) d->arrowPressed = FALSE; if ( d->arrowDown ) { d->arrowDown = FALSE; - tqrepaint( FALSE ); + repaint( FALSE ); } } } @@ -1333,7 +1333,7 @@ bool QComboView::autoCompletion() const */ void QComboView::styleChange( TQStyle& s ) { - d->tqsizeHint = TQSize(); // tqinvalidate size hint... + d->sizeHint = TQSize(); // invalidate size hint... if ( d->ed ) d->updateLinedGeometry(); TQWidget::styleChange( s ); diff --git a/lib/widgets/qcomboview.h b/lib/widgets/qcomboview.h index ecfa8ee2..35eef4f1 100644 --- a/lib/widgets/qcomboview.h +++ b/lib/widgets/qcomboview.h @@ -68,7 +68,7 @@ public: bool autoResize() const; virtual void setAutoResize( bool ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void setPalette( const TQPalette & ); void setFont( const TQFont & ); diff --git a/lib/widgets/resizablecombo.cpp b/lib/widgets/resizablecombo.cpp index aba2f658..3e2df727 100644 --- a/lib/widgets/resizablecombo.cpp +++ b/lib/widgets/resizablecombo.cpp @@ -21,7 +21,7 @@ #include "kcomboview.h" #include -#include +#include #include #include #include -- cgit v1.2.1