From 2285efe5dc2c83eda4578527b65f759f6382d094 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 31 Dec 2011 03:28:26 -0600 Subject: [PATCH] Fix FTBFS --- src/modules/options/mkcreateinstanceproc.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh index c426230..5e504fa 100755 --- a/src/modules/options/mkcreateinstanceproc.sh +++ b/src/modules/options/mkcreateinstanceproc.sh @@ -56,7 +56,7 @@ typedef struct _KviOptionsWidgetInstanceEntry KviOptionsWidgetInstanceEntry; typedef struct _KviOptionsWidgetInstanceEntry { - KviOptionsWidget * (*createProc)(QWidget *); + KviOptionsWidget * (*createProc)(TQWidget *); KviOptionsWidget * pWidget; // singleton int iIcon; QString szName; @@ -73,9 +73,10 @@ typedef struct _KviOptionsWidgetInstanceEntry } KviOptionsWidgetInstanceEntry; -class KviOptionsInstanceManager : public QObject +class KviOptionsInstanceManager : public TQObject { Q_OBJECT + TQ_OBJECT public: KviOptionsInstanceManager(); virtual ~KviOptionsInstanceManager(); @@ -83,14 +84,14 @@ protected: KviPointerList * m_pInstanceTree; public: KviPointerList * instanceEntryTree(){ return m_pInstanceTree; }; - KviOptionsWidget * getInstance(KviOptionsWidgetInstanceEntry * e,QWidget * par); + KviOptionsWidget * getInstance(KviOptionsWidgetInstanceEntry * e,TQWidget * par); KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName); void cleanup(KviModule * m); protected: KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName,KviPointerList * l); - KviOptionsWidgetInstanceEntry * findInstanceEntry(const QObject * ptr,KviPointerList * l); + KviOptionsWidgetInstanceEntry * findInstanceEntry(const TQObject * ptr,KviPointerList * l); void deleteInstanceTree(KviPointerList * l); -protected Q_SLOTS: +protected slots: void widgetDestroyed(); };