From 359640943bcf155faa9a067dde9e00a123276290 Mon Sep 17 00:00:00 2001
From: Timothy Pearson
Date: Mon, 13 Feb 2012 17:43:39 -0600
Subject: Automated update from Qt3
---
examples/demo/categoryinterface.h | 2 +-
examples/demo/display.h | 6 +++---
examples/demo/dnd/dnd.h | 2 +-
examples/demo/dnd/iconview.h | 2 +-
examples/demo/dnd/listview.h | 2 +-
examples/demo/dnd/styledbutton.h | 2 +-
examples/demo/frame.h | 2 +-
examples/demo/graph.h | 2 +-
examples/demo/i18n/i18n.cpp | 2 +-
examples/demo/i18n/i18n.h | 2 +-
examples/demo/main.cpp | 20 ++++++++++----------
examples/demo/opengl/glbox.h | 2 +-
examples/demo/opengl/glcontrolwidget.h | 2 +-
examples/demo/opengl/glgear.h | 2 +-
examples/demo/opengl/gllandscape.h | 2 +-
examples/demo/opengl/gltexobj.h | 2 +-
examples/demo/opengl/glworkspace.h | 2 +-
examples/demo/qasteroids/ledmeter.h | 2 +-
examples/demo/qasteroids/toplevel.h | 2 +-
examples/demo/qasteroids/view.h | 2 +-
examples/demo/qthumbwheel.h | 2 +-
examples/demo/textdrawing/helpwindow.h | 2 +-
examples/demo/textdrawing/textedit.h | 2 +-
23 files changed, 34 insertions(+), 34 deletions(-)
(limited to 'examples/demo')
diff --git a/examples/demo/categoryinterface.h b/examples/demo/categoryinterface.h
index 978e1380d..a51018a61 100644
--- a/examples/demo/categoryinterface.h
+++ b/examples/demo/categoryinterface.h
@@ -9,7 +9,7 @@ class TQWidgetStack;
class CategoryInterface : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
CategoryInterface( TQWidgetStack *s ) : stack( s ) {}
diff --git a/examples/demo/display.h b/examples/demo/display.h
index 3a86e2368..c3241150b 100644
--- a/examples/demo/display.h
+++ b/examples/demo/display.h
@@ -24,7 +24,7 @@ class Screen;
class Curve;
class DisplayWidget : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
DisplayWidget( TQWidget *parent=0, const char *name=0 );
@@ -51,7 +51,7 @@ private:
};
class Screen : public TQFrame {
- Q_OBJECT
+ TQ_OBJECT
public:
enum { FrameWidth = 3 };
Screen( TQWidget *parent=0, const char *name=0 );
@@ -74,7 +74,7 @@ private:
};
class Curve : public TQFrame {
- Q_OBJECT
+ TQ_OBJECT
enum { FrameWidth = 3 };
public:
Curve( TQWidget *parent=0, const char *name=0 );
diff --git a/examples/demo/dnd/dnd.h b/examples/demo/dnd/dnd.h
index 7860cac53..05d0587c4 100644
--- a/examples/demo/dnd/dnd.h
+++ b/examples/demo/dnd/dnd.h
@@ -25,7 +25,7 @@ private:
class DnDDemo : public DnDDemoBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
DnDDemo( TQWidget* parent = 0, const char* name = 0 );
diff --git a/examples/demo/dnd/iconview.h b/examples/demo/dnd/iconview.h
index b02949a83..3a5ee29cd 100644
--- a/examples/demo/dnd/iconview.h
+++ b/examples/demo/dnd/iconview.h
@@ -18,7 +18,7 @@ private:
class IconView : public TQIconView
{
- Q_OBJECT
+ TQ_OBJECT
public:
IconView( TQWidget* parent = 0, const char* name = 0 );
diff --git a/examples/demo/dnd/listview.h b/examples/demo/dnd/listview.h
index c45749516..f82f2cb35 100644
--- a/examples/demo/dnd/listview.h
+++ b/examples/demo/dnd/listview.h
@@ -17,7 +17,7 @@ private:
class ListView : public TQListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
ListView( TQWidget* parent = 0, const char* name = 0 );
diff --git a/examples/demo/dnd/styledbutton.h b/examples/demo/dnd/styledbutton.h
index ae99f5cf7..2cd6c0ae6 100644
--- a/examples/demo/dnd/styledbutton.h
+++ b/examples/demo/dnd/styledbutton.h
@@ -42,7 +42,7 @@ class TQBrush;
class StyledButton : public TQButton
{
- Q_OBJECT
+ TQ_OBJECT
Q_PROPERTY( TQColor color READ color WRITE setColor )
Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
diff --git a/examples/demo/frame.h b/examples/demo/frame.h
index 4097692af..6a2ede5cc 100644
--- a/examples/demo/frame.h
+++ b/examples/demo/frame.h
@@ -17,7 +17,7 @@ class TQWidgetStack;
class Frame : public TQMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
Frame( TQWidget *parent=0, const char *name=0 );
diff --git a/examples/demo/graph.h b/examples/demo/graph.h
index 58221b8b4..1cb0f5017 100644
--- a/examples/demo/graph.h
+++ b/examples/demo/graph.h
@@ -17,7 +17,7 @@ class GraphWidgetPrivate;
class GraphWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
GraphWidget( TQWidget *parent=0, const char *name=0 );
~GraphWidget();
diff --git a/examples/demo/i18n/i18n.cpp b/examples/demo/i18n/i18n.cpp
index 79f928268..1fba89252 100644
--- a/examples/demo/i18n/i18n.cpp
+++ b/examples/demo/i18n/i18n.cpp
@@ -137,7 +137,7 @@ void I18nDemo::newSlot(int id)
"portability across Windows 95/98/NT/2000, Mac OS X, Linux, Solaris, "
"HP-UX and many other versions of Unix with X11.
"
"See http://www.trolltech.com/qt/ for more "
- "information.
").arg(QT_VERSION_STR));
+ "information.").arg(TQT_VERSION_STR));
qApp->removeTranslator(&wrapper->translator);
diff --git a/examples/demo/i18n/i18n.h b/examples/demo/i18n/i18n.h
index 29663e1f5..b716fc04e 100644
--- a/examples/demo/i18n/i18n.h
+++ b/examples/demo/i18n/i18n.h
@@ -11,7 +11,7 @@ class Wrapper;
class I18nDemo : public TQMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
I18nDemo(TQWidget *, const char * = 0);
diff --git a/examples/demo/main.cpp b/examples/demo/main.cpp
index 4ce61ad9c..295847ac5 100644
--- a/examples/demo/main.cpp
+++ b/examples/demo/main.cpp
@@ -19,17 +19,17 @@
#include
-#if defined(QT_MODULE_OPENGL)
+#if defined(TQT_MODULE_OPENGL)
#include "opengl/glworkspace.h"
#include "opengl/gllandscapeviewer.h"
#include "opengl/glinfotext.h"
#endif
-#if defined(QT_MODULE_CANVAS)
+#if defined(TQT_MODULE_CANVAS)
#include "qasteroids/toplevel.h"
#endif
-#if defined(QT_MODULE_TABLE)
+#if defined(TQT_MODULE_TABLE)
#include "widgets/widgetsbase.h"
#else
#include "widgets/widgetsbase_pro.h"
@@ -45,7 +45,7 @@
#include
#include
-#if defined(QT_MODULE_SQL)
+#if defined(TQT_MODULE_SQL)
#include
#include "sql/sqlex.h"
#endif
@@ -107,7 +107,7 @@ private:
};
-#if defined(QT_MODULE_SQL)
+#if defined(TQT_MODULE_SQL)
class DatabaseCategory : public CategoryInterface
{
public:
@@ -145,7 +145,7 @@ private:
};
#endif
-#if defined(QT_MODULE_CANVAS)
+#if defined(TQT_MODULE_CANVAS)
class CanvasCategory : public CategoryInterface
{
public:
@@ -187,7 +187,7 @@ private:
};
#endif
-#if defined(QT_MODULE_OPENGL)
+#if defined(TQT_MODULE_OPENGL)
class OpenGLCategory : public CategoryInterface
{
public:
@@ -310,7 +310,7 @@ private:
};
-#if defined(QT_MODULE_CANVAS)
+#if defined(TQT_MODULE_CANVAS)
class GameCategory : public CategoryInterface
{
public:
@@ -358,11 +358,11 @@ int main( int argc, char **argv )
TQPtrList categories;
categories.append( new WidgetCategory( frame.widgetStack() ) );
-#if defined(QT_MODULE_SQL)
+#if defined(TQT_MODULE_SQL)
categories.append( new DatabaseCategory( frame.widgetStack() ) );
#endif
categories.append( new CanvasCategory( frame.widgetStack() ) );
-#if defined(QT_MODULE_OPENGL)
+#if defined(TQT_MODULE_OPENGL)
categories.append( new OpenGLCategory( frame.widgetStack() ) );
#endif
categories.append( new TextCategory( frame.widgetStack() ) );
diff --git a/examples/demo/opengl/glbox.h b/examples/demo/opengl/glbox.h
index 2667cfa3b..d702665fb 100644
--- a/examples/demo/opengl/glbox.h
+++ b/examples/demo/opengl/glbox.h
@@ -20,7 +20,7 @@
class GLBox : public GLControlWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/examples/demo/opengl/glcontrolwidget.h b/examples/demo/opengl/glcontrolwidget.h
index 97a99f656..7942c31ef 100644
--- a/examples/demo/opengl/glcontrolwidget.h
+++ b/examples/demo/opengl/glcontrolwidget.h
@@ -5,7 +5,7 @@
class GLControlWidget : public TQGLWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
GLControlWidget( TQWidget *parent, const char *name = 0, TQGLWidget *share = 0, WFlags f = 0 );
diff --git a/examples/demo/opengl/glgear.h b/examples/demo/opengl/glgear.h
index fed4256ca..9e21a7539 100644
--- a/examples/demo/opengl/glgear.h
+++ b/examples/demo/opengl/glgear.h
@@ -5,7 +5,7 @@
class GLGear : public GLControlWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
GLGear( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
diff --git a/examples/demo/opengl/gllandscape.h b/examples/demo/opengl/gllandscape.h
index e4f457e7c..54a03c012 100644
--- a/examples/demo/opengl/gllandscape.h
+++ b/examples/demo/opengl/gllandscape.h
@@ -5,7 +5,7 @@
class GLLandscape : public TQGLWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
GLLandscape( TQWidget * parent = 0, const char * name = 0 );
diff --git a/examples/demo/opengl/gltexobj.h b/examples/demo/opengl/gltexobj.h
index 5d235dcff..a5e48a32b 100644
--- a/examples/demo/opengl/gltexobj.h
+++ b/examples/demo/opengl/gltexobj.h
@@ -20,7 +20,7 @@
class GLTexobj : public GLControlWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
GLTexobj( TQWidget* parent, const char* name = 0, WFlags f = 0 );
diff --git a/examples/demo/opengl/glworkspace.h b/examples/demo/opengl/glworkspace.h
index 3739b24a1..6ad1ecb5b 100644
--- a/examples/demo/opengl/glworkspace.h
+++ b/examples/demo/opengl/glworkspace.h
@@ -8,7 +8,7 @@ class TQPrinter;
class GLWorkspace : public TQMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
GLWorkspace( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
~GLWorkspace();
diff --git a/examples/demo/qasteroids/ledmeter.h b/examples/demo/qasteroids/ledmeter.h
index 93bae087d..720afd6e0 100644
--- a/examples/demo/qasteroids/ledmeter.h
+++ b/examples/demo/qasteroids/ledmeter.h
@@ -13,7 +13,7 @@
class KALedMeter : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
KALedMeter( TQWidget *parent );
diff --git a/examples/demo/qasteroids/toplevel.h b/examples/demo/qasteroids/toplevel.h
index 6b3478064..2d9cc5eee 100644
--- a/examples/demo/qasteroids/toplevel.h
+++ b/examples/demo/qasteroids/toplevel.h
@@ -19,7 +19,7 @@ class TQLCDNumber;
class KAstTopLevel : public TQMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
KAstTopLevel( TQWidget *parent=0, const char *name=0 );
virtual ~KAstTopLevel();
diff --git a/examples/demo/qasteroids/view.h b/examples/demo/qasteroids/view.h
index 6ab92a1c2..35b360ab0 100644
--- a/examples/demo/qasteroids/view.h
+++ b/examples/demo/qasteroids/view.h
@@ -18,7 +18,7 @@
class KAsteroidsView : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KAsteroidsView( TQWidget *parent = 0, const char *name = 0 );
virtual ~KAsteroidsView();
diff --git a/examples/demo/qthumbwheel.h b/examples/demo/qthumbwheel.h
index 50ee44ed3..45b7afa13 100644
--- a/examples/demo/qthumbwheel.h
+++ b/examples/demo/qthumbwheel.h
@@ -50,7 +50,7 @@
class TQThumbWheel : public TQFrame, public TQRangeControl
{
- Q_OBJECT
+ TQ_OBJECT
public:
TQThumbWheel( TQWidget *parent=0, const char *name=0 );
diff --git a/examples/demo/textdrawing/helpwindow.h b/examples/demo/textdrawing/helpwindow.h
index c9d9a336a..af73b4752 100644
--- a/examples/demo/textdrawing/helpwindow.h
+++ b/examples/demo/textdrawing/helpwindow.h
@@ -21,7 +21,7 @@ class TQPopupMenu;
class HelpWindow : public TQMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
HelpWindow( const TQString& home_, const TQString& path, TQWidget* parent = 0, const char *name=0 );
~HelpWindow();
diff --git a/examples/demo/textdrawing/textedit.h b/examples/demo/textdrawing/textedit.h
index 9627c69a3..43aea5cd7 100644
--- a/examples/demo/textdrawing/textedit.h
+++ b/examples/demo/textdrawing/textedit.h
@@ -20,7 +20,7 @@ class TQTextEdit;
class TextEdit : public TQMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
TextEdit( TQWidget *parent = 0, const char *name = 0 );
--
cgit v1.2.1