summaryrefslogtreecommitdiffstats
path: root/kicker/libkicker
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-21 14:19:21 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-03 03:26:34 +0200
commit0251b10c2e9a79e857e5729453d375d09fa8336e (patch)
tree11223ad7a12c1bdbc81b9bb698618b0386a1ce5e /kicker/libkicker
parenta5b44fbe44e58478ad74d819c5f4c36926d31872 (diff)
downloadtdebase-0251b10c2e9a79e857e5729453d375d09fa8336e.tar.gz
tdebase-0251b10c2e9a79e857e5729453d375d09fa8336e.zip
Rename obsolete tq methods to standard names
(cherry picked from commit b492b550f35c84160958775c14ea7037c5b12181)
Diffstat (limited to 'kicker/libkicker')
-rw-r--r--kicker/libkicker/kickerSettings.kcfg2
-rw-r--r--kicker/libkicker/panelbutton.cpp18
-rw-r--r--kicker/libkicker/simplebutton.cpp4
3 files changed, 12 insertions, 12 deletions
diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg
index 635d9c646..7e1e26651 100644
--- a/kicker/libkicker/kickerSettings.kcfg
+++ b/kicker/libkicker/kickerSettings.kcfg
@@ -81,7 +81,7 @@
<entry name="TintColor" type="Color" >
<label>The tint color used to colorize transparent panels</label>
- <default code="true">(TQApplication::tqpalette().active().mid())</default>
+ <default code="true">(TQApplication::palette().active().mid())</default>
<whatsthis>This option sets the color to use when tinting transparent panels</whatsthis>
</entry>
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index abd181820..b79e7e66c 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -539,7 +539,7 @@ void PanelButton::drawButton(TQPainter *p)
if (m_tileColor.isValid())
{
p->fillRect(rect(), m_tileColor);
- tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
+ style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
}
else if (paletteBackgroundPixmap())
{
@@ -559,7 +559,7 @@ void PanelButton::drawButton(TQPainter *p)
else if (isDown() || isOn())
{
// Draw shapes to indicate the down state.
- tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken);
+ style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken);
}
drawButtonLabel(p);
@@ -569,7 +569,7 @@ void PanelButton::drawButton(TQPainter *p)
int x1, y1, x2, y2;
TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2);
TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3);
- tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
+ style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
TQStyle::Style_Default, colorGroup().button());
}
}
@@ -581,7 +581,7 @@ void PanelButton::drawDeepButton(TQPainter *p)
if (m_tileColor.isValid())
{
p->fillRect(rect(), m_tileColor);
- tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
+ style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
}
else if (paletteBackgroundPixmap())
{
@@ -595,10 +595,10 @@ void PanelButton::drawDeepButton(TQPainter *p)
TQRect btn_rect = TQRect(rect().x(), rect().y()+1, rect().width(), rect().height()-2);
if (isDown() || isOn()) {
- tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Down);
+ style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Down);
}
else {
- tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised);
+ style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised);
}
drawButtonLabel(p,0,FALSE);
@@ -608,7 +608,7 @@ void PanelButton::drawDeepButton(TQPainter *p)
int x1, y1, x2, y2;
TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2);
TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3);
- tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
+ style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
TQStyle::Style_Default, colorGroup().button());
}
}
@@ -718,7 +718,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
if (m_drawArrow && (m_highlight || active) && drawArrow)
{
TQStyle::PrimitiveElement e = TQStyle::PE_ArrowUp;
- int arrowSize = tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator);
+ int arrowSize = style().pixelMetric(TQStyle::PM_MenuButtonIndicator);
TQRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize);
switch (m_arrowDirection)
@@ -762,7 +762,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
{
flags |= TQStyle::Style_Down;
}
- tqstyle().tqdrawPrimitive(e, p, r, colorGroup(), flags);
+ style().tqdrawPrimitive(e, p, r, colorGroup(), flags);
}
}
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index f809c2127..d4ca8faac 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -99,7 +99,7 @@ void SimpleButton::drawButton( TQPainter *p )
if (m_highlight || isDown() || isOn()) {
int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
if (isDown() || isOn()) flags |= TQStyle::Style_Down;
- tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, r, colorGroup(), flags);
+ style().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, r, colorGroup(), flags);
}
}
@@ -263,7 +263,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);
if (m_forceStandardCursor) {
SimpleButton::drawButton(p);