summaryrefslogtreecommitdiffstats
path: root/src/newui/buttonbar.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-16 10:00:25 -0600
committerTimothy Pearson <[email protected]>2011-12-16 10:00:25 -0600
commit1623fe64102c18ab098b79656b80f28cef840756 (patch)
tree78f35fef11ea3dbbca1ba4c99937736a1a0894cf /src/newui/buttonbar.cpp
parentb6ba5d642f3fc7d320e3d6f4650eb259a3a52b04 (diff)
downloadtdevelop-1623fe64102c18ab098b79656b80f28cef840756.tar.gz
tdevelop-1623fe64102c18ab098b79656b80f28cef840756.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.
Diffstat (limited to 'src/newui/buttonbar.cpp')
-rw-r--r--src/newui/buttonbar.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/newui/buttonbar.cpp b/src/newui/buttonbar.cpp
index 2f193ad8..ddd4249b 100644
--- a/src/newui/buttonbar.cpp
+++ b/src/newui/buttonbar.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "buttonbar.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <kdebug.h>
#include <kconfig.h>
@@ -37,9 +37,9 @@ ButtonLayout::ButtonLayout(ButtonBar *parent, Direction d, int margin, int spaci
{
}
-TQSize ButtonLayout::minimumSize() const
+TQSize ButtonLayout::tqminimumSize() const
{
- TQSize size = TQBoxLayout::minimumSize();
+ TQSize size = TQBoxLayout::tqminimumSize();
if (!m_buttonBar->autoResize())
return size;
@@ -54,7 +54,7 @@ TQSize ButtonLayout::minimumSize() const
case Ideal::Bottom:
return TQSize(0,size.height());
}
- return TQBoxLayout::minimumSize();
+ return TQBoxLayout::tqminimumSize();
}
@@ -128,14 +128,14 @@ void ButtonBar::fixDimensions()
{
case Ideal::Left:
case Ideal::Right:
- setFixedWidth(sizeHint().width());
- setMinimumHeight(sizeHint().height());
+ setFixedWidth(tqsizeHint().width());
+ setMinimumHeight(tqsizeHint().height());
setMaximumHeight(32767);
break;
case Ideal::Top:
case Ideal::Bottom:
- setFixedHeight(sizeHint().height());
- setMinimumWidth(sizeHint().width());
+ setFixedHeight(tqsizeHint().height());
+ setMinimumWidth(tqsizeHint().width());
setMaximumWidth(32767);
break;
}
@@ -156,13 +156,13 @@ void ButtonBar::resizeEvent(TQResizeEvent *ev)
{
case Ideal::Left:
case Ideal::Right:
- preferredDimension = l->TQBoxLayout::minimumSize().height();
+ preferredDimension = l->TQBoxLayout::tqminimumSize().height();
actualDimension = size().height();
oldDimension = ev->oldSize().height();
break;
case Ideal::Top:
case Ideal::Bottom:
- preferredDimension = l->TQBoxLayout::minimumSize().width();
+ preferredDimension = l->TQBoxLayout::tqminimumSize().width();
actualDimension = size().width();
oldDimension = ev->oldSize().width();
break;
@@ -285,7 +285,7 @@ int ButtonBar::originalDimension()
int size = 0;
for (ButtonList::const_iterator it = m_buttons.constBegin(); it != m_buttons.constEnd(); ++it)
{
- size += (*it)->sizeHint((*it)->realText()).width();
+ size += (*it)->tqsizeHint((*it)->realText()).width();
}
return size;
}