TQt conversion fixes

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1158447 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

33 files changed, 54 insertions, 54 deletions

diff --git a/khtml/css/csshelper.h b/khtml/css/csshelper.h
index 5a9142091..1ab8ac3ce 100644
--- a/khtml/css/csshelper.h
+++ b/khtml/css/csshelper.h
@@ -27,7 +27,7 @@
 
 #include "dom/dom_string.h"
 
-class QPaintDeviceMetrics;
+class TQPaintDeviceMetrics;
 class KHTMLSettings;
 
 namespace DOM
diff --git a/khtml/dom/dom_node.h b/khtml/dom/dom_node.h
index abdcd8d4d..37889eec2 100644
--- a/khtml/dom/dom_node.h
+++ b/khtml/dom/dom_node.h
@@ -36,7 +36,7 @@
 #include <tqstring.h>
 #include <kdelibs_export.h>
 
-class QRect;
+class TQRect;
 
 namespace KJS {
     class HTMLDocument;
diff --git a/khtml/ecma/kjs_debugwin.h b/khtml/ecma/kjs_debugwin.h
index d48f8b040..8faf71d52 100644
--- a/khtml/ecma/kjs_debugwin.h
+++ b/khtml/ecma/kjs_debugwin.h
@@ -41,8 +41,8 @@
 
 #include "dom/dom_misc.h"
 
-class QListBox;
-class QComboBox;
+class TQListBox;
+class TQComboBox;
 class KActionCollection;
 class KAction;
 
diff --git a/khtml/ecma/kjs_window.h b/khtml/ecma/kjs_window.h
index 433bf86ae..2f5eb45f5 100644
--- a/khtml/ecma/kjs_window.h
+++ b/khtml/ecma/kjs_window.h
@@ -31,7 +31,7 @@
 #include "kjs_binding.h"
 #include "kjs_views.h"
 
-class QTimer;
+class TQTimer;
 class KHTMLView;
 class KHTMLPart;
 
diff --git a/khtml/html/html_documentimpl.h b/khtml/html/html_documentimpl.h
index b4eed345c..01fdb2127 100644
--- a/khtml/html/html_documentimpl.h
+++ b/khtml/html/html_documentimpl.h
@@ -30,7 +30,7 @@
 #include <tqmap.h>
 
 class KHTMLView;
-class QString;
+class TQString;
 
 namespace DOM {
 
diff --git a/khtml/html/html_formimpl.h b/khtml/html/html_formimpl.h
index 5fea3e221..40fefc9ee 100644
--- a/khtml/html/html_formimpl.h
+++ b/khtml/html/html_formimpl.h
@@ -35,7 +35,7 @@
 #include <tqmemarray.h>
 
 class KHTMLView;
-class QTextCodec;
+class TQTextCodec;
 
 namespace khtml
 {
diff --git a/khtml/java/kjavaappletviewer.h b/khtml/java/kjavaappletviewer.h
index 16f837b45..e12b3c1d9 100644
--- a/khtml/java/kjavaappletviewer.h
+++ b/khtml/java/kjavaappletviewer.h
@@ -35,8 +35,8 @@
 
 #include "kjavaappletwidget.h"
 
-class QTable;
-class QLabel;
+class TQTable;
+class TQLabel;
 class KJavaProcess;
 class KJavaAppletViewer;
 class KAboutData;
diff --git a/khtml/java/kqeventutil.h b/khtml/java/kqeventutil.h
index 9f5194d90..c7ec19bf0 100644
--- a/khtml/java/kqeventutil.h
+++ b/khtml/java/kqeventutil.h
@@ -24,7 +24,7 @@
 #define KQEVENTUTIL_H
 
 #include <tqstring.h>
-class QEvent;
+class TQEvent;
 
 class KQEventUtil {
     public:
diff --git a/khtml/khtml_caret_p.h b/khtml/khtml_caret_p.h
index 04508413a..9524f2df7 100644
--- a/khtml/khtml_caret_p.h
+++ b/khtml/khtml_caret_p.h
@@ -27,7 +27,7 @@
 
 #define DEBUG_CARETMODE 0
 
-class QFontMetrics;
+class TQFontMetrics;
 
 namespace DOM {
   class NodeImpl;
diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp
index 7097e0b6d..9ffce6794 100644
--- a/khtml/khtml_ext.cpp
+++ b/khtml/khtml_ext.cpp
@@ -978,7 +978,7 @@ void KHTMLZoomFactorAction::init(KHTMLPart *part, bool direction)
     m_direction = direction;
     m_part = part;
 
-    m_popup = new QPopupMenu;
+    m_popup = new TQPopupMenu;
     // xgettext: no-c-format
     m_popup->insertItem( i18n( "Default Font Size (100%)" ) );
 
diff --git a/khtml/khtml_printsettings.h b/khtml/khtml_printsettings.h
index b6d2d897b..3c8456849 100644
--- a/khtml/khtml_printsettings.h
+++ b/khtml/khtml_printsettings.h
@@ -22,7 +22,7 @@
 
 #include <kdeprint/kprintdialogpage.h>
 
-class QCheckBox;
+class TQCheckBox;
 
 class KHTMLPrintSettings : public KPrintDialogPage
 {
diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc
index f5abe5ba9..8e1c0f934 100644
--- a/khtml/khtml_settings.cc
+++ b/khtml/khtml_settings.cc
@@ -876,7 +876,7 @@ TQString KHTMLSettings::settingsToCSS() const
 const TQString &KHTMLSettings::availableFamilies()
 {
     if ( !avFamilies ) {
-        avFamilies = new QString;
+        avFamilies = new TQString;
         TQFontDatabase db;
         TQStringList families = db.families();
         TQStringList s;
diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
index 1f6efd199..7f800a670 100644
--- a/khtml/khtmlview.cpp
+++ b/khtml/khtmlview.cpp
@@ -2760,7 +2760,7 @@ void KHTMLView::print(bool quick)
         printer->setCreator(TQString("KDE %1.%2.%3 HTML Library").arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE));
         printer->setDocName(docname);
 
-        TQPainter *p = new QPainter;
+        TQPainter *p = new TQPainter;
         p->begin( printer );
         khtml::setPrintPainter( p );
 
diff --git a/khtml/khtmlview.h b/khtml/khtmlview.h
index fc9d1d7d6..1efb347a6 100644
--- a/khtml/khtmlview.h
+++ b/khtml/khtmlview.h
@@ -30,9 +30,9 @@
 
 #include <kdelibs_export.h>
 
-class QPainter;
-class QRect;
-template< typename T > class QValueVector;
+class TQPainter;
+class TQRect;
+template< typename T > class TQValueVector;
 
 namespace DOM {
     class HTMLDocumentImpl;
diff --git a/khtml/misc/decoder.h b/khtml/misc/decoder.h
index 49c3835fe..261daec90 100644
--- a/khtml/misc/decoder.h
+++ b/khtml/misc/decoder.h
@@ -23,8 +23,8 @@
 #define KHTMLDECODER_H
 
 #include <tqstring.h>
-class QTextCodec;
-class QTextDecoder;
+class TQTextCodec;
+class TQTextDecoder;
 
 namespace khtml {
 
diff --git a/khtml/misc/helper.h b/khtml/misc/helper.h
index 4e5b0d7e8..85442fae8 100644
--- a/khtml/misc/helper.h
+++ b/khtml/misc/helper.h
@@ -23,7 +23,7 @@
 #define html_helper_h
 
 #include <tqcolor.h>
-class QPainter;
+class TQPainter;
 #include <tqfontmetrics.h>
 #include <tqfont.h>
 
diff --git a/khtml/misc/knsplugininstaller.h b/khtml/misc/knsplugininstaller.h
index f92378f10..0d9535ba9 100644
--- a/khtml/misc/knsplugininstaller.h
+++ b/khtml/misc/knsplugininstaller.h
@@ -40,7 +40,7 @@
 #include <tqvbox.h>
 #include <tqwidget.h>
 
-class QStringList;
+class TQStringList;
 
 /*
  * This class contains all the infos needed to install a given plugin
diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp
index 090def1c5..d6e463b02 100644
--- a/khtml/misc/loader.cpp
+++ b/khtml/misc/loader.cpp
@@ -747,7 +747,7 @@ void CachedImage::movieStatus(int status)
             // faster to draw, so this is worth the hack
             if (p && monochrome && p->depth() > 1)
             {
-                TQPixmap* pix = new QPixmap;
+                TQPixmap* pix = new TQPixmap;
                 pix->convertFromImage( p->convertToImage().convertDepth( 1 ), MonoOnly|AvoidDither );
                 if ( p->mask() )
                     pix->setMask( *p->mask() );
@@ -871,7 +871,7 @@ void CachedImage::data ( TQBuffer &_buffer, bool eof )
 #ifdef CACHE_DEBUG
             kdDebug(6060) << "CachedImage::data(): reloading as pixmap:" << endl;
 #endif
-            p = new QPixmap;
+            p = new TQPixmap;
             {
             	TQBuffer buffer(_buffer.buffer());
             	buffer.open(IO_ReadOnly);
@@ -1353,7 +1353,7 @@ void Cache::init()
         docloader = new TQPtrList<DocLoader>;
 
     if ( !nullPixmap )
-        nullPixmap = new QPixmap;
+        nullPixmap = new TQPixmap;
 
     if ( !brokenPixmap )
         brokenPixmap = new TQPixmap(KHTMLFactory::instance()->iconLoader()->loadIcon("file_broken", KIcon::Desktop, 16, KIcon::DisabledState));
diff --git a/khtml/misc/loader.h b/khtml/misc/loader.h
index 05c297d79..4314e950e 100644
--- a/khtml/misc/loader.h
+++ b/khtml/misc/loader.h
@@ -54,7 +54,7 @@
 #include <khtml_settings.h>
 #include <dom/dom_string.h>
 
-class QMovie;
+class TQMovie;
 class KHTMLPart;
 
 namespace KIO {
diff --git a/khtml/rendering/enumerate.h b/khtml/rendering/enumerate.h
index 583a6171c..c8df6549a 100644
--- a/khtml/rendering/enumerate.h
+++ b/khtml/rendering/enumerate.h
@@ -23,8 +23,8 @@
 #ifndef ENUMERATE_H
 #define ENUMERATE_H
 
-class QChar;
-class QString;
+class TQChar;
+class TQString;
 
 namespace khtml {
 
diff --git a/khtml/rendering/font.h b/khtml/rendering/font.h
index 248c07d15..714b03829 100644
--- a/khtml/rendering/font.h
+++ b/khtml/rendering/font.h
@@ -30,8 +30,8 @@
 #include <tqmap.h>
 #include <tqpainter.h>
 
-class QFontDatabase;
-class QPaintDeviceMetrics;
+class TQFontDatabase;
+class TQPaintDeviceMetrics;
 
 namespace khtml
 {
diff --git a/khtml/rendering/render_canvas.h b/khtml/rendering/render_canvas.h
index 76196bd24..17f279d7b 100644
--- a/khtml/rendering/render_canvas.h
+++ b/khtml/rendering/render_canvas.h
@@ -26,7 +26,7 @@
 #include "render_block.h"
 
 class KHTMLView;
-class QScrollView;
+class TQScrollView;
 
 namespace khtml {
 
diff --git a/khtml/rendering/render_form.h b/khtml/rendering/render_form.h
index e8340c93f..33a31a910 100644
--- a/khtml/rendering/render_form.h
+++ b/khtml/rendering/render_form.h
@@ -30,8 +30,8 @@
 #include "rendering/render_style.h"
 #include "html/html_formimpl.h"
 
-class QWidget;
-class QLineEdit;
+class TQWidget;
+class TQLineEdit;
 class QListboxItem;
 
 #include <ktextedit.h>
diff --git a/khtml/rendering/render_layer.h b/khtml/rendering/render_layer.h
index 1f94ac95c..b65047391 100644
--- a/khtml/rendering/render_layer.h
+++ b/khtml/rendering/render_layer.h
@@ -50,8 +50,8 @@
 
 #include "render_object.h"
 
-class QScrollBar;
-template <class T> class QPtrVector;
+class TQScrollBar;
+template <class T> class TQPtrVector;
 
 namespace khtml {
     class RenderStyle;
diff --git a/khtml/rendering/render_object.h b/khtml/rendering/render_object.h
index 64cb581b3..1242f8e87 100644
--- a/khtml/rendering/render_object.h
+++ b/khtml/rendering/render_object.h
@@ -40,8 +40,8 @@
 #include "misc/helper.h"
 #include "rendering/render_style.h"
 
-class QPainter;
-class QTextStream;
+class TQPainter;
+class TQTextStream;
 class CSSStyle;
 class KHTMLView;
 
diff --git a/khtml/rendering/render_replaced.h b/khtml/rendering/render_replaced.h
index cb147e3c0..8432f170e 100644
--- a/khtml/rendering/render_replaced.h
+++ b/khtml/rendering/render_replaced.h
@@ -27,7 +27,7 @@
 #include <tqscrollview.h>
 
 class KHTMLView;
-class QWidget;
+class TQWidget;
 
 namespace DOM
 {
diff --git a/khtml/rendering/render_text.h b/khtml/rendering/render_text.h
index 2b75043a1..d91782b47 100644
--- a/khtml/rendering/render_text.h
+++ b/khtml/rendering/render_text.h
@@ -33,8 +33,8 @@
 #include <tqptrvector.h>
 #include <assert.h>
 
-class QPainter;
-class QFontMetrics;
+class TQPainter;
+class TQFontMetrics;
 
 // Define a constant for soft hyphen's unicode value.
 #define SOFT_HYPHEN 173
diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp
index 9c10083c3..288f0df6b 100644
--- a/khtml/test_regression.cpp
+++ b/khtml/test_regression.cpp
@@ -962,7 +962,7 @@ TQImage RegressionTest::renderToImage()
 
     for ( int py = 0; py < eh; py += 128 ) {
         for ( int px = 0; px < ew; px += 512 ) {
-            TQPainter* tp = new QPainter;
+            TQPainter* tp = new TQPainter;
             tp->begin( m_paintBuffer );
             tp->translate( -px, -py );
             tp->fillRect(px, py, 512, 128, Qt::magenta);
diff --git a/khtml/test_regression.h b/khtml/test_regression.h
index 5ebfaed87..1ec4e7d33 100644
--- a/khtml/test_regression.h
+++ b/khtml/test_regression.h
@@ -31,7 +31,7 @@
 #include <kjs/interpreter.h>
 
 class RegressionTest;
-class QTimer;
+class TQTimer;
 
 /**
  * @internal
diff --git a/khtml/test_regression_fontoverload.cpp b/khtml/test_regression_fontoverload.cpp
index 8919f5f5a..a10146480 100644
--- a/khtml/test_regression_fontoverload.cpp
+++ b/khtml/test_regression_fontoverload.cpp
@@ -268,7 +268,7 @@ KDE_EXPORT bool  TQFontDatabase::isSmoothlyScalable( const TQString &,
 const TQString &KHTMLSettings::availableFamilies()
 {
     if ( !avFamilies ) {
-        avFamilies = new QString;
+        avFamilies = new TQString;
         *avFamilies = ",Adobe Courier,Arial,Comic Sans MS,Courier,Helvetica,Times,Times New Roman,Utopia,Fixed,Ahem,";
     }
 
diff --git a/khtml/xml/dom2_eventsimpl.h b/khtml/xml/dom2_eventsimpl.h
index 7318035d2..1e7a37a16 100644
--- a/khtml/xml/dom2_eventsimpl.h
+++ b/khtml/xml/dom2_eventsimpl.h
@@ -29,7 +29,7 @@
 #include "xml/dom2_viewsimpl.h"
 
 class KHTMLPart;
-class QMouseEvent;
+class TQMouseEvent;
 
 namespace DOM {
 
diff --git a/khtml/xml/dom_docimpl.h b/khtml/xml/dom_docimpl.h
index e32a88414..5e50c09a4 100644
--- a/khtml/xml/dom_docimpl.h
+++ b/khtml/xml/dom_docimpl.h
@@ -44,9 +44,9 @@
 
 #include <kurl.h>
 
-class QPaintDevice;
-class QTextCodec;
-class QPaintDeviceMetrics;
+class TQPaintDevice;
+class TQTextCodec;
+class TQPaintDeviceMetrics;
 class KHTMLView;
 
 namespace khtml {
diff --git a/khtml/xml/dom_nodeimpl.h b/khtml/xml/dom_nodeimpl.h
index 31bbceda0..1e53edf19 100644
--- a/khtml/xml/dom_nodeimpl.h
+++ b/khtml/xml/dom_nodeimpl.h
@@ -34,14 +34,14 @@
 // The namespace used for XHTML elements
 #define XHTML_NAMESPACE "http://www.w3.org/1999/xhtml"
 
-class QPainter;
-template <class type> class QPtrList;
-template <class type> class QValueList;
+class TQPainter;
+template <class type> class TQPtrList;
+template <class type> class TQValueList;
 class KHTMLView;
-class QRect;
-class QMouseEvent;
-class QKeyEvent;
-class QTextStream;
+class TQRect;
+class TQMouseEvent;
+class TQKeyEvent;
+class TQTextStream;
 
 namespace khtml {
     class RenderStyle;