summaryrefslogtreecommitdiffstats
path: root/kicker-applets/kolourpicker
diff options
context:
space:
mode:
Diffstat (limited to 'kicker-applets/kolourpicker')
-rw-r--r--kicker-applets/kolourpicker/kolourpicker.cpp10
-rw-r--r--kicker-applets/kolourpicker/simplebutton.cpp2
2 files changed, 6 insertions, 6 deletions
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index 9acfc26..b727446 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -208,7 +208,7 @@ void KolourPicker::mouseReleaseEvent(TQMouseEvent *e)
// set both clipboard and selection
void KolourPicker::setClipboard(const TQString& text)
{
- TQClipboard *clip = TQApplication::tqclipboard();
+ TQClipboard *clip = TQApplication::clipboard();
bool oldMode = clip->selectionModeEnabled();
clip->setSelectionMode(true);
clip->setText(text);
@@ -247,14 +247,14 @@ void KolourPicker::arrangeButtons()
h = height();
if (h > 40)
{
- // vertical tqlayout
+ // vertical layout
p = (h - 40)/3;
m_colourButton->setGeometry(2, p, 20, 20);
m_historyButton->setGeometry(2, 2*p+20, 20, 20);
}
else
{
- // horizontal tqlayout
+ // horizontal layout
p = (h - 20)/2;
m_colourButton->setGeometry(2, p, 20, 20);
m_historyButton->setGeometry(24, p, 20, 20);
@@ -265,14 +265,14 @@ void KolourPicker::arrangeButtons()
w = width();
if (w > 40)
{
- // horizontal tqlayout
+ // horizontal layout
p = (w - 40)/3;
m_colourButton->setGeometry(p, 2, 20, 20);
m_historyButton->setGeometry(2*p+20, 2, 20, 20);
}
else
{
- // vertical tqlayout
+ // vertical layout
p = (w - 20)/2;
m_colourButton->setGeometry(p, 2, 20, 20);
m_historyButton->setGeometry(p, 24, 20, 20);
diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp
index 4760982..0bc34b5 100644
--- a/kicker-applets/kolourpicker/simplebutton.cpp
+++ b/kicker-applets/kolourpicker/simplebutton.cpp
@@ -234,7 +234,7 @@ void SimpleArrowButton::drawButton( TQPainter *p )
int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
if (isDown() || isOn()) flags |= TQStyle::Style_Down;
- tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
+ style().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
}
void SimpleArrowButton::enterEvent( TQEvent *e )