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

1 files changed, 8 insertions, 5 deletions

diff --git a/kwin-styles/kde1/kde1client.h b/kwin-styles/kde1/kde1client.h
index 7dd13ab9..b97afc3e 100644
--- a/kwin-styles/kde1/kde1client.h
+++ b/kwin-styles/kde1/kde1client.h
@@ -28,11 +28,12 @@ enum ButtonType {
 class StdClient : public KDecoration
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     StdClient( KDecorationBridge* b, KDecorationFactory* f );
     ~StdClient();
     void init();
-    TQSize minimumSize() const;
+    TQSize tqminimumSize() const;
     void borders( int& left, int& right, int& top, int& bottom ) const;
     void reset( unsigned long mask );
     void resize( const TQSize& s );
@@ -66,11 +67,12 @@ private:
 class StdToolClient : public KDecoration
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     StdToolClient( KDecorationBridge* b, KDecorationFactory* f );
     ~StdToolClient();
     void init();
-    TQSize minimumSize() const;
+    TQSize tqminimumSize() const;
     void borders( int& left, int& right, int& top, int& bottom ) const;
     void reset( unsigned long mask );
     void resize( const TQSize& s );
@@ -100,9 +102,10 @@ private:
   Like TQToolButton, but provides a clicked(ButtonState) signals that
   has the last pressed mouse button as argument
  */
-class ThreeButtonButton: public QToolButton
+class ThreeButtonButton: public TQToolButton
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
   ThreeButtonButton ( TQWidget *parent = 0, const char* name = 0 )
       : TQToolButton( parent, name )
@@ -119,13 +122,13 @@ protected:
     void mousePressEvent( TQMouseEvent* e )
     {
 	last_button = e->button();
-	TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), LeftButton, e->state() );
+	TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), Qt::LeftButton, e->state() );
 	TQToolButton::mousePressEvent( &me );
     }
 
     void mouseReleaseEvent( TQMouseEvent* e )
     {
-	TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), LeftButton, e->state() );
+	TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), Qt::LeftButton, e->state() );
 	TQToolButton::mouseReleaseEvent( &me );
     }