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

This reverts commit bf280726d5d22f33d33e4f9e771220c725249407.

1 files changed, 4 insertions, 4 deletions

diff --git a/khexedit/hexeditstate.h b/khexedit/hexeditstate.h
index f6b7d22..04f6425 100644
--- a/khexedit/hexeditstate.h
+++ b/khexedit/hexeditstate.h
@@ -23,7 +23,7 @@
 
 #include <kapplication.h>
 #include <tqfont.h> 
-#include <palette.h>
+#include <tqpalette.h>
 #include <kglobalsettings.h>
 
 
@@ -382,8 +382,8 @@ class SDisplayColor
       textBg           = TQt::white;
       secondTextBg     = TQt::white;
       inactiveBg       = TQt::gray;
-      selectBg         = kapp->palette().active().highlight();
-      selectFg         = kapp->palette().active().highlightedText();
+      selectBg         = kapp->tqpalette().active().highlight();
+      selectFg         = kapp->tqpalette().active().highlightedText();
       markBg           = TQt::blue;
       markFg           = TQt::white;
       primaryFg[0]     = TQt::black;
@@ -574,7 +574,7 @@ class SDisplayState
 {
   public:
     SDisplayLine      line;
-    SDisplayLayout    layout;
+    SDisplayLayout    tqlayout;
     SDisplayCursor    cursor;
     SDisplayColor     color;
     SDisplayFont      font;