summaryrefslogtreecommitdiffstats
path: root/kdeui/kcolorbutton.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/kcolorbutton.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/kcolorbutton.cpp')
-rw-r--r--kdeui/kcolorbutton.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/kdeui/kcolorbutton.cpp b/kdeui/kcolorbutton.cpp
index e4d8f3340..3cccbe1df 100644
--- a/kdeui/kcolorbutton.cpp
+++ b/kdeui/kcolorbutton.cpp
@@ -85,7 +85,7 @@ void KColorButton::setColor( const TQColor &c )
{
if ( col != c ) {
col = c;
- tqrepaint( false );
+ repaint( false );
emit changed( col );
}
}
@@ -108,29 +108,29 @@ void KColorButton::drawButtonLabel( TQPainter *painter )
TQRect r = style().subRect( TQStyle::SR_PushButtonContents, this );
r.rect(&x, &y, &w, &h);
- int margin = style().tqpixelMetric( TQStyle::PM_ButtonMargin, this );
+ int margin = style().pixelMetric( TQStyle::PM_ButtonMargin, this );
x += margin;
y += margin;
w -= 2*margin;
h -= 2*margin;
if (isOn() || isDown()) {
- x += style().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
- y += style().tqpixelMetric( TQStyle::PM_ButtonShiftVertical, this );
+ x += style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
+ y += style().pixelMetric( TQStyle::PM_ButtonShiftVertical, this );
}
TQColor fillCol = isEnabled() ? col : backgroundColor();
- qDrawShadePanel( painter, x, y, w, h, tqcolorGroup(), true, 1, NULL);
+ qDrawShadePanel( painter, x, y, w, h, colorGroup(), true, 1, NULL);
if ( fillCol.isValid() )
painter->fillRect( x+1, y+1, w-2, h-2, fillCol );
if ( hasFocus() ) {
TQRect focusRect = style().subRect( TQStyle::SR_PushButtonFocusRect, this );
- style().drawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, tqcolorGroup() );
+ style().drawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
}
}
-TQSize KColorButton::tqsizeHint() const
+TQSize KColorButton::sizeHint() const
{
return style().sizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)).
expandedTo(TQApplication::globalStrut());
@@ -153,11 +153,11 @@ void KColorButton::keyPressEvent( TQKeyEvent *e )
{
KKey key( e );
- if ( KStdAccel::copy().tqcontains( key ) ) {
+ if ( KStdAccel::copy().contains( key ) ) {
TQMimeSource* mime = new KColorDrag( color() );
TQApplication::clipboard()->setData( mime, QClipboard::Clipboard );
}
- else if ( KStdAccel::paste().tqcontains( key ) ) {
+ else if ( KStdAccel::paste().contains( key ) ) {
TQColor color;
KColorDrag::decode( TQApplication::clipboard()->data( QClipboard::Clipboard ), color );
setColor( color );