summaryrefslogtreecommitdiffstats
path: root/kjsembed
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-08-02 19:19:58 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-08-02 19:19:58 +0000
commitaac788452d57994e398808c6d0bd53e561a0cd08 (patch)
treefdd804317f94db3d27b424056a915aa6d281d5ef /kjsembed
parent479f5f799523bffbcc83dff581a2299c047c6fff (diff)
downloadtdebindings-aac788452d57994e398808c6d0bd53e561a0cd08.tar.gz
tdebindings-aac788452d57994e398808c6d0bd53e561a0cd08.zip
TQt conversion fixes
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1158421 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kjsembed')
-rw-r--r--kjsembed/bindings/kconfig_imp.h2
-rw-r--r--kjsembed/bindings/painter_imp.cpp2
-rw-r--r--kjsembed/bindings/painter_imp.h2
-rw-r--r--kjsembed/builtins/qdir_imp.h2
-rw-r--r--kjsembed/builtins/qfile_imp.h2
-rw-r--r--kjsembed/builtins/textstream_imp.h2
-rw-r--r--kjsembed/customobject_imp.cpp16
-rw-r--r--kjsembed/customobject_imp.h2
-rw-r--r--kjsembed/jsconsolewidget.h4
-rw-r--r--kjsembed/jsfactory.h8
-rw-r--r--kjsembed/jsopaqueproxy.h2
-rw-r--r--kjsembed/kjsembedpart.h2
-rw-r--r--kjsembed/qtbindings/qcanvas_imp.h2
-rw-r--r--kjsembed/qtbindings/qcanvasellipse_imp.h2
-rw-r--r--kjsembed/qtbindings/qcanvasitem_imp.h2
-rw-r--r--kjsembed/qtbindings/qcanvasitemlist_imp.h2
-rw-r--r--kjsembed/qtbindings/qcanvasline_imp.h2
-rw-r--r--kjsembed/qtbindings/qcanvaspixmap_imp.h2
-rw-r--r--kjsembed/qtbindings/qcanvaspixmaparray_imp.h2
-rw-r--r--kjsembed/qtbindings/qcanvaspolygon_imp.h2
-rw-r--r--kjsembed/qtbindings/qcanvaspolygonalitem_imp.h2
-rw-r--r--kjsembed/qtbindings/qcanvasrectangle_imp.h2
-rw-r--r--kjsembed/qtbindings/qcanvasspline_imp.h2
-rw-r--r--kjsembed/qtbindings/qcanvassprite_imp.h2
-rw-r--r--kjsembed/qtbindings/qcanvastext_imp.h2
-rw-r--r--kjsembed/qtbindings/qcanvasview_imp.h2
-rw-r--r--kjsembed/qtbindings/qchecklistitem_imp.h2
-rw-r--r--kjsembed/qtbindings/qcombobox_imp.h2
-rw-r--r--kjsembed/qtbindings/qlistview_imp.h2
-rw-r--r--kjsembed/qtbindings/qlistviewitem_imp.h2
-rw-r--r--kjsembed/qtbindings/qmenudata_imp.h2
-rw-r--r--kjsembed/qtbindings/qmenuitem_imp.h2
-rw-r--r--kjsembed/qtbindings/qpopupmenu_imp.h2
-rw-r--r--kjsembed/qtstubs.h2
-rw-r--r--kjsembed/slotproxy.h6
-rw-r--r--kjsembed/slotutils.h2
-rw-r--r--kjsembed/tools/headers/qbrush.h2
-rw-r--r--kjsembed/tools/headers/qcanvas.h52
-rw-r--r--kjsembed/tools/headers/qdir.h4
-rw-r--r--kjsembed/tools/headers/qpen.h2
40 files changed, 79 insertions, 79 deletions
diff --git a/kjsembed/bindings/kconfig_imp.h b/kjsembed/bindings/kconfig_imp.h
index 9daf5f17..5eb99973 100644
--- a/kjsembed/bindings/kconfig_imp.h
+++ b/kjsembed/bindings/kconfig_imp.h
@@ -36,7 +36,7 @@
#ifndef QT_ONLY
class KConfig;
#else
-class QSettings;
+class TQSettings;
#endif
namespace KJSEmbed {
diff --git a/kjsembed/bindings/painter_imp.cpp b/kjsembed/bindings/painter_imp.cpp
index ef2f9ddd..df6673e8 100644
--- a/kjsembed/bindings/painter_imp.cpp
+++ b/kjsembed/bindings/painter_imp.cpp
@@ -63,7 +63,7 @@ namespace Bindings {
PainterRef::PainterRef()
{
m_device = 0L;
- m_painter = new QPainter;
+ m_painter = new TQPainter;
m_canDelete = true;
}
PainterRef::~PainterRef()
diff --git a/kjsembed/bindings/painter_imp.h b/kjsembed/bindings/painter_imp.h
index 8b71a191..f831b7fd 100644
--- a/kjsembed/bindings/painter_imp.h
+++ b/kjsembed/bindings/painter_imp.h
@@ -27,7 +27,7 @@
#include <tqpen.h>
#include <tqpainter.h>
-class QPixmap;
+class TQPixmap;
namespace KJSEmbed {
namespace Bindings {
diff --git a/kjsembed/builtins/qdir_imp.h b/kjsembed/builtins/qdir_imp.h
index 7a8aa86b..9bd6d770 100644
--- a/kjsembed/builtins/qdir_imp.h
+++ b/kjsembed/builtins/qdir_imp.h
@@ -10,7 +10,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
#include <kjsembed/jsbindingbase.h>
-class QDir;
+class TQDir;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/builtins/qfile_imp.h b/kjsembed/builtins/qfile_imp.h
index d116040e..bf4df5ea 100644
--- a/kjsembed/builtins/qfile_imp.h
+++ b/kjsembed/builtins/qfile_imp.h
@@ -9,7 +9,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QFile;
+class TQFile;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/builtins/textstream_imp.h b/kjsembed/builtins/textstream_imp.h
index 055cbe9d..c08470fc 100644
--- a/kjsembed/builtins/textstream_imp.h
+++ b/kjsembed/builtins/textstream_imp.h
@@ -27,7 +27,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QTextStream;
+class TQTextStream;
namespace KJSEmbed {
namespace BuiltIns {
diff --git a/kjsembed/customobject_imp.cpp b/kjsembed/customobject_imp.cpp
index 104915d8..572a99e2 100644
--- a/kjsembed/customobject_imp.cpp
+++ b/kjsembed/customobject_imp.cpp
@@ -203,14 +203,14 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
object.put( exec, "addChild", KJS::Object(obj) );
}
- //ADDBINDING( QMenuItem, widget)
- //ADDBINDING( QMenuData, widget)
-
- ADDBINDING( QPopupMenu, widget )
- ADDBINDING( QComboBox, widget )
- //ADDBINDING( QFrame, widget )
- /*ADDBINDING( QListView, widget )*/
- ADDBINDING( QCanvasView, widget )
+ //ADDBINDING( TQMenuItem, widget)
+ //ADDBINDING( TQMenuData, widget)
+
+ ADDBINDING( TQPopupMenu, widget )
+ ADDBINDING( TQComboBox, widget )
+ //ADDBINDING( TQFrame, widget )
+ /*ADDBINDING( TQListView, widget )*/
+ ADDBINDING( TQCanvasView, widget )
/*
TQMenuData *md = dynamic_cast<TQMenuData *>( widget );
diff --git a/kjsembed/customobject_imp.h b/kjsembed/customobject_imp.h
index 553e55b9..50926dc0 100644
--- a/kjsembed/customobject_imp.h
+++ b/kjsembed/customobject_imp.h
@@ -28,7 +28,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QObject;
+class TQObject;
namespace KJSEmbed {
namespace Bindings {
diff --git a/kjsembed/jsconsolewidget.h b/kjsembed/jsconsolewidget.h
index bf7100df..52a5e0bd 100644
--- a/kjsembed/jsconsolewidget.h
+++ b/kjsembed/jsconsolewidget.h
@@ -25,8 +25,8 @@
#include <tqframe.h>
#include <kjsembed/global.h>
-class QPushButton;
-class QHBox;
+class TQPushButton;
+class TQHBox;
class KLineEdit;
class KPopupTitle;
diff --git a/kjsembed/jsfactory.h b/kjsembed/jsfactory.h
index 9bef7f82..726a8344 100644
--- a/kjsembed/jsfactory.h
+++ b/kjsembed/jsfactory.h
@@ -29,10 +29,10 @@
#include <kjs/interpreter.h>
#include <kjs/object.h>
-class QEvent;
-class QObject;
-class QWidget;
-class QTextStream;
+class TQEvent;
+class TQObject;
+class TQWidget;
+class TQTextStream;
namespace KParts {
class ReadOnlyPart;
diff --git a/kjsembed/jsopaqueproxy.h b/kjsembed/jsopaqueproxy.h
index e5a4c1f0..fdad268b 100644
--- a/kjsembed/jsopaqueproxy.h
+++ b/kjsembed/jsopaqueproxy.h
@@ -31,7 +31,7 @@
#include <algorithm>
#include <typeinfo>
-class QTextStream;
+class TQTextStream;
namespace KJSEmbed {
diff --git a/kjsembed/kjsembedpart.h b/kjsembed/kjsembedpart.h
index e9be3efc..0d87bb00 100644
--- a/kjsembed/kjsembedpart.h
+++ b/kjsembed/kjsembedpart.h
@@ -40,7 +40,7 @@
#include <kjsembed/qtstubs.h>
#endif
-class QWidget;
+class TQWidget;
#define KJSEMBED_VERSION_STRING "0.3"
#define KJSEMBED_VERSION_MAJOR 0
diff --git a/kjsembed/qtbindings/qcanvas_imp.h b/kjsembed/qtbindings/qcanvas_imp.h
index 4521bfe8..255bbe44 100644
--- a/kjsembed/qtbindings/qcanvas_imp.h
+++ b/kjsembed/qtbindings/qcanvas_imp.h
@@ -9,7 +9,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QCanvas;
+class TQCanvas;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvasellipse_imp.h b/kjsembed/qtbindings/qcanvasellipse_imp.h
index 0d15d67b..2a61a439 100644
--- a/kjsembed/qtbindings/qcanvasellipse_imp.h
+++ b/kjsembed/qtbindings/qcanvasellipse_imp.h
@@ -9,7 +9,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QCanvasEllipse;
+class TQCanvasEllipse;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvasitem_imp.h b/kjsembed/qtbindings/qcanvasitem_imp.h
index 8951eda0..d0823afe 100644
--- a/kjsembed/qtbindings/qcanvasitem_imp.h
+++ b/kjsembed/qtbindings/qcanvasitem_imp.h
@@ -9,7 +9,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QCanvasItem;
+class TQCanvasItem;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvasitemlist_imp.h b/kjsembed/qtbindings/qcanvasitemlist_imp.h
index f6b7a0cc..3f2edae1 100644
--- a/kjsembed/qtbindings/qcanvasitemlist_imp.h
+++ b/kjsembed/qtbindings/qcanvasitemlist_imp.h
@@ -9,7 +9,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QCanvasItemList;
+class TQCanvasItemList;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvasline_imp.h b/kjsembed/qtbindings/qcanvasline_imp.h
index 94b8f1ad..95ab8cb3 100644
--- a/kjsembed/qtbindings/qcanvasline_imp.h
+++ b/kjsembed/qtbindings/qcanvasline_imp.h
@@ -9,7 +9,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QCanvasLine;
+class TQCanvasLine;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvaspixmap_imp.h b/kjsembed/qtbindings/qcanvaspixmap_imp.h
index 6e9525f0..607ff4d4 100644
--- a/kjsembed/qtbindings/qcanvaspixmap_imp.h
+++ b/kjsembed/qtbindings/qcanvaspixmap_imp.h
@@ -9,7 +9,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QCanvasPixmap;
+class TQCanvasPixmap;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvaspixmaparray_imp.h b/kjsembed/qtbindings/qcanvaspixmaparray_imp.h
index 16f842a5..c1dba541 100644
--- a/kjsembed/qtbindings/qcanvaspixmaparray_imp.h
+++ b/kjsembed/qtbindings/qcanvaspixmaparray_imp.h
@@ -9,7 +9,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QCanvasPixmapArray;
+class TQCanvasPixmapArray;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvaspolygon_imp.h b/kjsembed/qtbindings/qcanvaspolygon_imp.h
index 9bb1a99e..98398bf0 100644
--- a/kjsembed/qtbindings/qcanvaspolygon_imp.h
+++ b/kjsembed/qtbindings/qcanvaspolygon_imp.h
@@ -9,7 +9,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QCanvasPolygon;
+class TQCanvasPolygon;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h
index 2316e7f9..389ed346 100644
--- a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h
+++ b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h
@@ -9,7 +9,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QCanvasPolygonalItem;
+class TQCanvasPolygonalItem;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvasrectangle_imp.h b/kjsembed/qtbindings/qcanvasrectangle_imp.h
index b2ff92a3..1e141fe2 100644
--- a/kjsembed/qtbindings/qcanvasrectangle_imp.h
+++ b/kjsembed/qtbindings/qcanvasrectangle_imp.h
@@ -9,7 +9,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QCanvasRectangle;
+class TQCanvasRectangle;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvasspline_imp.h b/kjsembed/qtbindings/qcanvasspline_imp.h
index 28679bcb..73f87999 100644
--- a/kjsembed/qtbindings/qcanvasspline_imp.h
+++ b/kjsembed/qtbindings/qcanvasspline_imp.h
@@ -9,7 +9,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QCanvasSpline;
+class TQCanvasSpline;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvassprite_imp.h b/kjsembed/qtbindings/qcanvassprite_imp.h
index c62f86db..4fe40dc1 100644
--- a/kjsembed/qtbindings/qcanvassprite_imp.h
+++ b/kjsembed/qtbindings/qcanvassprite_imp.h
@@ -9,7 +9,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QCanvasSprite;
+class TQCanvasSprite;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvastext_imp.h b/kjsembed/qtbindings/qcanvastext_imp.h
index bf2049bd..11f50a51 100644
--- a/kjsembed/qtbindings/qcanvastext_imp.h
+++ b/kjsembed/qtbindings/qcanvastext_imp.h
@@ -9,7 +9,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QCanvasText;
+class TQCanvasText;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcanvasview_imp.h b/kjsembed/qtbindings/qcanvasview_imp.h
index 03fac913..24322716 100644
--- a/kjsembed/qtbindings/qcanvasview_imp.h
+++ b/kjsembed/qtbindings/qcanvasview_imp.h
@@ -9,7 +9,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QCanvasView;
+class TQCanvasView;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qchecklistitem_imp.h b/kjsembed/qtbindings/qchecklistitem_imp.h
index 5bc5bcd8..4ba46d32 100644
--- a/kjsembed/qtbindings/qchecklistitem_imp.h
+++ b/kjsembed/qtbindings/qchecklistitem_imp.h
@@ -10,7 +10,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
#include <kjsembed/jsbindingbase.h>
-class QCheckListItem;
+class TQCheckListItem;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qcombobox_imp.h b/kjsembed/qtbindings/qcombobox_imp.h
index 255e5323..a11fba7c 100644
--- a/kjsembed/qtbindings/qcombobox_imp.h
+++ b/kjsembed/qtbindings/qcombobox_imp.h
@@ -9,7 +9,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QComboBox;
+class TQComboBox;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qlistview_imp.h b/kjsembed/qtbindings/qlistview_imp.h
index 7fbee199..22786b8d 100644
--- a/kjsembed/qtbindings/qlistview_imp.h
+++ b/kjsembed/qtbindings/qlistview_imp.h
@@ -9,7 +9,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QListView;
+class TQListView;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qlistviewitem_imp.h b/kjsembed/qtbindings/qlistviewitem_imp.h
index 9f05bf89..2f0eb21b 100644
--- a/kjsembed/qtbindings/qlistviewitem_imp.h
+++ b/kjsembed/qtbindings/qlistviewitem_imp.h
@@ -10,7 +10,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
#include <kjsembed/jsbindingbase.h>
-class QListViewItem;
+class TQListViewItem;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qmenudata_imp.h b/kjsembed/qtbindings/qmenudata_imp.h
index b6b50fa7..83f84aa5 100644
--- a/kjsembed/qtbindings/qmenudata_imp.h
+++ b/kjsembed/qtbindings/qmenudata_imp.h
@@ -9,7 +9,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QMenuData;
+class TQMenuData;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qmenuitem_imp.h b/kjsembed/qtbindings/qmenuitem_imp.h
index 7af67bd6..59b7d996 100644
--- a/kjsembed/qtbindings/qmenuitem_imp.h
+++ b/kjsembed/qtbindings/qmenuitem_imp.h
@@ -9,7 +9,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QMenuItem;
+class TQMenuItem;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtbindings/qpopupmenu_imp.h b/kjsembed/qtbindings/qpopupmenu_imp.h
index 9bb16af9..3a0c019d 100644
--- a/kjsembed/qtbindings/qpopupmenu_imp.h
+++ b/kjsembed/qtbindings/qpopupmenu_imp.h
@@ -9,7 +9,7 @@
#include <kjsembed/jsobjectproxy_imp.h>
-class QPopupMenu;
+class TQPopupMenu;
/**
* Namespace containing the KJSEmbed library.
diff --git a/kjsembed/qtstubs.h b/kjsembed/qtstubs.h
index 5b646d02..cd676964 100644
--- a/kjsembed/qtstubs.h
+++ b/kjsembed/qtstubs.h
@@ -27,7 +27,7 @@
#include <tqobject.h>
#include <tqurl.h>
-class QWidget;
+class TQWidget;
typedef TQUrl KURL;
diff --git a/kjsembed/slotproxy.h b/kjsembed/slotproxy.h
index 4ed96b24..2dc3565d 100644
--- a/kjsembed/slotproxy.h
+++ b/kjsembed/slotproxy.h
@@ -32,9 +32,9 @@
#include <kjsembed/qtstubs.h>
#endif // QT_ONLY
-class QDate;
-class QTime;
-class QDateTime;
+class TQDate;
+class TQTime;
+class TQDateTime;
namespace KJS {
class Interpreter;
diff --git a/kjsembed/slotutils.h b/kjsembed/slotutils.h
index 7043e590..7e5650d6 100644
--- a/kjsembed/slotutils.h
+++ b/kjsembed/slotutils.h
@@ -26,7 +26,7 @@
#include <kjs/object.h>
#include <kjsembed/jsbinding.h>
-class QObject;
+class TQObject;
namespace KJS { class Interpreter; }
diff --git a/kjsembed/tools/headers/qbrush.h b/kjsembed/tools/headers/qbrush.h
index e85f0750..82b00044 100644
--- a/kjsembed/tools/headers/qbrush.h
+++ b/kjsembed/tools/headers/qbrush.h
@@ -46,7 +46,7 @@
class Q_EXPORT TQBrush: public Qt
{
-friend class QPainter;
+friend class TQPainter;
public:
TQBrush();
TQBrush( BrushStyle );
diff --git a/kjsembed/tools/headers/qcanvas.h b/kjsembed/tools/headers/qcanvas.h
index 797c4bd3..8eb70959 100644
--- a/kjsembed/tools/headers/qcanvas.h
+++ b/kjsembed/tools/headers/qcanvas.h
@@ -59,18 +59,18 @@
#ifndef QT_NO_CANVAS
-class QCanvasSprite;
-class QCanvasPolygonalItem;
-class QCanvasRectangle;
-class QCanvasPolygon;
-class QCanvasEllipse;
-class QCanvasText;
-class QCanvasLine;
-class QCanvasChunk;
-class QCanvas;
-class QCanvasItem;
-class QCanvasView;
-class QCanvasPixmap;
+class TQCanvasSprite;
+class TQCanvasPolygonalItem;
+class TQCanvasRectangle;
+class TQCanvasPolygon;
+class TQCanvasEllipse;
+class TQCanvasText;
+class TQCanvasLine;
+class TQCanvasChunk;
+class TQCanvas;
+class TQCanvasItem;
+class TQCanvasView;
+class TQCanvasPixmap;
class QM_EXPORT_CANVAS TQCanvasItemList : public TQValueList<TQCanvasItem*> {
@@ -80,7 +80,7 @@ public:
};
-class QCanvasItemExtra;
+class TQCanvasItemExtra;
class QM_EXPORT_CANVAS TQCanvasItem : public Qt
{
@@ -171,13 +171,13 @@ protected:
private:
// For friendly subclasses...
- friend class QCanvasPolygonalItem;
- friend class QCanvasSprite;
- friend class QCanvasRectangle;
- friend class QCanvasPolygon;
- friend class QCanvasEllipse;
- friend class QCanvasText;
- friend class QCanvasLine;
+ friend class TQCanvasPolygonalItem;
+ friend class TQCanvasSprite;
+ friend class TQCanvasRectangle;
+ friend class TQCanvasPolygon;
+ friend class TQCanvasEllipse;
+ friend class TQCanvasText;
+ friend class TQCanvasLine;
virtual TQPointArray chunks() const;
virtual void addToChunks();
@@ -204,7 +204,7 @@ private:
};
-class QCanvasData;
+class TQCanvasData;
class QM_EXPORT_CANVAS TQCanvas : public QObject
{
@@ -350,7 +350,7 @@ private:
#endif
};
-class QCanvasViewData;
+class TQCanvasViewData;
class QM_EXPORT_CANVAS TQCanvasView : public QScrollView
{
@@ -415,8 +415,8 @@ private:
void init(const TQImage&);
void init(const TQPixmap& pixmap, int hx, int hy);
- friend class QCanvasSprite;
- friend class QCanvasPixmapArray;
+ friend class TQCanvasSprite;
+ friend class TQCanvasPixmapArray;
friend bool qt_testCollision(const TQCanvasSprite* s1, const TQCanvasSprite* s2);
int hotx,hoty;
@@ -544,7 +544,7 @@ private:
TQCanvasPixmapArray* images;
};
-class QPolygonalProcessor;
+class TQPolygonalProcessor;
class QM_EXPORT_CANVAS TQCanvasPolygonalItem : public QCanvasItem
{
@@ -741,7 +741,7 @@ private:
};
-class QCanvasTextExtra;
+class TQCanvasTextExtra;
class QM_EXPORT_CANVAS TQCanvasText : public QCanvasItem
{
diff --git a/kjsembed/tools/headers/qdir.h b/kjsembed/tools/headers/qdir.h
index 2056828e..200514dd 100644
--- a/kjsembed/tools/headers/qdir.h
+++ b/kjsembed/tools/headers/qdir.h
@@ -48,8 +48,8 @@
#ifndef QT_NO_DIR
typedef TQPtrList<TQFileInfo> QFileInfoList;
typedef TQPtrListIterator<TQFileInfo> QFileInfoListIterator;
-class QStringList;
-template <class T> class QDeepCopy;
+class TQStringList;
+template <class T> class TQDeepCopy;
class Q_EXPORT QDir
diff --git a/kjsembed/tools/headers/qpen.h b/kjsembed/tools/headers/qpen.h
index 7db9325e..585e7af2 100644
--- a/kjsembed/tools/headers/qpen.h
+++ b/kjsembed/tools/headers/qpen.h
@@ -71,7 +71,7 @@ public:
{ return !(operator==(p)); }
private:
- friend class QPainter;
+ friend class TQPainter;
#ifdef Q_WS_WIN
friend class QFontEngineWin;
#endif