summaryrefslogtreecommitdiffstats
path: root/tdeui/ktabctl.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:13 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:13 -0600
commit56160bf4dfe503631ef6373367b281f081bab2b4 (patch)
tree7fcea2ffd9c3420af999c3dcad0ed032eef93956 /tdeui/ktabctl.cpp
parent13281e2856a2ef43bbab78c5528470309c23aa77 (diff)
downloadtdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.tar.gz
tdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.
Diffstat (limited to 'tdeui/ktabctl.cpp')
-rw-r--r--tdeui/ktabctl.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/tdeui/ktabctl.cpp b/tdeui/ktabctl.cpp
index 0ff9f64e4..204a0979e 100644
--- a/tdeui/ktabctl.cpp
+++ b/tdeui/ktabctl.cpp
@@ -56,8 +56,8 @@ void KTabCtl::resizeEvent(TQResizeEvent *)
for (i=0; i<(int)pages.size(); i++) {
pages[i]->setGeometry(r);
}
- if( ( tabs->shape() == TQTabBar::RoundedBelow ) ||
- ( tabs->shape() == TQTabBar::TriangularBelow ) ) {
+ if( ( tabs->tqshape() == TQTabBar::RoundedBelow ) ||
+ ( tabs->tqshape() == TQTabBar::TriangularBelow ) ) {
tabs->move( 0, height()-tabs->height()-4 );
}
}
@@ -104,7 +104,7 @@ bool KTabCtl::isTabEnabled(const TQString& name)
unsigned int i;
for(i = 0; i < pages.size(); i++)
- if (TQString::fromLatin1(pages[i]->name()) == name)
+ if (TQString::tqfromLatin1(pages[i]->name()) == name)
return tabs->isTabEnabled(i); /* return the enabled status */
return false; /* tab does not exist */
}
@@ -117,7 +117,7 @@ void KTabCtl::setTabEnabled(const TQString& name, bool state)
return;
for (i = 0; i < pages.size(); i++)
- if (TQString::fromLatin1(pages[i]->name()) == name)
+ if (TQString::tqfromLatin1(pages[i]->name()) == name)
tabs->setTabEnabled(i, state);
}
@@ -138,14 +138,14 @@ void KTabCtl::setSizes()
* check the actual minimum and maximum sizes
*/
- if (pages[i]->maximumSize().height() < max.height())
- max.setHeight(pages[i]->maximumSize().height());
- if (pages[i]->maximumSize().width() < max.width())
- max.setWidth( pages[i]->maximumSize().width());
- if ( pages[i]->minimumSize().height() > min.height())
- min.setHeight( pages[i]->minimumSize().height());
- if ( pages[i]->minimumSize().width() > min.width())
- min.setWidth( pages[i]->minimumSize().width());
+ if (pages[i]->tqmaximumSize().height() < max.height())
+ max.setHeight(pages[i]->tqmaximumSize().height());
+ if (pages[i]->tqmaximumSize().width() < max.width())
+ max.setWidth( pages[i]->tqmaximumSize().width());
+ if ( pages[i]->tqminimumSize().height() > min.height())
+ min.setHeight( pages[i]->tqminimumSize().height());
+ if ( pages[i]->tqminimumSize().width() > min.width())
+ min.setWidth( pages[i]->tqminimumSize().width());
}
// BL: min and max are sizes of children, not tabcontrol
@@ -184,9 +184,9 @@ void KTabCtl::setBorder( bool state )
blBorder = state;
}
-void KTabCtl::setShape( TQTabBar::Shape shape )
+void KTabCtl::setShape( TQTabBar::Shape tqshape )
{
- tabs->setShape( shape );
+ tabs->setShape( tqshape );
}
TQSize
@@ -251,16 +251,16 @@ void KTabCtl::paintEvent(TQPaintEvent *)
int x1 = getChildRect().right() + 2;
int x0 = getChildRect().left() - 1;
- p.setPen(colorGroup().light());
+ p.setPen(tqcolorGroup().light());
p.drawLine(x0, y0 - 1, x1 - 1, y0 - 1); /* 1st top line */
- p.setPen(colorGroup().midlight());
+ p.setPen(tqcolorGroup().midlight());
p.drawLine(x0, y0, x1 - 1, y0); /* 2nd top line */
- p.setPen(colorGroup().light());
+ p.setPen(tqcolorGroup().light());
p.drawLine(x0, y0 + 1, x0, y1); /* left line */
p.setPen(black);
p.drawLine(x1, y1, x0, y1); /* bottom line */
p.drawLine(x1, y1 - 1, x1, y0);
- p.setPen(colorGroup().dark());
+ p.setPen(tqcolorGroup().dark());
p.drawLine(x0 + 1, y1 - 1, x1 - 1, y1 - 1); /* bottom */
p.drawLine(x1 - 1, y1 - 2, x1 - 1, y0 + 1);
p.end();
@@ -273,8 +273,8 @@ void KTabCtl::paintEvent(TQPaintEvent *)
TQRect KTabCtl::getChildRect() const
{
- if( ( tabs->shape() == TQTabBar::RoundedBelow ) ||
- ( tabs->shape() == TQTabBar::TriangularBelow ) ) {
+ if( ( tabs->tqshape() == TQTabBar::RoundedBelow ) ||
+ ( tabs->tqshape() == TQTabBar::TriangularBelow ) ) {
return TQRect(2, 1, width() - 4,
height() - tabs->height() - 4);
} else {