TQt4 port kdevelop

This enables compilation under both Qt3 and Qt4


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

1 files changed, 16 insertions, 10 deletions

diff --git a/kdevdesigner/designer/connectionitems.h b/kdevdesigner/designer/connectionitems.h
index 2af42b6b..39045ba6 100644
--- a/kdevdesigner/designer/connectionitems.h
+++ b/kdevdesigner/designer/connectionitems.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -39,9 +39,10 @@ class ConnectionContainer;
 
 
 class ConnectionItem : public TQObject,
-		       public QComboTableItem
+		       public TQComboTableItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     ConnectionItem( TQTable *table, FormWindow *fw );
@@ -77,6 +78,7 @@ private:
 class SenderItem : public ConnectionItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     SenderItem( TQTable *table, FormWindow *fw );
@@ -96,6 +98,7 @@ private slots:
 class ReceiverItem : public ConnectionItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     ReceiverItem( TQTable *table, FormWindow *fw );
@@ -115,6 +118,7 @@ private slots:
 class SignalItem : public ConnectionItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     SignalItem( TQTable *table, FormWindow *fw );
@@ -132,6 +136,7 @@ signals:
 class SlotItem : public ConnectionItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     SlotItem( TQTable *table, FormWindow *fw );
@@ -157,14 +162,15 @@ private:
 
 // ------------------------------------------------------------------
 
-class ConnectionContainer : public QObject
+class ConnectionContainer : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ConnectionContainer( TQObject *parent, SenderItem *i1, SignalItem *i2,
+    ConnectionContainer( TQObject *tqparent, SenderItem *i1, SignalItem *i2,
 			 ReceiverItem *i3, SlotItem *i4, int r )
-	: TQObject( parent ), mod( FALSE ), se( i1 ), si( i2 ),
+	: TQObject( tqparent ), mod( FALSE ), se( i1 ), si( i2 ),
 	  re( i3 ), sl( i4 ), rw ( r ) {
 	      i1->setConnection( this );
 	      i2->setConnection( this );
@@ -177,7 +183,7 @@ public:
     }
 
     bool isModified() const { return mod; }
-    void setModified( bool b ) { mod = b; repaint(); }
+    void setModified( bool b ) { mod = b; tqrepaint(); }
     bool isValid() const {
 	return se->currentText()[0] != '<' &&
 		si->currentText()[0] != '<' &&
@@ -185,7 +191,7 @@ public:
 		sl->currentText()[0] != '<';
     }
 
-    void repaint() {
+    void tqrepaint() {
 	se->table()->updateCell( se->row(), se->col() );
 	si->table()->updateCell( si->row(), si->col() );
 	re->table()->updateCell( re->row(), re->col() );