summaryrefslogtreecommitdiffstats
path: root/kdeui/kdualcolorbutton.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/kdualcolorbutton.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/kdualcolorbutton.cpp')
-rw-r--r--kdeui/kdualcolorbutton.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/kdeui/kdualcolorbutton.cpp b/kdeui/kdualcolorbutton.cpp
index 2ecbce5fd..2b4c2ecfd 100644
--- a/kdeui/kdualcolorbutton.cpp
+++ b/kdeui/kdualcolorbutton.cpp
@@ -51,8 +51,8 @@ KDualColorButton::KDualColorButton(TQWidget *parent, const char *name, TQWidget*
curColor = Foreground;
dragFlag = false;
miniCtlFlag = false;
- if(tqsizeHint().isValid())
- setMinimumSize(tqsizeHint());
+ if(sizeHint().isValid())
+ setMinimumSize(sizeHint());
setAcceptDrops(true);
}
@@ -72,8 +72,8 @@ KDualColorButton::KDualColorButton(const TQColor &fgColor, const TQColor &bgColo
curColor = Foreground;
dragFlag = false;
miniCtlFlag = false;
- if(tqsizeHint().isValid())
- setMinimumSize(tqsizeHint());
+ if(sizeHint().isValid())
+ setMinimumSize(sizeHint());
setAcceptDrops(true);
}
@@ -104,7 +104,7 @@ TQColor KDualColorButton::currentColor() const
return (curColor == Background ? bg.color() : fg.color());
}
-TQSize KDualColorButton::tqsizeHint() const
+TQSize KDualColorButton::sizeHint() const
{
return TQSize(34, 34);
}
@@ -112,7 +112,7 @@ TQSize KDualColorButton::tqsizeHint() const
void KDualColorButton::setForeground(const TQColor &c)
{
fg = TQBrush(c, SolidPattern);
- tqrepaint(false);
+ repaint(false);
emit fgChanged(fg.color());
}
@@ -120,7 +120,7 @@ void KDualColorButton::setForeground(const TQColor &c)
void KDualColorButton::setBackground(const TQColor &c)
{
bg = TQBrush(c, SolidPattern);
- tqrepaint(false);
+ repaint(false);
emit bgChanged(bg.color());
}
@@ -131,13 +131,13 @@ void KDualColorButton::setCurrentColor(const TQColor &c)
bg = TQBrush(c, SolidPattern);
else
fg = TQBrush(c, SolidPattern);
- tqrepaint(false);
+ repaint(false);
}
void KDualColorButton::setCurrent(DualColor s)
{
curColor = s;
- tqrepaint(false);
+ repaint(false);
}
void KDualColorButton::metrics(TQRect &fgRect, TQRect &bgRect)
@@ -152,13 +152,13 @@ void KDualColorButton::paintEvent(TQPaintEvent *)
TQPainter p(this);
metrics(fgRect, bgRect);
- TQBrush defBrush = tqcolorGroup().brush(TQColorGroup::Button);
+ TQBrush defBrush = colorGroup().brush(TQColorGroup::Button);
- qDrawShadeRect(&p, bgRect, tqcolorGroup(), curColor == Background, 2, 0,
+ qDrawShadeRect(&p, bgRect, colorGroup(), curColor == Background, 2, 0,
isEnabled() ? &bg : &defBrush);
- qDrawShadeRect(&p, fgRect, tqcolorGroup(), curColor == Foreground, 2, 0,
+ qDrawShadeRect(&p, fgRect, colorGroup(), curColor == Foreground, 2, 0,
isEnabled() ? &fg : &defBrush);
- p.setPen(tqcolorGroup().shadow());
+ p.setPen(colorGroup().shadow());
p.drawPixmap(fgRect.right()+2, 0, *arrowBitmap);
p.drawPixmap(0, fgRect.bottom()+2, *resetPixmap);
@@ -181,7 +181,7 @@ void KDualColorButton::dropEvent(TQDropEvent *ev)
bg.setColor(c);
emit(bgChanged(c));
}
- tqrepaint(false);
+ repaint(false);
}
}
@@ -192,11 +192,11 @@ void KDualColorButton::mousePressEvent(TQMouseEvent *ev)
mPos = ev->pos();
tmpColor = curColor;
dragFlag = false;
- if(fgRect.tqcontains(mPos)){
+ if(fgRect.contains(mPos)){
curColor = Foreground;
miniCtlFlag = false;
}
- else if(bgRect.tqcontains(mPos)){
+ else if(bgRect.contains(mPos)){
curColor = Background;
miniCtlFlag = false;
}
@@ -217,7 +217,7 @@ void KDualColorButton::mousePressEvent(TQMouseEvent *ev)
emit bgChanged(bg.color());
miniCtlFlag = true;
}
- tqrepaint(false);
+ repaint(false);
}
@@ -244,7 +244,7 @@ void KDualColorButton::mouseReleaseEvent(TQMouseEvent *ev)
metrics(fgRect, bgRect);
if(dragFlag)
curColor = tmpColor;
- else if(fgRect.tqcontains(ev->pos()) && curColor == Foreground){
+ else if(fgRect.contains(ev->pos()) && curColor == Foreground){
if(tmpColor == Background){
curColor = Foreground;
emit currentChanged(Foreground);
@@ -257,7 +257,7 @@ void KDualColorButton::mouseReleaseEvent(TQMouseEvent *ev)
}
}
}
- else if(bgRect.tqcontains(ev->pos()) && curColor == Background){
+ else if(bgRect.contains(ev->pos()) && curColor == Background){
if(tmpColor == Foreground){
curColor = Background;
emit currentChanged(Background);
@@ -270,7 +270,7 @@ void KDualColorButton::mouseReleaseEvent(TQMouseEvent *ev)
}
}
}
- tqrepaint(false);
+ repaint(false);
dragFlag = false;
}
else