Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.

1 files changed, 15 insertions, 15 deletions

diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index 1502e4943..4d60068a8 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqpainter.h>
 #include <tqpopupmenu.h>
 #include <tqstyle.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 #include <tqtooltip.h>
 #include <tqpixmap.h>
 
@@ -438,7 +438,7 @@ void PanelButton::enterEvent(TQEvent* e)
     if (!m_highlight && m_disableHighlighting == FALSE)
     {
         m_highlight = true;
-        repaint(false);
+        tqrepaint(false);
     }
 
     TQButton::enterEvent(e);
@@ -449,7 +449,7 @@ void PanelButton::leaveEvent(TQEvent* e)
     if (m_highlight)
     {
         m_highlight = false;
-        repaint(false);
+        tqrepaint(false);
     }
 
     TQButton::leaveEvent(e);
@@ -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());
+        tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup());
     }
     else if (paletteBackgroundPixmap())
     {
@@ -558,8 +558,8 @@ 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);
+        // Draw tqshapes to indicate the down state.
+        tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup(), TQStyle::Style_Sunken);
     }
 
     drawButtonLabel(p);
@@ -569,8 +569,8 @@ 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(),
-        TQStyle::Style_Default, colorGroup().button());
+        tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, tqcolorGroup(),
+        TQStyle::Style_Default, tqcolorGroup().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());
+        tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup());
     }
     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);
+        tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, tqcolorGroup(), TQStyle::Style_Down);
     }
     else {
-        tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised);
+        tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, tqcolorGroup(), TQStyle::Style_Raised);
     }
 
     drawButtonLabel(p,0,FALSE);
@@ -608,8 +608,8 @@ 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(),
-        TQStyle::Style_Default, colorGroup().button());
+        tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, tqcolorGroup(),
+        TQStyle::Style_Default, tqcolorGroup().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 = tqstyle().tqpixelMetric(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);
+        tqstyle().tqdrawPrimitive(e, p, r, tqcolorGroup(), flags);
     }
 }