From fc6629f90a46a3f304bdba2ecef645c01ed02640 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:10:03 -0600 Subject: [PATCH] Rename old tq methods that no longer need a unique name --- src/flowlayout.cpp | 38 ++++++++++++++++---------------- src/flowlayout.h | 4 ++-- src/kima.cpp | 2 +- src/prefs.cpp | 2 +- src/sources/labelsource.cpp | 4 ++-- src/sources/labelsourcePrefs.cpp | 2 +- src/sources/labelsourcePrefs.ui | 4 ++-- src/sources/sourceprefs.cpp | 2 +- src/sources/sourceprefs.ui | 4 ++-- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/flowlayout.cpp b/src/flowlayout.cpp index 7f10faf..813ae5c 100644 --- a/src/flowlayout.cpp +++ b/src/flowlayout.cpp @@ -181,25 +181,25 @@ bool FlowLayout::hasWidthForHeight() const{ return mOrientation == Qt::Horizontal; } -TQSize FlowLayout::tqsizeHint() const{ - //return tqminimumSize(); +TQSize FlowLayout::sizeHint() const{ + //return minimumSize(); TQSize size(0,0); TQPtrListIterator it(mLayoutItems); TQLayoutItem *o; while((o=it.current()) != 0){ ++it; - size = size.expandedTo( o->tqsizeHint() ); + size = size.expandedTo( o->sizeHint() ); } return size; } -TQSize FlowLayout::tqminimumSize() const{ +TQSize FlowLayout::minimumSize() const{ TQSize size(0,0); TQPtrListIterator it(mLayoutItems); TQLayoutItem *o; while((o=it.current()) != 0){ ++it; - size = size.expandedTo(o->tqminimumSize()); + size = size.expandedTo(o->minimumSize()); } return size; } @@ -250,26 +250,26 @@ int FlowLayout::doLayoutHorizontal( const TQRect& rect, bool testOnly ){ TQPtrList column; // stores the items of one column while((layoutItem = it.current()) != 0){ ++it; - //int nextY = y + layoutItem->tqsizeHint().height() + spacing(); // next y - int nextY = y + layoutItem->tqsizeHint().height(); // next y + //int nextY = y + layoutItem->sizeHint().height() + spacing(); // next y + int nextY = y + layoutItem->sizeHint().height(); // next y //if( nextY - spacing() > rect.bottom() && width > 0 ) { if( nextY > rect.bottom() && width > 0 ) { // next column y = rect.y(); // reset y x = x + width + spacing(); // new x - //nextY = y + layoutItem->tqsizeHint().height() + spacing(); // next y with changed y - nextY = y + layoutItem->tqsizeHint().height(); // next y with changed y + //nextY = y + layoutItem->sizeHint().height() + spacing(); // next y with changed y + nextY = y + layoutItem->sizeHint().height(); // next y with changed y width = 0; // reset width for the next column } if(!testOnly){ - layoutItem->setGeometry( TQRect( TQPoint( x, y ), layoutItem->tqsizeHint() ) ); + layoutItem->setGeometry( TQRect( TQPoint( x, y ), layoutItem->sizeHint() ) ); column.append(layoutItem); - height += layoutItem->tqsizeHint().height(); // add the height of the current item to the column height - if( it.current() == 0 || nextY + it.current()->tqsizeHint().height() > rect.bottom() ){ // test it it's the last item (of this column) + height += layoutItem->sizeHint().height(); // add the height of the current item to the column height + if( it.current() == 0 || nextY + it.current()->sizeHint().height() > rect.bottom() ){ // test it it's the last item (of this column) // calculate real needed width int rWidth = 0; for(TQLayoutItem* item = column.first(); item; item = column.next()){ - rWidth = TQMAX( rWidth, item->widget()->tqsizeHint().width() ); + rWidth = TQMAX( rWidth, item->widget()->sizeHint().width() ); } // retqlayout the items of the former column int space = (rect.height() - height) / (column.count() + 1); @@ -283,7 +283,7 @@ int FlowLayout::doLayoutHorizontal( const TQRect& rect, bool testOnly ){ } } y = nextY; - width = TQMAX( width, layoutItem->tqsizeHint().width() ); + width = TQMAX( width, layoutItem->sizeHint().width() ); } return x + width - rect.x(); // width } @@ -296,18 +296,18 @@ int FlowLayout::doLayoutVertical( const TQRect& rect, bool testOnly ){ TQLayoutItem* layoutItem; while((layoutItem = it.current() ) != 0){ ++it; - //int nextX = x + layoutItem->tqsizeHint().width() + spacing(); - int nextX = x + layoutItem->tqsizeHint().width(); + //int nextX = x + layoutItem->sizeHint().width() + spacing(); + int nextX = x + layoutItem->sizeHint().width(); if(nextX - spacing() > rect.right() && height > 0) { // next line x = rect.x(); // reset x //y = y + height + spacing(); // new y y = y + height; // new y - //nextX = x + layoutItem->tqsizeHint().width() + spacing(); // next x - nextX = x + layoutItem->tqsizeHint().width(); // next x + //nextX = x + layoutItem->sizeHint().width() + spacing(); // next x + nextX = x + layoutItem->sizeHint().width(); // next x height = 0; // reset height for the next line } - const int itemHeight = layoutItem->tqsizeHint().height(); + const int itemHeight = layoutItem->sizeHint().height(); if(!testOnly) layoutItem->setGeometry(TQRect(x, y, rect.right(), itemHeight)); x = nextX; diff --git a/src/flowlayout.h b/src/flowlayout.h index 624d38b..d0871e9 100644 --- a/src/flowlayout.h +++ b/src/flowlayout.h @@ -62,8 +62,8 @@ public: int heightForWidth(int w) const; bool hasWidthForHeight() const; int widthForHeight(int h) const; - TQSize tqsizeHint() const; - TQSize tqminimumSize() const; + TQSize sizeHint() const; + TQSize minimumSize() const; TQLayoutIterator iterator(); TQSizePolicy::ExpandData expanding() const; Qt::Orientation getOrientation() const; diff --git a/src/kima.cpp b/src/kima.cpp index eb30f5d..b8d3228 100644 --- a/src/kima.cpp +++ b/src/kima.cpp @@ -319,7 +319,7 @@ int Kima::heightForWidth(int inWidth) const{ //kdDebug() << "heightForWidth: " << width << endl; mLayout->setOrientation(Qt::Vertical); return mLayout->heightForWidth(inWidth); - //return tqsizeHint().height(); + //return sizeHint().height(); } void Kima::mousePressEvent(TQMouseEvent* inEvent ){ diff --git a/src/prefs.cpp b/src/prefs.cpp index 5e5ba4a..3d605c3 100644 --- a/src/prefs.cpp +++ b/src/prefs.cpp @@ -46,7 +46,7 @@ Prefs::Prefs( TQWidget* parent, const char* name, WFlags fl ) widgetStack->addWidget( WStackPage, 0 ); PrefsLayout->addWidget( splitter3 ); languageChange(); - resize( TQSize(340, 73).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(340, 73).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/src/sources/labelsource.cpp b/src/sources/labelsource.cpp index d4d2182..4262c82 100644 --- a/src/sources/labelsource.cpp +++ b/src/sources/labelsource.cpp @@ -95,7 +95,7 @@ void LabelSource::applyPrefs(){ }else if(alignID == 2){ align = TQt::AlignRight; } - mLabel->tqsetAlignment(align); + mLabel->setAlignment(align); updateLabel(mValue); } @@ -113,7 +113,7 @@ void LabelSource::loadPrefs(KConfig* inKConfig){ color.setRgb(0,0,0); mLabel->setPaletteForegroundColor(color); mLabel->setFont(inKConfig->readFontEntry(mID + "_font")); - mLabel->tqsetAlignment(inKConfig->readNumEntry(mID + "_align")); + mLabel->setAlignment(inKConfig->readNumEntry(mID + "_align")); } void LabelSource::updateLabel(const TQString& inValue){ diff --git a/src/sources/labelsourcePrefs.cpp b/src/sources/labelsourcePrefs.cpp index db9b675..3f32e77 100644 --- a/src/sources/labelsourcePrefs.cpp +++ b/src/sources/labelsourcePrefs.cpp @@ -76,7 +76,7 @@ LabelSourcePrefs::LabelSourcePrefs( TQWidget* parent, const char* name, WFlags f defaultSourcePrefsFrameLayout->addLayout( tqlayout18 ); LabelSourcePrefsLayout->addWidget( defaultSourcePrefsFrame ); languageChange(); - resize( TQSize(299, 135).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(299, 135).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/src/sources/labelsourcePrefs.ui b/src/sources/labelsourcePrefs.ui index a7f49db..4fe2cc1 100644 --- a/src/sources/labelsourcePrefs.ui +++ b/src/sources/labelsourcePrefs.ui @@ -87,7 +87,7 @@ Taskbar visual settings Expanding - + 350 20 @@ -165,7 +165,7 @@ Taskbar visual settings Expanding - + 350 20 diff --git a/src/sources/sourceprefs.cpp b/src/sources/sourceprefs.cpp index 160cfd0..1e0f3c7 100644 --- a/src/sources/sourceprefs.cpp +++ b/src/sources/sourceprefs.cpp @@ -59,7 +59,7 @@ SourcePrefs::SourcePrefs( TQWidget* parent, const char* name, WFlags fl ) tooltipCheckBox = new TQCheckBox( this, "tooltipCheckBox" ); SourcePrefsLayout->addWidget( tooltipCheckBox ); languageChange(); - resize( TQSize(203, 127).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(203, 127).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/src/sources/sourceprefs.ui b/src/sources/sourceprefs.ui index e063d39..46c3b8e 100644 --- a/src/sources/sourceprefs.ui +++ b/src/sources/sourceprefs.ui @@ -61,7 +61,7 @@ Expanding - + 20 20 @@ -96,7 +96,7 @@ Fixed - + 20 20