diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:08:55 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:08:55 -0600 |
commit | 09c863183250d07f82c0919e0a40fc7834c32192 (patch) | |
tree | 2e93b57e4c4a6f0548222e04d1b7bda1ade1c742 /libk3b/tools | |
parent | 650b58e8e66f8e3e1cf78ee3e0037f4c9e00699a (diff) | |
download | k3b-09c863183250d07f82c0919e0a40fc7834c32192.tar.gz k3b-09c863183250d07f82c0919e0a40fc7834c32192.zip |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'libk3b/tools')
-rw-r--r-- | libk3b/tools/k3bbusywidget.cpp | 6 | ||||
-rw-r--r-- | libk3b/tools/k3bbusywidget.h | 4 | ||||
-rw-r--r-- | libk3b/tools/k3bcdparanoialib.h | 2 | ||||
-rw-r--r-- | libk3b/tools/k3bcutcombobox.cpp | 14 | ||||
-rw-r--r-- | libk3b/tools/k3bcutcombobox.h | 4 | ||||
-rw-r--r-- | libk3b/tools/k3blistview.cpp | 22 | ||||
-rw-r--r-- | libk3b/tools/k3blistviewitemanimator.cpp | 2 | ||||
-rw-r--r-- | libk3b/tools/k3bmsfedit.cpp | 6 | ||||
-rw-r--r-- | libk3b/tools/k3bmsfedit.h | 2 | ||||
-rw-r--r-- | libk3b/tools/k3bpushbutton.cpp | 4 | ||||
-rw-r--r-- | libk3b/tools/k3brichtextlabel.cpp | 10 | ||||
-rw-r--r-- | libk3b/tools/k3brichtextlabel.h | 4 | ||||
-rw-r--r-- | libk3b/tools/k3btitlelabel.cpp | 6 | ||||
-rw-r--r-- | libk3b/tools/k3btitlelabel.h | 6 | ||||
-rw-r--r-- | libk3b/tools/k3btoolbox.cpp | 20 | ||||
-rw-r--r-- | libk3b/tools/k3btoolbutton.cpp | 2 | ||||
-rw-r--r-- | libk3b/tools/kcutlabel.cpp | 8 | ||||
-rw-r--r-- | libk3b/tools/kcutlabel.h | 2 |
18 files changed, 62 insertions, 62 deletions
diff --git a/libk3b/tools/k3bbusywidget.cpp b/libk3b/tools/k3bbusywidget.cpp index a5f81e3..34615e3 100644 --- a/libk3b/tools/k3bbusywidget.cpp +++ b/libk3b/tools/k3bbusywidget.cpp @@ -68,13 +68,13 @@ void K3bBusyWidget::animateBusy() } -TQSize K3bBusyWidget::tqsizeHint() const +TQSize K3bBusyWidget::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } -TQSize K3bBusyWidget::tqminimumSizeHint() const +TQSize K3bBusyWidget::minimumSizeHint() const { return TQSize( 2*frameWidth() + 62, 10 ); } diff --git a/libk3b/tools/k3bbusywidget.h b/libk3b/tools/k3bbusywidget.h index 7eb927e..bbaddc0 100644 --- a/libk3b/tools/k3bbusywidget.h +++ b/libk3b/tools/k3bbusywidget.h @@ -35,8 +35,8 @@ class LIBK3B_EXPORT K3bBusyWidget : public TQFrame void showBusy( bool b ); - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; protected: void drawContents( TQPainter* p ); diff --git a/libk3b/tools/k3bcdparanoialib.h b/libk3b/tools/k3bcdparanoialib.h index bbeb19e..ff4a09a 100644 --- a/libk3b/tools/k3bcdparanoialib.h +++ b/libk3b/tools/k3bcdparanoialib.h @@ -122,7 +122,7 @@ class LIBK3B_EXPORT K3bCdparanoiaLib */ int status() const; - enum tqStatus { + enum Status { S_OK, S_ERROR // to be extended with Jitter and stuff... diff --git a/libk3b/tools/k3bcutcombobox.cpp b/libk3b/tools/k3bcutcombobox.cpp index 3536c24..089e27e 100644 --- a/libk3b/tools/k3bcutcombobox.cpp +++ b/libk3b/tools/k3bcutcombobox.cpp @@ -45,7 +45,7 @@ K3bCutComboBox::K3bCutComboBox( TQWidget* parent, const char* name ) : KComboBox( parent, name ) { d = new Private(); - // tqsetSizePolicy( TQSizePolicy::Maximum, sizePolicy().horData(), sizePolicy().hasHeightForWidth() ); + // setSizePolicy( TQSizePolicy::Maximum, sizePolicy().horData(), sizePolicy().hasHeightForWidth() ); } @@ -70,9 +70,9 @@ void K3bCutComboBox::setMethod( int m ) } -TQSize K3bCutComboBox::tqsizeHint() const +TQSize K3bCutComboBox::sizeHint() const { -// TQSize s(KComboBox::tqsizeHint()); +// TQSize s(KComboBox::sizeHint()); // for( int i = 0; i < count(); i++ ) { // int w = fontMetrics().width(d->originalItems[i]) + @@ -81,12 +81,12 @@ TQSize K3bCutComboBox::tqsizeHint() const // s.setWidth( w ); // } - return KComboBox::tqsizeHint(); + return KComboBox::sizeHint(); } -TQSize K3bCutComboBox::tqminimumSizeHint() const +TQSize K3bCutComboBox::minimumSizeHint() const { - return KComboBox::tqminimumSizeHint(); + return KComboBox::minimumSizeHint(); } @@ -205,7 +205,7 @@ void K3bCutComboBox::resizeEvent( TQResizeEvent* e ) void K3bCutComboBox::cutText() { - d->width = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, this, + d->width = TQStyle::visualRect( tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField), this ).width(); for( int i = 0; i < (int)d->originalItems.count(); ++i ) { diff --git a/libk3b/tools/k3bcutcombobox.h b/libk3b/tools/k3bcutcombobox.h index 7bc8f70..6fdf18e 100644 --- a/libk3b/tools/k3bcutcombobox.h +++ b/libk3b/tools/k3bcutcombobox.h @@ -54,10 +54,10 @@ class LIBK3B_EXPORT K3bCutComboBox : public KComboBox void setMethod( int ); /** reimplemeted */ - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** reimplemeted */ - TQSize tqminimumSizeHint() const; + TQSize minimumSizeHint() const; /** reimplemeted */ virtual void setCurrentText( const TQString& ); diff --git a/libk3b/tools/k3blistview.cpp b/libk3b/tools/k3blistview.cpp index fb3be4b..d5a893c 100644 --- a/libk3b/tools/k3blistview.cpp +++ b/libk3b/tools/k3blistview.cpp @@ -448,8 +448,8 @@ void K3bListViewItem::paintProgressBar( TQPainter* p, const TQColorGroup& cgh, i // some styles use the widget's tqgeometry s_dummyProgressBar->setGeometry( r ); - listView()->tqstyle().tqdrawControl(TQStyle::CE_ProgressBarContents, &dbPainter, s_dummyProgressBar, r, cgh, flags ); - listView()->tqstyle().tqdrawControl(TQStyle::CE_ProgressBarLabel, &dbPainter, s_dummyProgressBar, r, cgh, flags ); + listView()->tqstyle().drawControl(TQStyle::CE_ProgressBarContents, &dbPainter, s_dummyProgressBar, r, cgh, flags ); + listView()->tqstyle().drawControl(TQStyle::CE_ProgressBarLabel, &dbPainter, s_dummyProgressBar, r, cgh, flags ); // now we really paint the progress in the listview p->drawPixmap( 0, 0, *doubleBuffer ); @@ -508,7 +508,7 @@ void K3bCheckListViewItem::paintK3bCell( TQPainter* p, const TQColorGroup& cg, i if( col == 0 ) { if( m_checked ) { - TQRect r( 0, marginVertical(), width, /*listView()->tqstyle().tqpixelMetric( TQStyle::PM_CheckListButtonSize )*/height()-2*marginVertical() ); + TQRect r( 0, marginVertical(), width, /*listView()->tqstyle().pixelMetric( TQStyle::PM_CheckListButtonSize )*/height()-2*marginVertical() ); TQStyle::SFlags flags = TQStyle::Style_Default; if( listView()->isEnabled() ) @@ -666,7 +666,7 @@ void K3bListView::showEditor( K3bListViewItem* item, int col ) void K3bListView::placeEditor( K3bListViewItem* item, int col ) { ensureItemVisible( item ); - TQRect r = tqitemRect( item ); + TQRect r = itemRect( item ); r.setX( contentsToViewport( TQPoint(header()->sectionPos( col ), 0) ).x() ); r.setWidth( header()->sectionSize( col ) - 1 ); @@ -699,7 +699,7 @@ void K3bListView::placeEditor( K3bListViewItem* item, int col ) if( TQWidget* editor = prepareEditor( item, col ) ) { editor->resize( r.size() ); - // editor->resize( TQSize( r.width(), editor->tqminimumSizeHint().height() ) ); + // editor->resize( TQSize( r.width(), editor->minimumSizeHint().height() ) ); moveChild( editor, r.x(), r.y() ); } } @@ -1143,7 +1143,7 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e ) TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorComboBox) ) { // make sure we did not lose the focus to one of the edit widgets' tqchildren - if( !tqApp->tqfocusWidget() || TQT_BASE_OBJECT(tqApp->tqfocusWidget()->parentWidget()) != TQT_BASE_OBJECT(o) ) { + if( !tqApp->focusWidget() || TQT_BASE_OBJECT(tqApp->focusWidget()->parentWidget()) != TQT_BASE_OBJECT(o) ) { doRename(); hideEditor(); } @@ -1170,7 +1170,7 @@ void K3bListView::viewportResizeEvent( TQResizeEvent* e ) TQPixmap bgPix( size ); // FIXME: let the user specify the color - bgPix.fill( tqcolorGroup().base() ); + bgPix.fill( colorGroup().base() ); if( bgPix.width() < m_backgroundPixmap.width() || bgPix.height() < m_backgroundPixmap.height() ) { @@ -1227,7 +1227,7 @@ KPixmap K3bListView::createDragPixmap( const TQPtrList<TQListViewItem>& items ) int width = header()->width(); int height = 0; for( TQPtrListIterator<TQListViewItem> it( items ); *it; ++it ) { - TQRect r = tqitemRect( *it ); + TQRect r = itemRect( *it ); if( r.isValid() ) { height += ( *it )->height(); @@ -1256,13 +1256,13 @@ KPixmap K3bListView::createDragPixmap( const TQPtrList<TQListViewItem>& items ) // FIXME: items on other than the top level have a smaller first column // the same goes for all items if root is decorated bool alreadyDrawing = false; - TQRect r = tqitemRect( item ); + TQRect r = itemRect( item ); if( r.isValid() ) { if( items.containsRef( item ) ) { // paint all columns int x = 0; for( int i = 0; i < columns(); ++i ) { - item->paintCell( &p, tqcolorGroup(), i, columnWidth( i ), columnAlignment( i ) ); + item->paintCell( &p, colorGroup(), i, columnWidth( i ), columnAlignment( i ) ); p.translate( columnWidth( i ), 0 ); x += columnWidth( i ); } @@ -1274,7 +1274,7 @@ KPixmap K3bListView::createDragPixmap( const TQPtrList<TQListViewItem>& items ) else if( alreadyDrawing ) p.translate( 0, item->height() ); - if( p.tqworldMatrix().dy() >= pix.height() ) + if( p.worldMatrix().dy() >= pix.height() ) break; } } diff --git a/libk3b/tools/k3blistviewitemanimator.cpp b/libk3b/tools/k3blistviewitemanimator.cpp index eef276e..8bb5f69 100644 --- a/libk3b/tools/k3blistviewitemanimator.cpp +++ b/libk3b/tools/k3blistviewitemanimator.cpp @@ -80,7 +80,7 @@ void K3bListViewItemAnimator::setItem( TQListViewItem* item, int col ) m_item = item; m_column = col; m_pixmap = *item->pixmap(col); - m_fadeColor = item->listView()->tqcolorGroup().base(); + m_fadeColor = item->listView()->colorGroup().base(); start(); } diff --git a/libk3b/tools/k3bmsfedit.cpp b/libk3b/tools/k3bmsfedit.cpp index 2266be8..e3d3a70 100644 --- a/libk3b/tools/k3bmsfedit.cpp +++ b/libk3b/tools/k3bmsfedit.cpp @@ -50,16 +50,16 @@ K3bMsfEdit::~K3bMsfEdit() {} -TQSize K3bMsfEdit::tqsizeHint() const +TQSize K3bMsfEdit::sizeHint() const { // more or less copied from TQSpinBox constPolish(); - TQSize sz = editor()->tqsizeHint(); + TQSize sz = editor()->sizeHint(); int h = sz.height(); TQFontMetrics fm( font() ); int w = fm.width( "00:00:00" ); int wx = fm.width( ' ' )*2; - int frame = tqstyle().tqpixelMetric( TQStyle::PM_SpinBoxFrameWidth ); + int frame = tqstyle().pixelMetric( TQStyle::PM_SpinBoxFrameWidth ); return tqstyle().tqsizeFromContents(TQStyle::CT_SpinBox, this, TQSize( w + wx + downRect().width() + frame*2, h + frame*2). diff --git a/libk3b/tools/k3bmsfedit.h b/libk3b/tools/k3bmsfedit.h index d3e75ec..347b6ad 100644 --- a/libk3b/tools/k3bmsfedit.h +++ b/libk3b/tools/k3bmsfedit.h @@ -41,7 +41,7 @@ class LIBK3B_EXPORT K3bMsfEdit : public TQSpinBox K3bMsfEdit( TQWidget* parent = 0, const char* name = 0 ); ~K3bMsfEdit(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void setFrameStyle( int style ); void setLineWidth(int); diff --git a/libk3b/tools/k3bpushbutton.cpp b/libk3b/tools/k3bpushbutton.cpp index a4c58bd..69c6ed5 100644 --- a/libk3b/tools/k3bpushbutton.cpp +++ b/libk3b/tools/k3bpushbutton.cpp @@ -125,10 +125,10 @@ void K3bPushButton::slotDelayedPopup() if( isDown() ) { // popup the menu. // this has been taken from the TQPushButton code - if( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + popup()->tqsizeHint().height() <= tqApp->desktop()->height() ) + if( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + popup()->sizeHint().height() <= tqApp->desktop()->height() ) popup()->exec( mapToGlobal( rect().bottomLeft() ) ); else - popup()->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup()->tqsizeHint().height() ) ) ); + popup()->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup()->sizeHint().height() ) ) ); setDown( false ); } } diff --git a/libk3b/tools/k3brichtextlabel.cpp b/libk3b/tools/k3brichtextlabel.cpp index 02878c2..1dee2b1 100644 --- a/libk3b/tools/k3brichtextlabel.cpp +++ b/libk3b/tools/k3brichtextlabel.cpp @@ -38,14 +38,14 @@ static TQString qrichtextify( const TQString& text ) K3bRichTextLabel::K3bRichTextLabel( const TQString &text , TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); - tqsetAlignment( TQt::WordBreak ); + setAlignment( TQt::WordBreak ); setText(text); } K3bRichTextLabel::K3bRichTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); - tqsetAlignment( TQt::WordBreak ); + setAlignment( TQt::WordBreak ); } void K3bRichTextLabel::setDefaultWidth(int defaultWidth) @@ -59,7 +59,7 @@ TQSizePolicy K3bRichTextLabel::sizePolicy() const return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false); } -TQSize K3bRichTextLabel::tqminimumSizeHint() const +TQSize K3bRichTextLabel::minimumSizeHint() const { TQString qt_text = qrichtextify( text() ); int pref_width = 0; @@ -94,9 +94,9 @@ TQSize K3bRichTextLabel::tqminimumSizeHint() const return TQSize(pref_width, rt.height()); } -TQSize K3bRichTextLabel::tqsizeHint() const +TQSize K3bRichTextLabel::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } void K3bRichTextLabel::setText( const TQString &text ) { diff --git a/libk3b/tools/k3brichtextlabel.h b/libk3b/tools/k3brichtextlabel.h index cf1bc79..a23c9df 100644 --- a/libk3b/tools/k3brichtextlabel.h +++ b/libk3b/tools/k3brichtextlabel.h @@ -43,8 +43,8 @@ public: int defaultWidth() const { return m_defaultWidth; } void setDefaultWidth(int defaultWidth); - virtual TQSize tqminimumSizeHint() const; - virtual TQSize tqsizeHint() const; + virtual TQSize minimumSizeHint() const; + virtual TQSize sizeHint() const; TQSizePolicy sizePolicy() const; public slots: diff --git a/libk3b/tools/k3btitlelabel.cpp b/libk3b/tools/k3btitlelabel.cpp index 21476b0..f243693 100644 --- a/libk3b/tools/k3btitlelabel.cpp +++ b/libk3b/tools/k3btitlelabel.cpp @@ -126,19 +126,19 @@ void K3bTitleLabel::setSubTitle( const TQString& subTitle ) } -void K3bTitleLabel::tqsetAlignment( int align ) +void K3bTitleLabel::setAlignment( int align ) { d->tqalignment = align; update(); } -TQSize K3bTitleLabel::tqsizeHint() const +TQSize K3bTitleLabel::sizeHint() const { return TQSize( d->titleLength + d->subTitleLength + 2*d->margin, d->titleBaseLine ); } -TQSize K3bTitleLabel::tqminimumSizeHint() const +TQSize K3bTitleLabel::minimumSizeHint() const { return TQSize( d->cachedMinimumWidth, d->titleBaseLine ); } diff --git a/libk3b/tools/k3btitlelabel.h b/libk3b/tools/k3btitlelabel.h index b850b12..beaa5e9 100644 --- a/libk3b/tools/k3btitlelabel.h +++ b/libk3b/tools/k3btitlelabel.h @@ -32,8 +32,8 @@ class LIBK3B_EXPORT K3bTitleLabel : public TQFrame K3bTitleLabel( TQWidget* parent = 0, const char* name = 0 ); ~K3bTitleLabel(); - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; public slots: /** @@ -50,7 +50,7 @@ class LIBK3B_EXPORT K3bTitleLabel : public TQFrame * Default tqalignment is left. */ // FIXME: honor right-to-left languages - void tqsetAlignment( int align ); + void setAlignment( int align ); protected: void resizeEvent( TQResizeEvent* ); diff --git a/libk3b/tools/k3btoolbox.cpp b/libk3b/tools/k3btoolbox.cpp index cf72a3b..e812f0a 100644 --- a/libk3b/tools/k3btoolbox.cpp +++ b/libk3b/tools/k3btoolbox.cpp @@ -44,7 +44,7 @@ class K3bToolBoxSeparator : public TQWidget public: K3bToolBoxSeparator( K3bToolBox* parent ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected: void paintEvent( TQPaintEvent * ); @@ -54,13 +54,13 @@ class K3bToolBoxSeparator : public TQWidget K3bToolBoxSeparator::K3bToolBoxSeparator( K3bToolBox* parent ) : TQWidget( parent ) { - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); } -TQSize K3bToolBoxSeparator::tqsizeHint() const +TQSize K3bToolBoxSeparator::sizeHint() const { - int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, + int extent = tqstyle().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); return TQSize( extent, 0 ); } @@ -72,7 +72,7 @@ void K3bToolBoxSeparator::paintEvent( TQPaintEvent* ) TQStyle::SFlags flags = TQStyle::Style_Default|TQStyle::Style_Horizontal; tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), - tqcolorGroup(), flags ); + colorGroup(), flags ); } @@ -81,7 +81,7 @@ K3bToolBoxButton::K3bToolBoxButton( KAction* action, TQWidget* parent ) : TQToolButton( parent ), m_popupMenu(0) { - tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, tqsizePolicy().verData()) ); + setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, sizePolicy().verData()) ); setAutoRaise( true ); setIconSet( action->iconSet() ); @@ -127,7 +127,7 @@ K3bToolBoxButton::K3bToolBoxButton( const TQString& text, const TQString& icon, : TQToolButton( parent ), m_popupMenu(0) { - tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, tqsizePolicy().verData()) ); + setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, sizePolicy().verData()) ); setAutoRaise( true ); setTextLabel( text ); @@ -171,7 +171,7 @@ void K3bToolBoxButton::resizeEvent( TQResizeEvent* e ) K3bToolBox::K3bToolBox( TQWidget* parent, const char* name ) : TQFrame( parent, name ) { - tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed) ); + setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed) ); m_mainLayout = new TQGridLayout( this ); m_mainLayout->setMargin( 1 ); @@ -243,7 +243,7 @@ void K3bToolBox::addStretch() void K3bToolBox::addLabel( const TQString& text ) { TQLabel* label = new TQLabel( text, this ); - label->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); + label->setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); addWidget( label ); } @@ -257,7 +257,7 @@ void K3bToolBox::addWidget( TQWidget* w ) m_mainLayout->addWidget( w, 0, m_mainLayout->numCols()-1 ); - if( w->tqsizePolicy().horData() == TQSizePolicy::Fixed || w->tqsizePolicy().horData() == TQSizePolicy::Maximum ) + if( w->sizePolicy().horData() == TQSizePolicy::Fixed || w->sizePolicy().horData() == TQSizePolicy::Maximum ) m_mainLayout->setColStretch( m_mainLayout->numCols(), 1 ); else { m_mainLayout->setColStretch( m_mainLayout->numCols()-1, 1 ); diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp index 8f2a20e..5b80907 100644 --- a/libk3b/tools/k3btoolbutton.cpp +++ b/libk3b/tools/k3btoolbutton.cpp @@ -69,7 +69,7 @@ void K3bToolButton::drawButton( TQPainter* p ) arrowFlags |= TQStyle::Style_Enabled; tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, p, - TQRect(width()-7, height()-7, 7, 7), tqcolorGroup(), + TQRect(width()-7, height()-7, 7, 7), colorGroup(), arrowFlags, TQStyleOption() ); } } diff --git a/libk3b/tools/kcutlabel.cpp b/libk3b/tools/kcutlabel.cpp index fd806ba..1ef08ad 100644 --- a/libk3b/tools/kcutlabel.cpp +++ b/libk3b/tools/kcutlabel.cpp @@ -27,7 +27,7 @@ KCutLabel::KCutLabel( const TQString &text , TQWidget *parent, const char *name : TQLabel ( parent, name ), m_minChars(1) { TQSizePolicy myLabelSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - tqsetSizePolicy(myLabelSizePolicy); + setSizePolicy(myLabelSizePolicy); m_fullText = text; cutTextToLabel(); } @@ -36,12 +36,12 @@ KCutLabel::KCutLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ), m_minChars(1) { TQSizePolicy myLabelSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - tqsetSizePolicy(myLabelSizePolicy); + setSizePolicy(myLabelSizePolicy); } -TQSize KCutLabel::tqminimumSizeHint() const +TQSize KCutLabel::minimumSizeHint() const { - TQSize sh = TQLabel::tqminimumSizeHint(); + TQSize sh = TQLabel::minimumSizeHint(); if( m_minChars == 0 ) sh.setWidth(-1); else if( m_minChars < (int)m_fullText.length() ) diff --git a/libk3b/tools/kcutlabel.h b/libk3b/tools/kcutlabel.h index 7b96fe2..86c226e 100644 --- a/libk3b/tools/kcutlabel.h +++ b/libk3b/tools/kcutlabel.h @@ -36,7 +36,7 @@ class LIBK3B_EXPORT KCutLabel : public TQLabel KCutLabel( TQWidget *parent = 0, const char *name = 0); KCutLabel( const TQString &text, TQWidget *parent = 0, const char *name = 0 ); - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; /** * \return the full text while text() returns the cut text |