TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

1 files changed, 22 insertions, 17 deletions

diff --git a/karbon/dialogs/vconfiguredlg.h b/karbon/dialogs/vconfiguredlg.h
index f1470bea..dd12eba2 100644
--- a/karbon/dialogs/vconfiguredlg.h
+++ b/karbon/dialogs/vconfiguredlg.h
@@ -28,16 +28,17 @@ class KConfig;
 class KIntNumInput;
 class KColorButton;
 class KoUnitDoubleSpinBox;
-class QCheckBox;
-class QComboBox;
+class TQCheckBox;
+class TQComboBox;
 
-class VConfigInterfacePage : public QObject
+class VConfigInterfacePage : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	VConfigInterfacePage(
-		KarbonView* view, QVBox *box = 0L, char* name = 0L );
+		KarbonView* view, TQVBox *box = 0L, char* name = 0L );
 
 	void apply();
 
@@ -51,7 +52,7 @@ private:
 	KIntNumInput* m_recentFiles;
 	int m_oldRecentFiles;
 
-	QCheckBox* m_showStatusBar;
+	TQCheckBox* m_showStatusBar;
 
 	KIntNumInput* m_copyOffset;
 	int m_oldCopyOffset;
@@ -61,13 +62,14 @@ private:
 };
 
 
-class VConfigMiscPage : public QObject
+class VConfigMiscPage : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	VConfigMiscPage(
-		KarbonView* view, QVBox* box, char* name = 0L );
+		KarbonView* view, TQVBox* box, char* name = 0L );
 
 	void apply();
 
@@ -84,16 +86,17 @@ private:
 	KIntNumInput* m_undoRedo;
 	int m_oldUndoRedo;
 	int m_oldUnit;
-	QComboBox *m_unit;
+	TQComboBox *m_unit;
 };
 
-class VConfigDefaultPage : public QObject
+class VConfigDefaultPage : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	VConfigDefaultPage(
-		KarbonView* view, QVBox* box, char* name = 0L );
+		KarbonView* view, TQVBox* box, char* name = 0L );
 
 	void apply();
 
@@ -106,19 +109,20 @@ private:
 
 	KIntNumInput* m_autoSave;
 	int m_oldAutoSave;
-	QCheckBox *m_createBackupFile;
+	TQCheckBox *m_createBackupFile;
 	bool m_oldBackupFile;
-	QCheckBox *m_saveAsPath;
+	TQCheckBox *m_saveAsPath;
 	bool m_oldSaveAsPath;
 };
 
-class VConfigGridPage : public QObject
+class VConfigGridPage : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	VConfigGridPage(
-		KarbonView* view, QVBox* box, char* name = 0L );
+		KarbonView* view, TQVBox* box, char* name = 0L );
 
 	void apply();
 
@@ -136,17 +140,18 @@ private:
 	KoUnitDoubleSpinBox* m_spaceVertUSpin;
 	KoUnitDoubleSpinBox* m_snapHorizUSpin;
 	KoUnitDoubleSpinBox* m_snapVertUSpin;
-	QCheckBox* m_gridChBox;
-	QCheckBox* m_snapChBox;
+	TQCheckBox* m_gridChBox;
+	TQCheckBox* m_snapChBox;
 	KColorButton* m_gridColorBtn;
 };
 
 class VConfigureDlg : public KDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	VConfigureDlg( KarbonView* parent );
+	VConfigureDlg( KarbonView* tqparent );
 
 public slots:
 	void slotApply();