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

This reverts commit 805c2821ceaddada48b346c6d11bd0dc1351a539.
---
 src/modules/help/helpwidget.cpp | 14 +++++++-------
 src/modules/help/helpwidget.h   |  4 ++--
 src/modules/help/helpwindow.cpp |  4 ++--
 src/modules/help/helpwindow.h   |  2 +-
 src/modules/help/index.cpp      |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/modules/help')

diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp
index cd32db5..67ee30b 100644
--- a/src/modules/help/helpwidget.cpp
+++ b/src/modules/help/helpwidget.cpp
@@ -36,7 +36,7 @@
 #include <tqlineedit.h>
 #include <tqtooltip.h>
 #include <tqtimer.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 extern Index        * g_pDocIndex;
 extern KviPointerList<KviHelpWindow> * g_pHelpWindowList;
@@ -108,7 +108,7 @@ void KviHelpWidget::showIndex()
 
 void KviHelpWidget::resizeEvent(TQResizeEvent *e)
 {
-	int hght = m_pToolBar->sizeHint().height();
+	int hght = m_pToolBar->tqsizeHint().height();
 	if(hght < 40)hght = 40;
 	m_pToolBar->setGeometry(0,0,width(),hght);
 	m_pTextBrowser->setGeometry(0,hght,width(),height() - hght);
@@ -128,17 +128,17 @@ void KviHelpWidget::suicide()
 	delete this;
 }
 
-TQSize KviHelpWidget::sizeHint() const
+TQSize KviHelpWidget::tqsizeHint() const
 {
-	int wdth = m_pTextBrowser->sizeHint().width();
-	if(m_pToolBar->sizeHint().width() > wdth)wdth = m_pToolBar->sizeHint().width();
-	TQSize s(wdth,m_pTextBrowser->sizeHint().height() + m_pToolBar->sizeHint().height());
+	int wdth = m_pTextBrowser->tqsizeHint().width();
+	if(m_pToolBar->tqsizeHint().width() > wdth)wdth = m_pToolBar->tqsizeHint().width();
+	TQSize s(wdth,m_pTextBrowser->tqsizeHint().height() + m_pToolBar->tqsizeHint().height());
 	return s;
 }
 
 bool KviHelpWidget::eventFilter(TQObject * o, TQEvent *e)
 {
-	TQClipboard *cb = TQApplication::clipboard();
+	TQClipboard *cb = TQApplication::tqclipboard();
 	
 	if(e->type() == TQEvent::MouseButtonRelease) {
 		if(m_pTextBrowser->hasSelectedText()) {
diff --git a/src/modules/help/helpwidget.h b/src/modules/help/helpwidget.h
index b8253d6..9e2c1c4 100644
--- a/src/modules/help/helpwidget.h
+++ b/src/modules/help/helpwidget.h
@@ -23,7 +23,7 @@
 //
 
 #include "kvi_tal_hbox.h"
-#include <textbrowser.h>
+#include <tqtextbrowser.h>
 #include "index.h"
 #include <tqprogressbar.h> 
 
@@ -54,7 +54,7 @@ protected slots:
 	void showIndex();
 	void suicide();
 public:
-	virtual TQSize sizeHint() const;
+	virtual TQSize tqsizeHint() const;
 	TQTextBrowser * textBrowser() { return m_pTextBrowser; }
 };
 
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp
index 1be7f5e..8200348 100644
--- a/src/modules/help/helpwindow.cpp
+++ b/src/modules/help/helpwindow.cpp
@@ -303,9 +303,9 @@ void KviHelpWindow::resizeEvent(TQResizeEvent *e)
 	m_pSplitter->setGeometry(0,0,width(),height());
 }
 
-TQSize KviHelpWindow::sizeHint() const
+TQSize KviHelpWindow::tqsizeHint() const
 {
-	return m_pHelpWidget->sizeHint();
+	return m_pHelpWidget->tqsizeHint();
 }
 void KviHelpWindow::fillCaptionBuffers()
 {
diff --git a/src/modules/help/helpwindow.h b/src/modules/help/helpwindow.h
index 1f24353..300116f 100644
--- a/src/modules/help/helpwindow.h
+++ b/src/modules/help/helpwindow.h
@@ -62,7 +62,7 @@ protected:
 	virtual void saveProperties(KviConfig * cfg);
 	virtual void loadProperties(KviConfig * cfg);
 public:
-	virtual TQSize sizeHint() const;
+	virtual TQSize tqsizeHint() const;
 	TQTextBrowser * textBrowser();
 public slots:
 	void indexSelected ( int );
diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp
index 596b0e4..46dc4f2 100755
--- a/src/modules/help/index.cpp
+++ b/src/modules/help/index.cpp
@@ -5,7 +5,7 @@
 #include <tqstringlist.h>
 #include "kvi_pointerhashtable.h"
 #include <tqapplication.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <ctype.h>
 
 
@@ -164,7 +164,7 @@ void Index::parseDocument( const TQString &filename, int docNum )
     if (text.isNull())
         return;
     bool valid = TRUE;
-    const TQChar *buf = text.unicode();
+    const TQChar *buf = text.tqunicode();
     TQChar str[64];
     TQChar c = buf[0];
     int j = 0;
@@ -727,7 +727,7 @@ bool Index::searchForPattern( const TQStringList &patterns, const TQStringList &
 
     bool valid = TRUE;
 
-    const TQChar *buf = text.unicode();
+    const TQChar *buf = text.tqunicode();
 
     TQChar str[64];
 
-- 
cgit v1.2.3