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, 24 insertions, 23 deletions

diff --git a/lib/widgets/qcomboview.h b/lib/widgets/qcomboview.h
index 1fc87e14..213c278f 100644
--- a/lib/widgets/qcomboview.h
+++ b/lib/widgets/qcomboview.h
@@ -13,14 +13,14 @@
 **
 **********************************************************************/
 
-#ifndef QCOMBOVIEW_H
-#define QCOMBOVIEW_H
+#ifndef TQCOMBOVIEW_H
+#define TQCOMBOVIEW_H
 
-#ifndef QT_H
+#ifndef TQT_H
 #include "tqwidget.h"
-#endif // QT_H
+#endif // TQT_H
 
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
 
 /**
 @file qcomboview.h
@@ -40,25 +40,26 @@ QComboView - a combo with a TQListView as a popup widget.
 This means that you can have a treeview inside of a combo. Otherwise it works
 in the same way as TQComboBox and have similar API.
 */
-class Q_EXPORT QComboView : public QWidget
+class TQ_EXPORT QComboView : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
     Q_ENUMS( Policy )
-    Q_PROPERTY( bool editable READ editable WRITE setEditable )
-//    Q_PROPERTY( int count READ count )
-    Q_PROPERTY( TQString currentText READ currentText WRITE setCurrentText DESIGNABLE false )
-//    Q_PROPERTY( TQListView *currentItem READ currentItem WRITE setCurrentItem )
-    Q_PROPERTY( bool autoResize READ autoResize WRITE setAutoResize DESIGNABLE false )
-    Q_PROPERTY( int sizeLimit READ sizeLimit WRITE setSizeLimit )
-//    Q_PROPERTY( int maxCount READ maxCount WRITE setMaxCount )
-    Q_PROPERTY( Policy insertionPolicy READ insertionPolicy WRITE setInsertionPolicy )
-    Q_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion )
-    Q_PROPERTY( bool duplicatesEnabled READ duplicatesEnabled WRITE setDuplicatesEnabled )
-    Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
+    TQ_PROPERTY( bool editable READ editable WRITE setEditable )
+//    TQ_PROPERTY( int count READ count )
+    TQ_PROPERTY( TQString currentText READ currentText WRITE setCurrentText DESIGNABLE false )
+//    TQ_PROPERTY( TQListView *currentItem READ currentItem WRITE setCurrentItem )
+    TQ_PROPERTY( bool autoResize READ autoResize WRITE setAutoResize DESIGNABLE false )
+    TQ_PROPERTY( int sizeLimit READ sizeLimit WRITE setSizeLimit )
+//    TQ_PROPERTY( int maxCount READ maxCount WRITE setMaxCount )
+    TQ_PROPERTY( Policy insertionPolicy READ insertionPolicy WRITE setInsertionPolicy )
+    TQ_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion )
+    TQ_PROPERTY( bool duplicatesEnabled READ duplicatesEnabled WRITE setDuplicatesEnabled )
+    TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
 
 public:
-//    QComboView( TQWidget* parent=0, const char* name=0 );
-    QComboView( bool rw, TQWidget* parent=0, const char* name=0 );
+//    QComboView( TQWidget* tqparent=0, const char* name=0 );
+    QComboView( bool rw, TQWidget* tqparent=0, const char* name=0 );
     ~QComboView();
 
     int childCount() const;
@@ -69,7 +70,7 @@ public:
 
     bool	autoResize()	const;
     virtual void setAutoResize( bool );
-    QSize	sizeHint() const;
+    TQSize	tqsizeHint() const;
 
     void	setPalette( const TQPalette & );
     void	setFont( const TQFont & );
@@ -160,13 +161,13 @@ private:
     QComboViewData	*d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     QComboView( const QComboView & );
     QComboView &operator=( const QComboView & );
 #endif
 };
 
 
-#endif // QT_NO_COMBOBOX
+#endif // TQT_NO_COMBOBOX
 
-#endif // QCOMBOVIEW_H
+#endif // TQCOMBOVIEW_H