TQt4 port ktechlab

This enables compilation under both Qt3 and Qt4


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

1 files changed, 20 insertions, 19 deletions

diff --git a/src/iteminterface.h b/src/iteminterface.h
index 22a4a04..5cc8702 100644
--- a/src/iteminterface.h
+++ b/src/iteminterface.h
@@ -11,7 +11,7 @@
 #ifndef ITEMINTERFACE_H
 #define ITEMINTERFACE_H
 
-#include <qguardedptr.h>
+#include <tqguardedptr.h>
 
 class CNItemGroup;
 class DoubleSpinBox;
@@ -27,19 +27,19 @@ class ColorCombo;
 class KComboBox;
 class KToolBar;
 class KURLRequester;
-class QCheckBox;
+class TQCheckBox;
 class KLineEdit;
 class KIntSpinBox;
 
 
-typedef QMap<QString, Variant*> VariantDataMap;
-typedef QMap<QString, KComboBox*> KComboBoxMap;
-typedef QMap<QString, KLineEdit*> KLineEditMap;
-typedef QMap<QString, DoubleSpinBox*> DoubleSpinBoxMap;
-typedef QMap<QString, KIntSpinBox*> IntSpinBoxMap;
-typedef QMap<QString, ColorCombo*> ColorComboMap;
-typedef QMap<QString, KURLRequester*> KURLReqMap;
-typedef QMap<QString, QCheckBox*> QCheckBoxMap;
+typedef TQMap<TQString, Variant*> VariantDataMap;
+typedef TQMap<TQString, KComboBox*> KComboBoxMap;
+typedef TQMap<TQString, KLineEdit*> KLineEditMap;
+typedef TQMap<TQString, DoubleSpinBox*> DoubleSpinBoxMap;
+typedef TQMap<TQString, KIntSpinBox*> IntSpinBoxMap;
+typedef TQMap<TQString, ColorCombo*> ColorComboMap;
+typedef TQMap<TQString, KURLRequester*> KURLReqMap;
+typedef TQMap<TQString, TQCheckBox*> TQCheckBoxMap;
 
 /**
 This acts as an interface between the ItemDocument's and the associated
@@ -47,9 +47,10 @@ Items's, and the various objects that like to know about them
 (e.g. ContextHelp, ItemEditor, ItemEditTB)
 @author David Saxton
 */
-class ItemInterface : public QObject
+class ItemInterface : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
 		~ItemInterface();
 		static ItemInterface * self( KTechlab * ktechlab = 0l );
@@ -72,7 +73,7 @@ class ItemInterface : public QObject
 		 * ItemEditTB.
 		 * @param showAdvanced Whether advanced data should be shown
 		 */
-		virtual QWidget * configWidget();
+		virtual TQWidget * configWidget();
 	
 	public slots:
 		/**
@@ -80,7 +81,7 @@ class ItemInterface : public QObject
 		 * data with the given id for all the CNItems in the group.
 		 * Else, it only sets the data for the activeCNItem()
 		 */
-		void slotSetData( const QString &id, QVariant value );
+		void slotSetData( const TQString &id, TQVariant value );
 		/**
 		 * Called when the ItemEditTB is cleared. This clears all widget maps.
 		 */
@@ -97,7 +98,7 @@ class ItemInterface : public QObject
 		 * Connects the specified widget to either tbDataChanged or advDataChanged
 		 * as specified by mi.
 		 */
-		void connectMapWidget( QWidget *widget, const char *_signal);
+		void connectMapWidget( TQWidget *widget, const char *_signal);
 		
 		KTechlab * const p_ktechlab;
 	
@@ -108,10 +109,10 @@ class ItemInterface : public QObject
 		DoubleSpinBoxMap m_doubleSpinBoxMap;
 		IntSpinBoxMap m_intSpinBoxMap;
 		ColorComboMap m_colorComboMap;
-		QCheckBoxMap m_boolCheckMap;
+		TQCheckBoxMap m_boolCheckMap;
 		
 		// Use by item editor toolbar
-		QGuardedPtr<KToolBar> m_pActiveItemEditorToolBar;
+		TQGuardedPtr<KToolBar> m_pActiveItemEditorToolBar;
 		int m_toolBarWidgetID;
 		
 		
@@ -122,9 +123,9 @@ class ItemInterface : public QObject
 		ItemInterface( KTechlab * ktechlab );
 		static ItemInterface * m_pSelf;
 	
-		QGuardedPtr<ItemDocument> p_cvb;
-		QGuardedPtr<ItemGroup> p_itemGroup;
-		QGuardedPtr<Item> p_lastItem;
+		TQGuardedPtr<ItemDocument> p_cvb;
+		TQGuardedPtr<ItemGroup> p_itemGroup;
+		TQGuardedPtr<Item> p_lastItem;
 		int m_currentActionTicket;
 };