From a2146f655c7ca3b10cf50833eefd483e635e1f4a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 24 Dec 2011 11:51:11 -0600
Subject: Rename a few stragglers

---
 kcontrol/info/memory.cpp                   | 2 +-
 kicker/kicker/core/container_extension.cpp | 2 +-
 kicker/kicker/ui/addapplet.cpp             | 2 +-
 kicker/libkicker/global.cpp                | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp
index 372bb71b9..7bfe52948 100644
--- a/kcontrol/info/memory.cpp
+++ b/kcontrol/info/memory.cpp
@@ -342,7 +342,7 @@ bool KMemoryWidget::Display_Graph(int widgetindex,
     /* draw surrounding box */
     paint.setPen(pen);
     TQRect r = graph->rect();
-    qDrawShadePanel(&paint, r.x(), r.y(), r.width(), r.height(), tqpalette().active(), true, 1);
+    qDrawShadePanel(&paint, r.x(), r.y(), r.width(), r.height(), palette().active(), true, 1);
     paint.end();
     bitBlt(graph, 0, 0, &pm);
 
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 5b10c904c..4679d9d31 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -1378,7 +1378,7 @@ void ExtensionContainer::updateHighlightColor()
 {
     KConfig *config = KGlobal::config();
     config->setGroup("WM");
-    TQColor color = TQApplication::tqpalette().active().highlight();
+    TQColor color = TQApplication::palette().active().highlight();
     m_highlightColor = config->readColorEntry("activeBackground", &color);
     update();
 }
diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp
index 133df0016..d6b144803 100644
--- a/kicker/kicker/ui/addapplet.cpp
+++ b/kicker/kicker/ui/addapplet.cpp
@@ -291,7 +291,7 @@ void AddAppletDialog::resizeAppletView()
     {
         m_appletBox->layout()->activate();
         w = v->visibleWidth();
-        h = m_appletBox->tqlayout()->minimumSize().height();
+        h = m_appletBox->layout()->minimumSize().height();
         v->resizeContents(w, QMAX(h, v->visibleHeight()));
         if (w == m_appletBox->width() && h == m_appletBox->height())
         break;
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index 6f6f3a7fb..d4735c2ba 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -328,7 +328,7 @@ void colorize(TQImage& image)
 {
     KConfig *config = KGlobal::config();
     config->setGroup("WM");
-    TQColor color = TQApplication::tqpalette().active().highlight();
+    TQColor color = TQApplication::palette().active().highlight();
     TQColor activeTitle = config->readColorEntry("activeBackground", &color);
     TQColor inactiveTitle = config->readColorEntry("inactiveBackground", &color);
 
@@ -336,7 +336,7 @@ void colorize(TQImage& image)
     int h1, s1, v1, h2, s2, v2, h3, s3, v3;
     activeTitle.hsv(&h1, &s1, &v1);
     inactiveTitle.hsv(&h2, &s2, &v2);
-    TQApplication::tqpalette().active().background().hsv(&h3, &s3, &v3);
+    TQApplication::palette().active().background().hsv(&h3, &s3, &v3);
 
     if ( (kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < kAbs(h2-h3)+kAbs(s2-s3)+kAbs(v2-v3)) &&
             ((kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < 32) || (s1 < 32)) && (s2 > s1))
-- 
cgit v1.2.1