summaryrefslogtreecommitdiffstats
path: root/kradio3/plugins/gui-quickbar
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:13:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:13:01 -0600
commit8d4453deaa5f97e1bbe76ea45fdcac6121da8c9d (patch)
tree98a944d593e1998726e1728dd298d40123f30059 /kradio3/plugins/gui-quickbar
parent6df9eac4b9928768bf0c3dc988bac1c0c1fbb685 (diff)
downloadtderadio-8d4453deaa5f97e1bbe76ea45fdcac6121da8c9d.tar.gz
tderadio-8d4453deaa5f97e1bbe76ea45fdcac6121da8c9d.zip
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'kradio3/plugins/gui-quickbar')
-rw-r--r--kradio3/plugins/gui-quickbar/buttonflowlayout.cpp16
-rw-r--r--kradio3/plugins/gui-quickbar/buttonflowlayout.h6
-rw-r--r--kradio3/plugins/gui-quickbar/quickbar.cpp8
3 files changed, 15 insertions, 15 deletions
diff --git a/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp b/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
index 4cd8dd0..528f9c5 100644
--- a/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
+++ b/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
@@ -104,9 +104,9 @@ bool ButtonFlowLayout::hasHeightForWidth() const
return TRUE;
}
-TQSize ButtonFlowLayout::tqsizeHint() const
+TQSize ButtonFlowLayout::sizeHint() const
{
- return tqminimumSize();
+ return minimumSize();
}
TQSizePolicy::ExpandData ButtonFlowLayout::expanding() const
@@ -154,8 +154,8 @@ int ButtonFlowLayout::doLayout( const TQRect &r, bool testonly )
it.toFirst();
while ( (o=it.current()) != 0 ) {
++it;
- buttonWidth = TQMAX( buttonWidth, o->tqsizeHint().width() );
- buttonHeight = TQMAX( buttonHeight, o->tqsizeHint().height() );
+ buttonWidth = TQMAX( buttonWidth, o->sizeHint().width() );
+ buttonHeight = TQMAX( buttonHeight, o->sizeHint().height() );
}
// calculate the optimal width
@@ -217,19 +217,19 @@ int ButtonFlowLayout::doLayout( const TQRect &r, bool testonly )
}
-TQSize ButtonFlowLayout::tqminimumSize() const
+TQSize ButtonFlowLayout::minimumSize() const
{
- return tqminimumSize(tqgeometry().size());
+ return minimumSize(tqgeometry().size());
}
-TQSize ButtonFlowLayout::tqminimumSize(const TQSize &r) const
+TQSize ButtonFlowLayout::minimumSize(const TQSize &r) const
{
TQSize s(0, 0);
for (TQPtrListIterator<TQLayoutItem> it(list); it.current(); ++it) {
TQLayoutItem *o = it.current();
- s = s.expandedTo( o->tqsizeHint()); //tqminimumSize() );
+ s = s.expandedTo( o->sizeHint()); //minimumSize() );
}
s.setHeight(heightForWidth(r.width()));
diff --git a/kradio3/plugins/gui-quickbar/buttonflowlayout.h b/kradio3/plugins/gui-quickbar/buttonflowlayout.h
index fe33efc..bca27f0 100644
--- a/kradio3/plugins/gui-quickbar/buttonflowlayout.h
+++ b/kradio3/plugins/gui-quickbar/buttonflowlayout.h
@@ -41,9 +41,9 @@ public:
void addItem( TQLayoutItem *item);
bool hasHeightForWidth() const;
int heightForWidth( int ) const;
- TQSize tqsizeHint() const;
- TQSize tqminimumSize() const;
- TQSize tqminimumSize(const TQSize &r) const; // tqminimumSize is dependent from width
+ TQSize sizeHint() const;
+ TQSize minimumSize() const;
+ TQSize minimumSize(const TQSize &r) const; // minimumSize is dependent from width
TQLayoutIterator iterator();
TQSizePolicy::ExpandData expanding() const;
diff --git a/kradio3/plugins/gui-quickbar/quickbar.cpp b/kradio3/plugins/gui-quickbar/quickbar.cpp
index ca1d4d8..a5b0340 100644
--- a/kradio3/plugins/gui-quickbar/quickbar.cpp
+++ b/kradio3/plugins/gui-quickbar/quickbar.cpp
@@ -303,7 +303,7 @@ void QuickBar::rebuildGUI()
else
b->setText(m_showShortName ? rs.shortName() : rs.name());
- b->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred));
+ b->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred));
TQToolTip::add(b, rs.longName());
if (isVisible()) b->show();
@@ -367,7 +367,7 @@ void QuickBar::setGeometry (int x, int y, int w, int h)
{
if (m_layout) {
TQSize marginSize(m_layout->margin()*2, m_layout->margin()*2);
- setMinimumSize(m_layout->tqminimumSize(TQSize(w, h) - marginSize) + marginSize);
+ setMinimumSize(m_layout->minimumSize(TQSize(w, h) - marginSize) + marginSize);
}
TQWidget::setGeometry (x, y, w, h);
}
@@ -381,10 +381,10 @@ void QuickBar::setGeometry (const TQRect &r)
void QuickBar::resizeEvent (TQResizeEvent *e)
{
- // tqminimumSize might change because of the flow tqlayout
+ // minimumSize might change because of the flow tqlayout
if (m_layout) {
TQSize marginSize(m_layout->margin()*2, m_layout->margin()*2);
- setMinimumSize(m_layout->tqminimumSize(e->size() - marginSize) + marginSize);
+ setMinimumSize(m_layout->minimumSize(e->size() - marginSize) + marginSize);
}
TQWidget::resizeEvent (e);