TQt4 port kdeartwork

This enables compilation under both Qt3 and Qt4


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

11 files changed, 39 insertions, 33 deletions

diff --git a/kscreensaver/xsavers/demowin.h b/kscreensaver/xsavers/demowin.h
index d31fc353..9c67d8bb 100644
--- a/kscreensaver/xsavers/demowin.h
+++ b/kscreensaver/xsavers/demowin.h
@@ -21,9 +21,10 @@
 
 //----------------------------------------------------------------------------
 
-class DemoWindow : public QWidget
+class DemoWindow : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     DemoWindow() : TQWidget()
     {
diff --git a/kscreensaver/xsavers/helpers.cpp b/kscreensaver/xsavers/helpers.cpp
index ef700545..242d2f75 100644
--- a/kscreensaver/xsavers/helpers.cpp
+++ b/kscreensaver/xsavers/helpers.cpp
@@ -3,27 +3,27 @@
 #include <kapplication.h>
 
 void min_width(TQWidget *w) {
-  w->setMinimumWidth(w->sizeHint().width());
+  w->setMinimumWidth(w->tqsizeHint().width());
 }
 
 void fixed_width(TQWidget *w) {
-  w->setFixedWidth(w->sizeHint().width());
+  w->setFixedWidth(w->tqsizeHint().width());
 }
 
 void min_height(TQWidget *w) {
-  w->setMinimumHeight(w->sizeHint().height());
+  w->setMinimumHeight(w->tqsizeHint().height());
 }
 
 void fixed_height(TQWidget *w) {
-  w->setFixedHeight(w->sizeHint().height());
+  w->setFixedHeight(w->tqsizeHint().height());
 }
 
 void min_size(TQWidget *w) {
-  w->setMinimumSize(w->sizeHint());
+  w->setMinimumSize(w->tqsizeHint());
 }
 
 void fixed_size(TQWidget *w) {
-  w->setFixedSize(w->sizeHint());
+  w->setFixedSize(w->tqsizeHint());
 }
 
 KConfig *klock_config()
diff --git a/kscreensaver/xsavers/main.cpp b/kscreensaver/xsavers/main.cpp
index 78e5351d..3cfa4b86 100644
--- a/kscreensaver/xsavers/main.cpp
+++ b/kscreensaver/xsavers/main.cpp
@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
     {
         demoWidget = new DemoWindow();
         demoWidget->setBackgroundMode(TQWidget::NoBackground);
-//        demoWidget->setBackgroundColor(Qt::black);
+//        demoWidget->setBackgroundColor(TQt::black);
         demoWidget->show();
         saveWin = demoWidget->winId();
         app.setMainWidget(demoWidget);
diff --git a/kscreensaver/xsavers/mode.h b/kscreensaver/xsavers/mode.h
index c2bc7f1d..10213f0a 100644
--- a/kscreensaver/xsavers/mode.h
+++ b/kscreensaver/xsavers/mode.h
@@ -38,7 +38,7 @@ typedef struct LockStruct_s {
 	ModeHook   *init_hook;	/* func to init a mode */
 	ModeHook   *callback_hook;	/* func to run (tick) a mode */
 	ModeHook   *release_hook;	/* func to shutdown a mode */
-	ModeHook   *refresh_hook;	/* tells mode to repaint */
+	ModeHook   *refresh_hook;	/* tells mode to tqrepaint */
 	ModeHook   *change_hook;	/* user wants mode to change */
 	ModeHook   *unused_hook;	/* for future expansion */
 	ModeSpecOpt *msopt;	/* this mode's def resources */
@@ -313,10 +313,10 @@ extern ModeHook release_galaxy;
 extern ModeHook refresh_galaxy;
 extern ModeSpecOpt galaxy_opts;
 
-extern ModeHook init_geometry;
-extern ModeHook draw_geometry;
-extern ModeHook release_geometry;
-extern ModeHook refresh_geometry;
+extern ModeHook init_tqgeometry;
+extern ModeHook draw_tqgeometry;
+extern ModeHook release_tqgeometry;
+extern ModeHook refresh_tqgeometry;
 extern ModeSpecOpt geometry_opts;
 
 extern ModeHook init_grav;
@@ -504,11 +504,11 @@ extern ModeHook release_rotor;
 extern ModeHook refresh_rotor;
 extern ModeSpecOpt rotor_opts;
 
-extern ModeHook init_shape;
-extern ModeHook draw_shape;
-extern ModeHook release_shape;
-extern ModeHook refresh_shape;
-extern ModeSpecOpt shape_opts;
+extern ModeHook init_tqshape;
+extern ModeHook draw_tqshape;
+extern ModeHook release_tqshape;
+extern ModeHook refresh_tqshape;
+extern ModeSpecOpt tqshape_opts;
 
 extern ModeHook init_slip;
 extern ModeHook draw_slip;
diff --git a/kscreensaver/xsavers/saver.h b/kscreensaver/xsavers/saver.h
index 318728fc..b531ed4b 100644
--- a/kscreensaver/xsavers/saver.h
+++ b/kscreensaver/xsavers/saver.h
@@ -10,9 +10,10 @@ extern void stopScreenSaver();
 extern int setupScreenSaver();
 
 //-----------------------------------------------------------------------------
-class kScreenSaver : public QObject
+class kScreenSaver : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	kScreenSaver( Drawable drawable );
 	virtual ~kScreenSaver();
diff --git a/kscreensaver/xsavers/space.cpp b/kscreensaver/xsavers/space.cpp
index 77070ad2..99c7d10d 100644
--- a/kscreensaver/xsavers/space.cpp
+++ b/kscreensaver/xsavers/space.cpp
@@ -47,7 +47,7 @@
  */
 
 #define LONG64
-//#define QT_CLEAN_NAMESPACE
+//#define TQT_CLEAN_NAMESPACE
 
 #include <tqslider.h>
 #include <tqlayout.h>
@@ -275,7 +275,7 @@ static void Init(void)
     glDisable(GL_DITHER);
 }
 
-void reshape(int width, int height)
+void retqshape(int width, int height)
 {
 
     windW = (GLint)width;
@@ -444,7 +444,7 @@ initSpace(Window window)
 	  glClearIndex(BlackPixel(display, screen));
 	}
 
-	reshape(xwa.width, xwa.height);
+	retqshape(xwa.width, xwa.height);
 	Init();
 }
 
@@ -593,7 +593,7 @@ kSpaceSetup::kSpaceSetup( TQWidget *parent, const char *name )
     label = new TQLabel( i18n("Speed:"), page );
     vb->addWidget( label );
 
-    slider = new TQSlider(MINSPEED, MAXSPEED, 10, speed, TQSlider::Horizontal,
+    slider = new TQSlider(MINSPEED, MAXSPEED, 10, speed, Qt::Horizontal,
 		    page );
     vb->addWidget( slider );
     slider->setTickmarks(TQSlider::Below);
@@ -603,7 +603,7 @@ kSpaceSetup::kSpaceSetup( TQWidget *parent, const char *name )
     label = new TQLabel( i18n("Warp interval:"), page );
     vb->addWidget( label );
 
-    slider = new TQSlider(MINWARP, MAXWARP, 3, warpinterval, Horizontal, page );
+    slider = new TQSlider(MINWARP, MAXWARP, 3, warpinterval,Qt::Horizontal, page );
     vb->addWidget( slider );
     slider->setTickmarks(TQSlider::Below);
     slider->setTickInterval(3);
@@ -725,8 +725,8 @@ void main(int argc, char **argv)
 
     Init();
 
-    tkExposeFunc(Reshape);
-    tkReshapeFunc(Reshape);
+    tkExposeFunc(Retqshape);
+    tkRetqshapeFunc(Retqshape);
     tkKeyDownFunc(Key);
     tkIdleFunc(Idle);
     tkExec();
diff --git a/kscreensaver/xsavers/space.h b/kscreensaver/xsavers/space.h
index f20db852..84ad22fc 100644
--- a/kscreensaver/xsavers/space.h
+++ b/kscreensaver/xsavers/space.h
@@ -11,6 +11,7 @@
 class kSpaceSaver : public kScreenSaver
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	kSpaceSaver( Drawable drawable );
 	virtual ~kSpaceSaver();
@@ -38,6 +39,7 @@ protected:
 class kSpaceSetup : public KDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	kSpaceSetup( TQWidget *parent = NULL, const char *name = NULL );
 
diff --git a/kscreensaver/xsavers/swarm.cpp b/kscreensaver/xsavers/swarm.cpp
index efc04c28..5b2c8fae 100644
--- a/kscreensaver/xsavers/swarm.cpp
+++ b/kscreensaver/xsavers/swarm.cpp
@@ -12,7 +12,7 @@
    Contact me in case of problems, not the original author!
    Last revised: 10-Jul-97
 */
-// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
+// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
 
 #define MAXSPEED 100
 #define MINSPEED 0
@@ -330,7 +330,7 @@ kSwarmSetup::kSwarmSetup( TQWidget *parent, const char *name )
 	left->addWidget(label);
 
 	TQSlider *slider = new TQSlider(MINSPEED, MAXSPEED, 10, speed,
-			Horizontal, main );
+			Qt::Horizontal, main );
 	slider->setMinimumSize( 120, 20 );
     slider->setTickmarks(TQSlider::Below);
     slider->setTickInterval(10);
@@ -342,7 +342,7 @@ kSwarmSetup::kSwarmSetup( TQWidget *parent, const char *name )
 	min_size(label);
 	left->addWidget(label);
 
-	slider = new TQSlider(MINBATCH, MAXBATCH, 20, maxLevels, Horizontal, main );
+	slider = new TQSlider(MINBATCH, MAXBATCH, 20, maxLevels,Qt::Horizontal, main );
 	slider->setMinimumSize( 120, 20 );
     slider->setTickmarks(TQSlider::Below);
     slider->setTickInterval(20);
diff --git a/kscreensaver/xsavers/swarm.h b/kscreensaver/xsavers/swarm.h
index 0e34049c..90dac900 100644
--- a/kscreensaver/xsavers/swarm.h
+++ b/kscreensaver/xsavers/swarm.h
@@ -15,6 +15,7 @@
 class kSwarmSaver : public kScreenSaver
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	kSwarmSaver( Drawable drawable );
 	virtual ~kSwarmSaver();
@@ -40,6 +41,7 @@ protected:
 class kSwarmSetup : public KDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	kSwarmSetup( TQWidget *parent = NULL, const char *name = NULL );
 
diff --git a/kscreensaver/xsavers/xlock.h b/kscreensaver/xsavers/xlock.h
index ab58fe9c..ff309c63 100644
--- a/kscreensaver/xsavers/xlock.h
+++ b/kscreensaver/xsavers/xlock.h
@@ -15,7 +15,7 @@
  * Changes of David Bagley <bagleyd@source.asset.com>
  * 12-May-95: Added defines for SunOS's Adjunct password file
  *            Dale A. Harris <rodmur@ecst.csuchico.edu>
- * 18-Nov-94: Modified for QNX 4.2 w/ Metrolink X server from Brian Campbell
+ * 18-Nov-94: Modified for TQNX 4.2 w/ Metrolink X server from Brian Campbell
  *            <brianc@qnx.com>.
  * 11-Jul-94: added Bool flag: inwindow, which tells xlock to run in a
  *            window from Greg Bowering <greg@cs.adelaide.edu.au>
@@ -62,7 +62,7 @@ void initXLock( GC gc );
 #define ICONW             64
 #define ICONH             64
 
-#if defined VMS || defined __QNX__
+#if defined VMS || defined __TQNX__
 #ifdef VMS
 /*#define VMS_PLAY*/
 #include <unixlib.h>
@@ -139,7 +139,7 @@ extern char  *text_pass;
 extern char  *text_info;
 extern char  *text_valid;
 extern char  *text_invalid;
-extern char  *geometry;
+extern char  *tqgeometry;
 extern float saturation;
 extern int   nicelevel;
 extern int   delay;
diff --git a/kscreensaver/xsavers/xlockmore.h b/kscreensaver/xsavers/xlockmore.h
index 496b48f2..277783ae 100644
--- a/kscreensaver/xsavers/xlockmore.h
+++ b/kscreensaver/xsavers/xlockmore.h
@@ -15,7 +15,7 @@
  * Changes of David Bagley <bagleyd@bigfoot.com>
  * 12-May-95: Added defines for SunOS's Adjunct password file
  *            Dale A. Harris <rodmur@ecst.csuchico.edu>
- * 18-Nov-94: Modified for QNX 4.2 w/ Metrolink X server from Brian Campbell
+ * 18-Nov-94: Modified for TQNX 4.2 w/ Metrolink X server from Brian Campbell
  *            <brianc@qnx.com>.
  * 11-Jul-94: added Bool flag: inwindow, which tells xlock to run in a
  *            window from Greg Bowering <greg@cs.adelaide.edu.au>