summaryrefslogtreecommitdiffstats
path: root/lib/kofficeui/tktoolbarbutton.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:32:11 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:32:11 -0600
commit94844816550ad672ccfcdc25659c625546239998 (patch)
treee35fc60fd736c645d59f6408af032774ad8023d3 /lib/kofficeui/tktoolbarbutton.cpp
parent2a811c38c74c03648ecf857e566c44483cbad706 (diff)
downloadkoffice-94844816550ad672ccfcdc25659c625546239998.tar.gz
koffice-94844816550ad672ccfcdc25659c625546239998.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'lib/kofficeui/tktoolbarbutton.cpp')
-rw-r--r--lib/kofficeui/tktoolbarbutton.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp
index b0520a2c..5f829589 100644
--- a/lib/kofficeui/tktoolbarbutton.cpp
+++ b/lib/kofficeui/tktoolbarbutton.cpp
@@ -182,7 +182,7 @@ void TKToolBarButton::setEnabled( bool enabled )
void TKToolBarButton::setText( const TQString& text)
{
d->m_text = text;
- tqrepaint(false);
+ repaint(false);
}
void TKToolBarButton::setIcon( const TQString& icon )
@@ -281,7 +281,7 @@ void TKToolBarButton::setDelayedPopup (TQPopupMenu *p, bool toggle )
void TKToolBarButton::setRaised(bool f)
{
d->m_isRaised = f;
- tqrepaint(false);
+ repaint(false);
}
void TKToolBarButton::setAutoRaised(bool f)
@@ -308,7 +308,7 @@ void TKToolBarButton::enterEvent(TQEvent *)
} else {
TQToolButton::setPixmap(disabledPixmap);
}
- tqrepaint(false);
+ repaint(false);
}
}
@@ -332,7 +332,7 @@ bool TKToolBarButton::eventFilter(TQObject *o, TQEvent *ev)
case TQEvent::Hide:
on(false);
setDown(false);
- if ( !tqgeometry().contains(parentWidget()->mapFromGlobal(TQCursor::pos())) )
+ if ( !geometry().contains(parentWidget()->mapFromGlobal(TQCursor::pos())) )
leaveEvent(0L);
return false;
break;
@@ -353,14 +353,14 @@ void TKToolBarButton::drawButton( TQPainter* p )
#define DRAW_PIXMAP_AND_TEXT \
int x = 3;\
if (pixmap()) {\
- tqstyle().drawItem( p, TQRect( x, 0, pixmap()->width(), height() ), AlignCenter, tqcolorGroup(), isEnabled(), pixmap(), TQString() );\
+ tqstyle().drawItem( p, TQRect( x, 0, pixmap()->width(), height() ), AlignCenter, colorGroup(), isEnabled(), pixmap(), TQString() );\
if (d->m_iconMode==TK::IconAndText && !d->m_text.isEmpty()) {\
x += pixmap()->width() + 3;\
}\
}\
if ((d->m_iconMode==TK::IconAndText||d->m_iconMode==TK::TextOnly) && !d->m_text.isEmpty()) {\
TQFontMetrics fm(KGlobalSettings::toolBarFont());\
- tqstyle().drawItem( p, TQRect( x, 0, fm.width(d->m_text), height() ), AlignCenter, tqcolorGroup(), isEnabled(), 0, d->m_text );\
+ tqstyle().drawItem( p, TQRect( x, 0, fm.width(d->m_text), height() ), AlignCenter, colorGroup(), isEnabled(), 0, d->m_text );\
}
const char* arrow[] = {
@@ -384,20 +384,20 @@ void TKToolBarButton::drawButton( TQPainter* p )
if (d->m_isRaised) flags |= TQStyle::Style_Raised;
if (hasFocus()) flags |= TQStyle::Style_HasFocus;
- tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( 0, 0, width()-12, height() ), tqcolorGroup(), flags, TQStyle::SC_ToolButton );
- tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( width()-13, 0, 13, height() ), tqcolorGroup(), flags, TQStyle::SC_ToolButton );
- tqstyle().drawItem( p, TQRect( width()-13, 0, 13, height() ), AlignCenter, tqcolorGroup(), isEnabled(), &arrow_pix, TQString() );
+ tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( 0, 0, width()-12, height() ), colorGroup(), flags, TQStyle::SC_ToolButton );
+ tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( width()-13, 0, 13, height() ), colorGroup(), flags, TQStyle::SC_ToolButton );
+ tqstyle().drawItem( p, TQRect( width()-13, 0, 13, height() ), AlignCenter, colorGroup(), isEnabled(), &arrow_pix, TQString() );
if ( d->m_isRaised )
- qDrawShadeLine( p, width()-12, 0, width()-12, height(), tqcolorGroup(), true );
+ qDrawShadeLine( p, width()-12, 0, width()-12, height(), colorGroup(), true );
DRAW_PIXMAP_AND_TEXT
} else {
- tqstyle().tqdrawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? tqcolorGroup() : tqpalette().disabled(), f );
+ tqstyle().drawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? colorGroup() : palette().disabled(), f );
DRAW_PIXMAP_AND_TEXT
int z = f ? 1:0;
p->drawPixmap(width()-11+z,(height()-4)/2+z ,arrow_pix);
}
} else {
- tqstyle().tqdrawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? tqcolorGroup() : tqpalette().disabled(), f );
+ tqstyle().drawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? colorGroup() : palette().disabled(), f );
DRAW_PIXMAP_AND_TEXT
}
}
@@ -409,7 +409,7 @@ void TKToolBarButton::paletteChange(const TQPalette &)
TQToolButton::setPixmap( disabledPixmap );
else
TQToolButton::setPixmap( defaultPixmap );
- tqrepaint(false);
+ repaint(false);
}
void TKToolBarButton::makeDefaultPixmap()
@@ -430,14 +430,14 @@ void TKToolBarButton::makeDisabledPixmap()
disabledPixmap = effect.apply(activePixmap, KIcon::Toolbar, KIcon::DisabledState);
}
-TQSize TKToolBarButton::tqsizeHint() const
+TQSize TKToolBarButton::sizeHint() const
{
- return tqminimumSize();
+ return minimumSize();
}
-TQSize TKToolBarButton::tqminimumSizeHint() const
+TQSize TKToolBarButton::minimumSizeHint() const
{
- return tqminimumSize();
+ return minimumSize();
}
void TKToolBarButton::showMenu()
@@ -502,7 +502,7 @@ void TKToolBarButton::slotToggled()
void TKToolBarButton::on(bool flag)
{
d->m_isOn = flag;
- tqrepaint();
+ repaint();
}
void TKToolBarButton::toggle()
@@ -519,14 +519,14 @@ void TKToolBarButton::setToggle(bool flag)
disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled()));
modeChange();
- tqrepaint();
+ repaint();
}
void TKToolBarButton::setIconMode( TK::IconMode m )
{
d->m_iconMode = m;
modeChange();
- tqrepaint();
+ repaint();
}
#include <tktoolbarbutton.moc>