From 1dd83e5f38d1c16d3e6da18d0caca0ee093ab58f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:35:10 -0600 Subject: Rename old tq methods that no longer need a unique name --- kompare/komparepart/kompareconnectwidget.cpp | 22 +++++++++++----------- kompare/komparepart/kompareconnectwidget.h | 2 +- kompare/komparepart/komparelistview.cpp | 8 ++++---- kompare/komparepart/komparelistview.h | 2 +- kompare/komparepart/komparesplitter.cpp | 10 +++++----- 5 files changed, 22 insertions(+), 22 deletions(-) (limited to 'kompare/komparepart') diff --git a/kompare/komparepart/kompareconnectwidget.cpp b/kompare/komparepart/kompareconnectwidget.cpp index 4d7bd603..aa35fc7f 100644 --- a/kompare/komparepart/kompareconnectwidget.cpp +++ b/kompare/komparepart/kompareconnectwidget.cpp @@ -46,14 +46,14 @@ KompareConnectWidgetFrame::KompareConnectWidgetFrame( KompareListView* left, m_label ( "", this ), m_layout ( this ) { - tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Ignored) ); - m_wid.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) ); - m_label.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); + setSizePolicy ( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Ignored) ); + m_wid.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) ); + m_label.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); m_label.setMargin(3); TQFrame* bottomLine = new TQFrame(this); bottomLine->setFrameShape(TQFrame::HLine); bottomLine->setFrameShadow ( TQFrame::Plain ); - bottomLine->tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); + bottomLine->setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); bottomLine->setFixedHeight(1); m_layout.setSpacing(0); m_layout.setMargin(0); @@ -66,9 +66,9 @@ KompareConnectWidgetFrame::~KompareConnectWidgetFrame() { } -TQSize KompareConnectWidgetFrame::tqsizeHint() const +TQSize KompareConnectWidgetFrame::sizeHint() const { - return TQSize(50, tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) ); + return TQSize(50, tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ) ); } static int kMouseOffset; @@ -111,7 +111,7 @@ KompareConnectWidget::KompareConnectWidget( KompareListView* left, KompareListVi { // connect( m_settings, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotDelayedRepaint() ) ); setBackgroundMode( NoBackground ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); setFocusProxy( parent->parentWidget() ); } @@ -190,13 +190,13 @@ void KompareConnectWidget::paintEvent( TQPaintEvent* /* e */ ) if ( TQApplication::reverseLayout() ) { - leftRect = m_rightView->tqitemRect( i ); - rightRect = m_leftView->tqitemRect( i ); + leftRect = m_rightView->itemRect( i ); + rightRect = m_leftView->itemRect( i ); } else { - leftRect = m_leftView->tqitemRect( i ); - rightRect = m_rightView->tqitemRect( i ); + leftRect = m_leftView->itemRect( i ); + rightRect = m_rightView->itemRect( i ); } int tl = leftRect.top(); diff --git a/kompare/komparepart/kompareconnectwidget.h b/kompare/komparepart/kompareconnectwidget.h index cc22ed86..ec48ff61 100644 --- a/kompare/komparepart/kompareconnectwidget.h +++ b/kompare/komparepart/kompareconnectwidget.h @@ -76,7 +76,7 @@ public: ViewSettings* settings, KompareSplitter* parent, const char* name = 0 ); ~KompareConnectWidgetFrame(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; KompareConnectWidget* wid() { return &m_wid; } diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp index f8779fa9..cc114859 100644 --- a/kompare/komparepart/komparelistview.cpp +++ b/kompare/komparepart/komparelistview.cpp @@ -54,12 +54,12 @@ KompareListViewFrame::KompareListViewFrame( bool isSource, m_label ( isSource?"Source":"Dest", this ), m_layout ( this ) { - tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) ); - m_label.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); + setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) ); + m_label.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); TQFrame *bottomLine = new TQFrame(this); bottomLine->setFrameShape(TQFrame::HLine); bottomLine->setFrameShadow ( TQFrame::Plain ); - bottomLine->tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); + bottomLine->setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); bottomLine->setFixedHeight(1); m_label.setMargin(3); m_layout.setSpacing(0); @@ -182,7 +182,7 @@ int KompareListView::lastVisibleDifference() return -1; } -TQRect KompareListView::tqitemRect( int i ) +TQRect KompareListView::itemRect( int i ) { TQListViewItem* item = itemAtIndex( i ); int x = 0; diff --git a/kompare/komparepart/komparelistview.h b/kompare/komparepart/komparelistview.h index b5de7661..0cd41cbf 100644 --- a/kompare/komparepart/komparelistview.h +++ b/kompare/komparepart/komparelistview.h @@ -55,7 +55,7 @@ public: KompareListViewItem* itemAtIndex( int i ); int firstVisibleDifference(); int lastVisibleDifference(); - TQRect tqitemRect( int i ); + TQRect itemRect( int i ); int minScrollId(); int maxScrollId(); int contentsWidth(); diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp index 5e30652c..009156cd 100644 --- a/kompare/komparepart/komparesplitter.cpp +++ b/kompare/komparepart/komparesplitter.cpp @@ -44,7 +44,7 @@ KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * parent, // Set up the scrollFrame scrollFrame->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain ); - scrollFrame->setLineWidth(scrollFrame->tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth)); + scrollFrame->setLineWidth(scrollFrame->tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth)); TQGridLayout *pairtqlayout = new TQGridLayout(scrollFrame, 2, 2, 0); m_vScroll = new TQScrollBar( Qt::Vertical, scrollFrame ); pairtqlayout->addWidget( m_vScroll, 0, 1 ); @@ -57,12 +57,12 @@ KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * parent, // set up our looks setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); - setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) ); + setLineWidth( tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) ); setHandleWidth(50); setChildrenCollapsible( false ); setFrameStyle( TQFrame::NoFrame ); - tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Ignored, TQSizePolicy::Ignored )); + setSizePolicy( TQSizePolicy (TQSizePolicy::Ignored, TQSizePolicy::Ignored )); setOpaqueResize( true ); setFocusPolicy( TQ_WheelFocus ); @@ -121,7 +121,7 @@ TQSplitterLayoutStruct *KompareSplitter::addWidget( KompareListViewFrame *w, boo s->wid = newHandle; newHandle->setId( d->list.count() ); s->isHandle = TRUE; - s->sizer = pick( newHandle->tqsizeHint() ); + s->sizer = pick( newHandle->sizeHint() ); if ( prepend ) d->list.prepend( s ); else @@ -279,7 +279,7 @@ void KompareSplitter::doMove( bool backwards, int pos, int id, int delta, : pick( bottomRight(w) ) - pos + 1; if ( dd > 0 || (!isCollapsed(w) && !mayCollapse) ) { dd = TQMAX( pick(qSmartMinSize(w)), - TQMIN(dd, pick(w->tqmaximumSize())) ); + TQMIN(dd, pick(w->maximumSize())) ); } else { dd = 0; } -- cgit v1.2.1