summaryrefslogtreecommitdiffstats
path: root/kdeui/ktoolbarbutton.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /kdeui/ktoolbarbutton.cpp
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz
tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeui/ktoolbarbutton.cpp')
-rw-r--r--kdeui/ktoolbarbutton.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/kdeui/ktoolbarbutton.cpp b/kdeui/ktoolbarbutton.cpp
index b6488dab9..765b2e433 100644
--- a/kdeui/ktoolbarbutton.cpp
+++ b/kdeui/ktoolbarbutton.cpp
@@ -263,7 +263,7 @@ void KToolBarButton::setTextLabel( const TQString& text, bool tipToo)
return;
TQString txt(text);
- if (txt.endsWith(TQString::tqfromLatin1("...")))
+ if (txt.endsWith(TQString::fromLatin1("...")))
txt.truncate(txt.length() - 3);
TQToolButton::setTextLabel(txt, tipToo);
@@ -376,7 +376,7 @@ void KToolBarButton::leaveEvent(TQEvent *)
{
d->m_isRaised = false;
d->m_isActive = false;
- tqrepaint(false);
+ repaint(false);
}
emit highlighted(d->m_id, false);
@@ -398,7 +398,7 @@ void KToolBarButton::enterEvent(TQEvent *)
d->m_isActive = false;
}
- tqrepaint(false);
+ repaint(false);
}
emit highlighted(d->m_id, true);
}
@@ -494,8 +494,8 @@ void KToolBarButton::drawButton( TQPainter *_painter )
if (hasFocus()) flags |= TQStyle::Style_HasFocus;
// Draw a styled toolbutton
- style().tqdrawComplexControl(TQStyle::CC_ToolButton, _painter, this, rect(),
- tqcolorGroup(), flags, TQStyle::SC_ToolButton, active, TQStyleOption());
+ style().drawComplexControl(TQStyle::CC_ToolButton, _painter, this, rect(),
+ colorGroup(), flags, TQStyle::SC_ToolButton, active, TQStyleOption());
int dx, dy;
TQFont tmp_font(KGlobalSettings::toolBarFont());
@@ -513,7 +513,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
{
dx = ( width() - pixmap.width() ) / 2;
dy = ( height() - pixmap.height() ) / 2;
- if ( isDown() && style().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -531,7 +531,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
{
dx = 4;
dy = ( height() - pixmap.height() ) / 2;
- if ( isDown() && style().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -547,7 +547,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
else
dx = 4;
dy = 0;
- if ( isDown() && style().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -562,7 +562,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
textFlags = AlignVCenter|AlignLeft;
dx = (width() - fm.width(textLabel())) / 2;
dy = (height() - fm.lineSpacing()) / 2;
- if ( isDown() && style().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -580,7 +580,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
{
dx = (width() - pixmap.width()) / 2;
dy = (height() - fm.lineSpacing() - pixmap.height()) / 2;
- if ( isDown() && style().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -594,7 +594,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
dx = (width() - fm.width(textLabel())) / 2;
dy = height() - fm.lineSpacing() - 4;
- if ( isDown() && style().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -612,7 +612,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
else if(d->m_isRaised)
_painter->setPen(KGlobalSettings::toolBarHighlightColor());
else
- _painter->setPen( tqcolorGroup().buttonText() );
+ _painter->setPen( colorGroup().buttonText() );
_painter->drawText(textRect, textFlags, textLabel());
}
@@ -624,7 +624,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
if (isEnabled()) arrowFlags |= TQStyle::Style_Enabled;
style().drawPrimitive(TQStyle::PE_ArrowDown, _painter,
- TQRect(width()-7, height()-7, 7, 7), tqcolorGroup(),
+ TQRect(width()-7, height()-7, 7, 7), colorGroup(),
arrowFlags, TQStyleOption() );
}
}
@@ -634,7 +634,7 @@ void KToolBarButton::paletteChange(const TQPalette &)
if(!d->m_isSeparator)
{
modeChange();
- tqrepaint(false); // no need to delete it first therefore only false
+ repaint(false); // no need to delete it first therefore only false
}
}
@@ -642,7 +642,7 @@ bool KToolBarButton::event(TQEvent *e)
{
if (e->type() == TQEvent::ParentFontChange || e->type() == TQEvent::ApplicationFontChange)
{
- //If we use toolbar text, apply the settings again, to retqlayout...
+ //If we use toolbar text, apply the settings again, to relayout...
if (d->m_iconText != KToolBar::IconOnly)
modeChange();
return true;
@@ -669,7 +669,7 @@ void KToolBarButton::slotClicked()
emit clicked( d->m_id );
// emit buttonClicked when the button was clicked while being in an extension popupmenu
- if ( d->m_parent && !d->m_parent->rect().tqcontains( tqgeometry().center() ) ) {
+ if ( d->m_parent && !d->m_parent->rect().contains( geometry().center() ) ) {
ButtonState state = KApplication::keyboardMouseState();
if ( ( state & MouseButtonMask ) == NoButton )
state = ButtonState( LeftButton | state );
@@ -698,7 +698,7 @@ void KToolBarButton::setNoStyle(bool no_style)
modeChange();
d->m_iconText = KToolBar::IconTextRight;
- tqrepaint(false);
+ repaint(false);
}
void KToolBarButton::setRadio (bool f)
@@ -716,13 +716,13 @@ void KToolBarButton::on(bool flag)
setDown(flag);
leaveEvent((TQEvent *) 0);
}
- tqrepaint();
+ repaint();
}
void KToolBarButton::toggle()
{
setOn(!isOn());
- tqrepaint();
+ repaint();
}
void KToolBarButton::setToggle(bool flag)
@@ -734,17 +734,17 @@ void KToolBarButton::setToggle(bool flag)
disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled()));
}
-TQSize KToolBarButton::tqsizeHint() const
+TQSize KToolBarButton::sizeHint() const
{
return d->size;
}
-TQSize KToolBarButton::tqminimumSizeHint() const
+TQSize KToolBarButton::minimumSizeHint() const
{
return d->size;
}
-TQSize KToolBarButton::tqminimumSize() const
+TQSize KToolBarButton::minimumSize() const
{
return d->size;
}