blob: 27b10d93008084d4b58e5f5fce983b7ff2dc539d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
commit 2285efe5dc2c83eda4578527b65f759f6382d094
Author: Timothy Pearson <[email protected]>
Date: 1325323706 -0600
Fix FTBFS
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<KviOptionsWidgetInstanceEntry> * m_pInstanceTree;
public:
KviPointerList<KviOptionsWidgetInstanceEntry> * 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<KviOptionsWidgetInstanceEntry> * l);
- KviOptionsWidgetInstanceEntry * findInstanceEntry(const QObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
+ KviOptionsWidgetInstanceEntry * findInstanceEntry(const TQObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
void deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l);
-protected Q_SLOTS:
+protected slots:
void widgetDestroyed();
};
|
