From ea318d1431c89e647598c510c4245c6571aa5f46 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 26 Jan 2012 23:32:43 -0600 Subject: Update to latest tqt3 automated conversion --- examples/opengl/box/glbox.h | 2 +- examples/opengl/box/globjwin.cpp | 16 ++++++++-------- examples/opengl/box/globjwin.h | 2 +- examples/opengl/box/main.cpp | 4 ++-- examples/opengl/gear/gear.cpp | 4 ++-- examples/opengl/glpixmap/glbox.h | 2 +- examples/opengl/glpixmap/globjwin.cpp | 24 ++++++++++++------------ examples/opengl/glpixmap/globjwin.h | 2 +- examples/opengl/glpixmap/main.cpp | 4 ++-- examples/opengl/overlay/globjwin.cpp | 12 ++++++------ examples/opengl/overlay/globjwin.h | 2 +- examples/opengl/overlay/glteapots.cpp | 2 +- examples/opengl/overlay/glteapots.h | 2 +- examples/opengl/overlay/main.cpp | 6 +++--- examples/opengl/overlay_x11/gearwidget.h | 2 +- examples/opengl/overlay_x11/main.cpp | 2 +- examples/opengl/overlay_x11/rubberbandwidget.cpp | 2 +- examples/opengl/overlay_x11/rubberbandwidget.h | 2 +- examples/opengl/sharedbox/glbox.h | 2 +- examples/opengl/sharedbox/globjwin.cpp | 16 ++++++++-------- examples/opengl/sharedbox/globjwin.h | 2 +- examples/opengl/sharedbox/main.cpp | 4 ++-- examples/opengl/texture/globjwin.cpp | 16 ++++++++-------- examples/opengl/texture/globjwin.h | 2 +- examples/opengl/texture/gltexobj.cpp | 4 ++-- examples/opengl/texture/gltexobj.h | 2 +- examples/opengl/texture/main.cpp | 4 ++-- 27 files changed, 72 insertions(+), 72 deletions(-) (limited to 'examples/opengl') diff --git a/examples/opengl/box/glbox.h b/examples/opengl/box/glbox.h index a04a8122a..93b4d7579 100644 --- a/examples/opengl/box/glbox.h +++ b/examples/opengl/box/glbox.h @@ -16,7 +16,7 @@ #ifndef GLBOX_H #define GLBOX_H -#include +#include class GLBox : public TQGLWidget diff --git a/examples/opengl/box/globjwin.cpp b/examples/opengl/box/globjwin.cpp index 4d88f2401..ed40f9ec0 100644 --- a/examples/opengl/box/globjwin.cpp +++ b/examples/opengl/box/globjwin.cpp @@ -7,14 +7,14 @@ ** *****************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "globjwin.h" #include "glbox.h" diff --git a/examples/opengl/box/globjwin.h b/examples/opengl/box/globjwin.h index 98dad489e..e6a279f06 100644 --- a/examples/opengl/box/globjwin.h +++ b/examples/opengl/box/globjwin.h @@ -17,7 +17,7 @@ #ifndef GLOBJWIN_H #define GLOBJWIN_H -#include +#include class GLObjectWindow : public TQWidget diff --git a/examples/opengl/box/main.cpp b/examples/opengl/box/main.cpp index 4a3863232..c91fadf52 100644 --- a/examples/opengl/box/main.cpp +++ b/examples/opengl/box/main.cpp @@ -17,8 +17,8 @@ // #include "globjwin.h" -#include -#include +#include +#include /* The main program is here. diff --git a/examples/opengl/gear/gear.cpp b/examples/opengl/gear/gear.cpp index 843f56384..74eba96c2 100644 --- a/examples/opengl/gear/gear.cpp +++ b/examples/opengl/gear/gear.cpp @@ -13,8 +13,8 @@ // distribution. // -#include -#include +#include +#include #include #if defined(Q_CC_MSVC) diff --git a/examples/opengl/glpixmap/glbox.h b/examples/opengl/glpixmap/glbox.h index 0b58cda0b..a7ec8fc2b 100644 --- a/examples/opengl/glpixmap/glbox.h +++ b/examples/opengl/glpixmap/glbox.h @@ -16,7 +16,7 @@ #ifndef GLBOX_H #define GLBOX_H -#include +#include class GLBox : public TQGLWidget diff --git a/examples/opengl/glpixmap/globjwin.cpp b/examples/opengl/glpixmap/globjwin.cpp index c7cd9b673..1309207b0 100644 --- a/examples/opengl/glpixmap/globjwin.cpp +++ b/examples/opengl/glpixmap/globjwin.cpp @@ -14,18 +14,18 @@ ****************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "globjwin.h" #include "glbox.h" diff --git a/examples/opengl/glpixmap/globjwin.h b/examples/opengl/glpixmap/globjwin.h index b02ed67eb..7f8952f7d 100644 --- a/examples/opengl/glpixmap/globjwin.h +++ b/examples/opengl/glpixmap/globjwin.h @@ -17,7 +17,7 @@ #ifndef GLOBJWIN_H #define GLOBJWIN_H -#include +#include class GLBox; class TQLabel; diff --git a/examples/opengl/glpixmap/main.cpp b/examples/opengl/glpixmap/main.cpp index 13e474007..b8f735582 100644 --- a/examples/opengl/glpixmap/main.cpp +++ b/examples/opengl/glpixmap/main.cpp @@ -17,8 +17,8 @@ // #include "globjwin.h" -#include -#include +#include +#include /* The main program is here. diff --git a/examples/opengl/overlay/globjwin.cpp b/examples/opengl/overlay/globjwin.cpp index 24dda2fad..0c79cd6a9 100644 --- a/examples/opengl/overlay/globjwin.cpp +++ b/examples/opengl/overlay/globjwin.cpp @@ -7,12 +7,12 @@ ** *****************************************************************************/ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "globjwin.h" #include "glteapots.h" diff --git a/examples/opengl/overlay/globjwin.h b/examples/opengl/overlay/globjwin.h index ede00a35c..ffcd72bbf 100644 --- a/examples/opengl/overlay/globjwin.h +++ b/examples/opengl/overlay/globjwin.h @@ -17,7 +17,7 @@ #ifndef GLOBJWIN_H #define GLOBJWIN_H -#include +#include class GLObjectWindow : public TQWidget diff --git a/examples/opengl/overlay/glteapots.cpp b/examples/opengl/overlay/glteapots.cpp index a3fbf3000..2afc1ad03 100644 --- a/examples/opengl/overlay/glteapots.cpp +++ b/examples/opengl/overlay/glteapots.cpp @@ -48,7 +48,7 @@ ****************************************************************************/ #include "glteapots.h" -#include +#include #if defined(Q_CC_MSVC) #pragma warning(disable:4305) // init: truncation from const double to float diff --git a/examples/opengl/overlay/glteapots.h b/examples/opengl/overlay/glteapots.h index 4fbec9b83..575953975 100644 --- a/examples/opengl/overlay/glteapots.h +++ b/examples/opengl/overlay/glteapots.h @@ -17,7 +17,7 @@ #ifndef GLBOX_H #define GLBOX_H -#include +#include class GLTeapots : public TQGLWidget diff --git a/examples/opengl/overlay/main.cpp b/examples/opengl/overlay/main.cpp index 3844704fd..ca1ec488c 100644 --- a/examples/opengl/overlay/main.cpp +++ b/examples/opengl/overlay/main.cpp @@ -17,9 +17,9 @@ // #include "globjwin.h" -#include -#include -#include +#include +#include +#include /* The main program is here. diff --git a/examples/opengl/overlay_x11/gearwidget.h b/examples/opengl/overlay_x11/gearwidget.h index 6154e36da..ce1c2b822 100644 --- a/examples/opengl/overlay_x11/gearwidget.h +++ b/examples/opengl/overlay_x11/gearwidget.h @@ -12,7 +12,7 @@ #ifndef GEAR_H #define GEAR_H -#include +#include class GearWidget : public TQGLWidget { diff --git a/examples/opengl/overlay_x11/main.cpp b/examples/opengl/overlay_x11/main.cpp index 70a6f4362..5925d271b 100644 --- a/examples/opengl/overlay_x11/main.cpp +++ b/examples/opengl/overlay_x11/main.cpp @@ -10,7 +10,7 @@ ** *****************************************************************************/ -#include +#include #include "gearwidget.h" #include "rubberbandwidget.h" diff --git a/examples/opengl/overlay_x11/rubberbandwidget.cpp b/examples/opengl/overlay_x11/rubberbandwidget.cpp index 5cd5c5654..a11a81441 100644 --- a/examples/opengl/overlay_x11/rubberbandwidget.cpp +++ b/examples/opengl/overlay_x11/rubberbandwidget.cpp @@ -11,7 +11,7 @@ *****************************************************************************/ #include "rubberbandwidget.h" -#include +#include RubberbandWidget::RubberbandWidget( TQColor transparentColor, TQWidget *parent, diff --git a/examples/opengl/overlay_x11/rubberbandwidget.h b/examples/opengl/overlay_x11/rubberbandwidget.h index 10513a6d6..268656ba7 100644 --- a/examples/opengl/overlay_x11/rubberbandwidget.h +++ b/examples/opengl/overlay_x11/rubberbandwidget.h @@ -13,7 +13,7 @@ #ifndef RUBBERBANDWIDGET_H #define RUBBERBANDWIDGET_H -#include +#include class RubberbandWidget : public TQWidget diff --git a/examples/opengl/sharedbox/glbox.h b/examples/opengl/sharedbox/glbox.h index 089513d33..548457ce3 100644 --- a/examples/opengl/sharedbox/glbox.h +++ b/examples/opengl/sharedbox/glbox.h @@ -16,7 +16,7 @@ #ifndef GLBOX_H #define GLBOX_H -#include +#include class GLBox : public TQGLWidget diff --git a/examples/opengl/sharedbox/globjwin.cpp b/examples/opengl/sharedbox/globjwin.cpp index 0b0a60491..a50573bb8 100644 --- a/examples/opengl/sharedbox/globjwin.cpp +++ b/examples/opengl/sharedbox/globjwin.cpp @@ -7,14 +7,14 @@ ** *****************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "globjwin.h" #include "glbox.h" diff --git a/examples/opengl/sharedbox/globjwin.h b/examples/opengl/sharedbox/globjwin.h index c42f2ea72..5832ee685 100644 --- a/examples/opengl/sharedbox/globjwin.h +++ b/examples/opengl/sharedbox/globjwin.h @@ -17,7 +17,7 @@ #ifndef GLOBJWIN_H #define GLOBJWIN_H -#include +#include class GLBox; class GLObjectWindow : public TQWidget diff --git a/examples/opengl/sharedbox/main.cpp b/examples/opengl/sharedbox/main.cpp index 13e474007..b8f735582 100644 --- a/examples/opengl/sharedbox/main.cpp +++ b/examples/opengl/sharedbox/main.cpp @@ -17,8 +17,8 @@ // #include "globjwin.h" -#include -#include +#include +#include /* The main program is here. diff --git a/examples/opengl/texture/globjwin.cpp b/examples/opengl/texture/globjwin.cpp index bb57307e0..a6a2e6c04 100644 --- a/examples/opengl/texture/globjwin.cpp +++ b/examples/opengl/texture/globjwin.cpp @@ -7,14 +7,14 @@ ** *****************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "globjwin.h" #include "gltexobj.h" diff --git a/examples/opengl/texture/globjwin.h b/examples/opengl/texture/globjwin.h index 98dad489e..e6a279f06 100644 --- a/examples/opengl/texture/globjwin.h +++ b/examples/opengl/texture/globjwin.h @@ -17,7 +17,7 @@ #ifndef GLOBJWIN_H #define GLOBJWIN_H -#include +#include class GLObjectWindow : public TQWidget diff --git a/examples/opengl/texture/gltexobj.cpp b/examples/opengl/texture/gltexobj.cpp index 483a18843..fc77eaa5a 100644 --- a/examples/opengl/texture/gltexobj.cpp +++ b/examples/opengl/texture/gltexobj.cpp @@ -17,8 +17,8 @@ ****************************************************************************/ #include "gltexobj.h" -#include -#include +#include +#include const int redrawWait = 50; diff --git a/examples/opengl/texture/gltexobj.h b/examples/opengl/texture/gltexobj.h index 9fa368376..8d167228a 100644 --- a/examples/opengl/texture/gltexobj.h +++ b/examples/opengl/texture/gltexobj.h @@ -16,7 +16,7 @@ #ifndef GLTEXOBJ_H #define GLTEXOBJ_H -#include +#include class GLTexobj : public TQGLWidget diff --git a/examples/opengl/texture/main.cpp b/examples/opengl/texture/main.cpp index 4798bc16d..51c48ea7c 100644 --- a/examples/opengl/texture/main.cpp +++ b/examples/opengl/texture/main.cpp @@ -15,8 +15,8 @@ // #include "globjwin.h" -#include -#include +#include +#include /* The main program is here. -- cgit v1.2.3