From 923f45e8cc74cca8a3edc464fbb3bfeef725697d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 24 Dec 2011 11:38:28 -0600
Subject: Rename a few stragglers (cherry picked from commit
 db4b84ac8a2335f85b021c9fe1232ebe8bf25df9)

---
 style/qtcurve.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/style/qtcurve.cpp b/style/qtcurve.cpp
index 87b7e24..4929541 100644
--- a/style/qtcurve.cpp
+++ b/style/qtcurve.cpp
@@ -511,7 +511,7 @@ static bool readKdeGlobals()
         return false;
 
   
-    TQColor highlight(TQApplication::tqpalette().active().highlight());
+    TQColor highlight(TQApplication::palette().active().highlight());
     bool   inactiveEnabled(false),
            changeSelectionColor(false),
            useTQt3(useTQt3Settings());
@@ -867,7 +867,7 @@ TQtCurveStyle::TQtCurveStyle()
 
     itsPixmapCache.setAutoDelete(true);
 
-    shadeColors(TQApplication::tqpalette().active().highlight(), itsHighlightCols);
+    shadeColors(TQApplication::palette().active().highlight(), itsHighlightCols);
     shadeColors(TQApplication::palette().active().background(), itsBackgroundCols);
     shadeColors(TQApplication::palette().active().button(), itsButtonCols);
 
@@ -1093,7 +1093,7 @@ TQtCurveStyle::TQtCurveStyle()
             break;
         case SHADE_BLEND_SELECTED:
         case SHADE_SELECTED:
-            itsCheckRadioCol=TQApplication::tqpalette().active().highlight();
+            itsCheckRadioCol=TQApplication::palette().active().highlight();
             break;
         case SHADE_CUSTOM:
             itsCheckRadioCol=opts.customCheckRadioColor;
@@ -1292,13 +1292,13 @@ void TQtCurveStyle::polish(TQPalette &pal)
     {
         pal.setColor(TQPalette::Inactive, TQColorGroup::Highlight,
                      tint(TQApplication::palette().active().background(),
-                          TQApplication::tqpalette().active().highlight(), 0.4));
+                          TQApplication::palette().active().highlight(), 0.4));
         // KDE4 does not set text colour :-(
         //pal.setColor(TQPalette::Inactive, TQColorGroup::HighlightedText, pal.color(TQPalette::Active, TQColorGroup::Foreground));
     }
 
     bool newMenu(newContrast ||
-                 itsHighlightCols[ORIGINAL_SHADE]!=TQApplication::tqpalette().active().highlight()),
+                 itsHighlightCols[ORIGINAL_SHADE]!=TQApplication::palette().active().highlight()),
          newGray(newContrast ||
                  itsBackgroundCols[ORIGINAL_SHADE]!=TQApplication::palette().active().background()),
          newButton(newContrast ||
@@ -1333,7 +1333,7 @@ void TQtCurveStyle::polish(TQPalette &pal)
         shadeColors(TQApplication::palette().active().button(), itsButtonCols);
 
     if(newMenu)
-        shadeColors(TQApplication::tqpalette().active().highlight(), itsHighlightCols);
+        shadeColors(TQApplication::palette().active().highlight(), itsHighlightCols);
 
     setDecorationColors();
 
@@ -1390,7 +1390,7 @@ void TQtCurveStyle::polish(TQPalette &pal)
             break;
         case SHADE_SELECTED:
         case SHADE_BLEND_SELECTED:
-            itsCheckRadioCol=TQApplication::tqpalette().active().highlight();
+            itsCheckRadioCol=TQApplication::palette().active().highlight();
             break;
         case SHADE_CUSTOM:
             itsCheckRadioCol=opts.customCheckRadioColor;
@@ -1625,7 +1625,7 @@ void TQtCurveStyle::polish(TQWidget *widget)
 
             act.setColor(TQColorGroup::Foreground, opts.customMenuTextColor
                                                    ? opts.customMenuNormTextColor
-                                                   : TQApplication::tqpalette().active().highlightedText());
+                                                   : TQApplication::palette().active().highlightedText());
 
             if(!opts.shadeMenubarOnlyWhenActive)
             {
@@ -1724,7 +1724,7 @@ void TQtCurveStyle::polish(TQWidget *widget)
     }
     else if(::tqqt_cast<TQProgressBar *>(widget))
     {
-        if(widget->tqpalette().inactive().highlightedText()!=widget->tqpalette().active().highlightedText())
+        if(widget->palette().inactive().highlightedText()!=widget->palette().active().highlightedText())
         {
             TQPalette pal(widget->palette());
             pal.setInactive(widget->palette().active());
@@ -2181,7 +2181,7 @@ bool TQtCurveStyle::eventFilter(TQObject *object, TQEvent *event)
             if((opts.customMenuTextColor && col!=opts.customMenuNormTextColor) ||
                     ( (SHADE_BLEND_SELECTED==opts.shadeMenubars || SHADE_SELECTED==opts.shadeMenubars ||
                         (SHADE_CUSTOM==opts.shadeMenubars && TOO_DARK(itsMenubarCols[ORIGINAL_SHADE]))) &&
-                        col!=TQApplication::tqpalette().active().highlightedText()))
+                        col!=TQApplication::palette().active().highlightedText()))
             {
                 TQPalette    pal(((TQWidget *)object)->palette());
                 TQColorGroup act(pal.active());
@@ -2190,7 +2190,7 @@ bool TQtCurveStyle::eventFilter(TQObject *object, TQEvent *event)
                                                       ? itsActiveMdiTextColor
                                                       : opts.customMenuTextColor
                                                         ? opts.customMenuNormTextColor
-                                                        : TQApplication::tqpalette().active().highlightedText());
+                                                        : TQApplication::palette().active().highlightedText());
 
                 if(!opts.shadeMenubarOnlyWhenActive || useWindowCols)
                 {
@@ -4862,7 +4862,7 @@ void TQtCurveStyle::drawControl(ControlElement control, TQPainter *p, const TQWi
                                   (button->parentWidget() && button->inherits("Ideal::Button") &&
                                    button->parentWidget()->inherits("Ideal::ButtonBar"))));
             const TQColor &textCol(sidebar && (button->isOn() || flags&Style_On)
-                                    ? TQApplication::tqpalette().active().highlightedText()
+                                    ? TQApplication::palette().active().highlightedText()
                                     : button->colorGroup().buttonText());
 
             for(i=0; i<j; i++)
-- 
cgit v1.2.3