From 955e20356d63ed405198c8143617a8a0ca8bfc02 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 10:00:17 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit bf280726d5d22f33d33e4f9e771220c725249407.
---
 charselectapplet/charselectapplet.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'charselectapplet')

diff --git a/charselectapplet/charselectapplet.cpp b/charselectapplet/charselectapplet.cpp
index 9be73c4..4f41c90 100644
--- a/charselectapplet/charselectapplet.cpp
+++ b/charselectapplet/charselectapplet.cpp
@@ -23,9 +23,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <math.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqvbox.h>
 #include <tqspinbox.h>
 #include <tqlabel.h>
@@ -66,7 +66,7 @@ CharSelectApplet::CharSelectApplet(const TQString& configFile, Type type, int ac
     cell_height = c->readNumEntry("CellHeight", cell_height);
     TQString characters = c->readEntry("Characters", "������ߩ��");
 
-    // setup layout
+    // setup tqlayout
     TQHBoxLayout *_layout = new TQHBoxLayout(this);
     _layout->setAutoAdd(true);
 
@@ -251,16 +251,16 @@ void CharTable::paintCell(TQPainter* p, int row, int col)
 
     // draw background
     if (active) {
-	p->setBrush(TQBrush(colorGroup().highlight()));
+	p->setBrush(TQBrush(tqcolorGroup().highlight()));
 	p->setPen(NoPen);
 	p->drawRect(0, 0, w, h);
-	p->setPen(colorGroup().highlightedText());
+	p->setPen(tqcolorGroup().highlightedText());
     }
     else {
-	p->setBrush(TQBrush(colorGroup().base()));
+	p->setBrush(TQBrush(tqcolorGroup().base()));
 	p->setPen(NoPen);
 	p->drawRect(0, 0, w, h);
-	p->setPen(colorGroup().text());
+	p->setPen(tqcolorGroup().text());
     }
 
     // set font
@@ -310,7 +310,7 @@ void CharTable::selectCell(int row, int col)
     repaintCell(oldRow, oldCol);
     repaintCell(_activeRow, _activeCol);
 
-    TQClipboard *cb = TQApplication::clipboard();
+    TQClipboard *cb = TQApplication::tqclipboard();
     TQObject::disconnect( cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) );
     TQString text = TQString(_map[col + row * _cols]);
     bool oldMode = cb->selectionModeEnabled();
@@ -332,7 +332,7 @@ void CharTable::clearCell()
 
     repaintCell(oldRow, oldCol);
     
-    TQObject::disconnect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) );
+    TQObject::disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) );
 }
 
 
-- 
cgit v1.2.3