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

---
 src/qt_qt_wrapper.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp
index 0f5ccb1..852d658 100644
--- a/src/qt_qt_wrapper.cpp
+++ b/src/qt_qt_wrapper.cpp
@@ -1987,15 +1987,15 @@ void setRcProperties(GtkRcStyle* rc_style, int forceRecreate)
 	
 	// Mouseover
 	setColour("fg[PRELIGHT]",   tqApp->palette().active().text()); // menu items - change?
-	setColour("bg[PRELIGHT]",   tqApp->tqpalette().active().highlight());
+	setColour("bg[PRELIGHT]",   tqApp->palette().active().highlight());
 	setColour("text[PRELIGHT]", tqApp->palette().active().text());
 	setColour("base[PRELIGHT]", tqApp->palette().active().base());
 	
 	// Selected
-	setColour("fg[SELECTED]",   tqApp->tqpalette().active().highlightedText());
-	setColour("bg[SELECTED]",   tqApp->tqpalette().active().highlight());
-	setColour("text[SELECTED]", tqApp->tqpalette().active().highlightedText());
-	setColour("base[SELECTED]", tqApp->tqpalette().active().highlight());
+	setColour("fg[SELECTED]",   tqApp->palette().active().highlightedText());
+	setColour("bg[SELECTED]",   tqApp->palette().active().highlight());
+	setColour("text[SELECTED]", tqApp->palette().active().highlightedText());
+	setColour("base[SELECTED]", tqApp->palette().active().highlight());
 	
 	// Disabled
 	setColour("fg[INSENSITIVE]",    tqApp->palette().disabled().text());
@@ -2346,7 +2346,7 @@ void getTextColor(GdkColor *color, GtkStateType state_type)
 		return;
 	
 	if ((state_type == GTK_STATE_PRELIGHT) || (state_type == GTK_STATE_ACTIVE) || (state_type == GTK_STATE_SELECTED))
-		setColour(color, tqApp->tqpalette().active().highlightedText());
+		setColour(color, tqApp->palette().active().highlightedText());
 	else if (state_type == GTK_STATE_NORMAL)
 		setColour(color, tqApp->palette().active().text());
 	else if (state_type == GTK_STATE_INSENSITIVE)
-- 
cgit v1.2.3

