TQt4 port kpilot

This enables compilation under both Qt3 and Qt4


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

1 files changed, 15 insertions, 6 deletions

diff --git a/kpilot/kpilot.h b/kpilot/kpilot.h
index d986567..da024b9 100644
--- a/kpilot/kpilot.h
+++ b/kpilot/kpilot.h
@@ -43,14 +43,14 @@ class PilotComponent;
 class FileInstallWidget;
 class LogWidget;
 
-
 #include "kpilotDCOP.h"
 
 
 
 class KPilotInstaller : public KMainWindow, public KPilotDCOP
 {
-Q_OBJECT
+  Q_OBJECT
+  TQ_OBJECT
 
 public:
 	KPilotInstaller();
@@ -70,7 +70,7 @@ public:
 	void addComponentPage(PilotComponent *, const TQString &name);
 
 
-	KPiloStatus status() const { return fAppStatus; } ;
+	KPilotqStatus status() const { return fApptqStatus; } ;
 
 
 protected:
@@ -122,16 +122,25 @@ public:
 	/**
 	* This is the DCOP interface from the daemon to KPilot.
 	*/
-	virtual ASYNC daemonStatus(int);
-	virtual int kpiloStatus();
+	virtual ASYNC daemontqStatus(int);
+	virtual int kpilotqStatus();
 
 public slots:
 	/**
 	* This is the DCOP interface from the daemon to KPilot
 	* to configure KPilot.
 	*/
+// MOC_SKIP_BEGIN
+#ifdef Q_MOC_RUN
+	virtual void configure();
+	virtual void configureWizard();
+#else // Q_MOC_RUN
+// MOC_SKIP_END
 	virtual ASYNC configure();
 	virtual ASYNC configureWizard();
+// MOC_SKIP_BEGIN
+#endif // Q_MOC_RUN
+// MOC_SKIP_END
 
 protected:
 	void readConfig();
@@ -166,7 +175,7 @@ private:
 	KJanusWidget    *fManagingWidget;
 	bool fDaemonWasRunning;
 
-	KPiloStatus fAppStatus;
+	KPilotqStatus fApptqStatus;
 
 	FileInstallWidget *fFileInstallWidget;
 	LogWidget *fLogWidget;