diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2013-11-28 13:30:19 -0600 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-11-28 13:30:19 -0600 |
commit | 90f1f50f00651f7bc9f8acf50556968b4288400d (patch) | |
tree | 8d5df88cb28a00efd2c8b9f3c6b1ca7e6063ada9 /kicker/kicker/ui | |
parent | 1c37295608c6d783b2b710f423befbcfb0068bbd (diff) | |
download | tdebase-90f1f50f00651f7bc9f8acf50556968b4288400d.tar.gz tdebase-90f1f50f00651f7bc9f8acf50556968b4288400d.zip |
Fix remnant QMIN/QMAX to TQMIN/TQMAX.
Diffstat (limited to 'kicker/kicker/ui')
-rw-r--r-- | kicker/kicker/ui/addapplet.cpp | 2 | ||||
-rw-r--r-- | kicker/kicker/ui/addappletvisualfeedback.cpp | 2 | ||||
-rw-r--r-- | kicker/kicker/ui/k_new_mnu.cpp | 12 | ||||
-rw-r--r-- | kicker/kicker/ui/kickoff_bar.cpp | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp index e707b9e3f..0db6bc352 100644 --- a/kicker/kicker/ui/addapplet.cpp +++ b/kicker/kicker/ui/addapplet.cpp @@ -292,7 +292,7 @@ void AddAppletDialog::resizeAppletView() m_appletBox->layout()->activate(); w = v->visibleWidth(); h = m_appletBox->layout()->minimumSize().height(); - v->resizeContents(w, QMAX(h, v->visibleHeight())); + v->resizeContents(w, TQMAX(h, v->visibleHeight())); if (w == m_appletBox->width() && h == m_appletBox->height()) break; m_appletBox->resize(w, h); diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp index 587a0f2de..62ff12675 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.cpp +++ b/kicker/kicker/ui/addappletvisualfeedback.cpp @@ -132,7 +132,7 @@ void AddAppletVisualFeedback::displayInternal() } int margin = KDialog::marginHint(); - int height = QMAX(m_icon.height(), textRect.height()) + 2 * margin; + int height = TQMAX(m_icon.height(), textRect.height()) + 2 * margin; int textX = m_icon.isNull() ? margin : 2 + m_icon.width() + 2 * margin; int width = textX; diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index af4142007..a083872fc 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -175,7 +175,7 @@ static int used_size( TQLabel *label, int oldsize ) { TQSimpleRichText st( label->text(), TDEGlobalSettings::toolBarFont() ); st.setWidth( oldsize ); - return QMAX( st.widthUsed(), oldsize ); + return TQMAX( st.widthUsed(), oldsize ); } KMenu::KMenu() @@ -3206,14 +3206,14 @@ void KMenu::mouseMoveEvent ( TQMouseEvent * e ) if ( hasMouseTracking() && m_isresizing ) { m_stacker->setMinimumSize( TQSize(0, 0) ); m_stacker->setMaximumSize( TQSize(32000, 32000) ); - int newWidth = QMAX( e->x() - x(), minimumSizeHint().width() ); + int newWidth = TQMAX( e->x() - x(), minimumSizeHint().width() ); if ( m_orientation == BottomUp ) { - int newHeight = QMAX( height() - e->y(), minimumSizeHint().height() + 10 ); + int newHeight = TQMAX( height() - e->y(), minimumSizeHint().height() + 10 ); int newY = y() + height() - newHeight; setGeometry( x(), newY, newWidth, newHeight); } else { - setGeometry( x(), y(), newWidth, QMAX( e->y(), minimumSizeHint().height() + 10 )); + setGeometry( x(), y(), newWidth, TQMAX( e->y(), minimumSizeHint().height() + 10 )); } } } @@ -3392,9 +3392,9 @@ TQSize KMenu::minimumSizeHint() const { TQSize minsize; minsize.setWidth( minsize.width() + m_tabBar->minimumSizeHint().width() ); - minsize.setWidth( QMAX( minsize.width(), + minsize.setWidth( TQMAX( minsize.width(), m_search->minimumSize().width() ) ); - minsize.setWidth( QMAX( minsize.width(), + minsize.setWidth( TQMAX( minsize.width(), m_search->minimumSize().width() ) ); minsize.setHeight( minsize.height() + diff --git a/kicker/kicker/ui/kickoff_bar.cpp b/kicker/kicker/ui/kickoff_bar.cpp index 994300c0d..e6e66b441 100644 --- a/kicker/kicker/ui/kickoff_bar.cpp +++ b/kicker/kicker/ui/kickoff_bar.cpp @@ -171,10 +171,10 @@ TQSize KickoffTabBar::minimumSizeHint() const } // Final width for this tab - int w = QMAX(iw, fw) + hframe; + int w = TQMAX(iw, fw) + hframe; - mw = QMAX(mw, w); - mh = QMAX(mh, h); + mw = TQMAX(mw, w); + mh = TQMAX(mh, h); } s.setWidth(mw * count()); @@ -196,7 +196,7 @@ void KickoffTabBar::layoutTabs() for (int t = 0; t < count(); ++t) { TQTab* tab = tabAt(TQApplication::reverseLayout() ? count() - t - 1 : t); - int w = QMAX(st.width() / count(), parentWidget()->width() / count()); + int w = TQMAX(st.width() / count(), parentWidget()->width() / count()); TQRect r = tab->rect(); tab->setRect(TQRect(TQPoint(x, 0), style().tqsizeFromContents(TQStyle::CT_TabBarTab, this, |