(cherry picked from commit 2285efe5dc)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent 14e8f25843
commit c583913502

@ -56,7 +56,7 @@ typedef struct _KviOptionsWidgetInstanceEntry KviOptionsWidgetInstanceEntry;
typedef struct _KviOptionsWidgetInstanceEntry typedef struct _KviOptionsWidgetInstanceEntry
{ {
KviOptionsWidget * (*createProc)(QWidget *); KviOptionsWidget * (*createProc)(TQWidget *);
KviOptionsWidget * pWidget; // singleton KviOptionsWidget * pWidget; // singleton
int iIcon; int iIcon;
QString szName; QString szName;
@ -73,9 +73,10 @@ typedef struct _KviOptionsWidgetInstanceEntry
} KviOptionsWidgetInstanceEntry; } KviOptionsWidgetInstanceEntry;
class KviOptionsInstanceManager : public QObject class KviOptionsInstanceManager : public TQObject
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
KviOptionsInstanceManager(); KviOptionsInstanceManager();
virtual ~KviOptionsInstanceManager(); virtual ~KviOptionsInstanceManager();
@ -83,14 +84,14 @@ protected:
KviPointerList<KviOptionsWidgetInstanceEntry> * m_pInstanceTree; KviPointerList<KviOptionsWidgetInstanceEntry> * m_pInstanceTree;
public: public:
KviPointerList<KviOptionsWidgetInstanceEntry> * instanceEntryTree(){ return m_pInstanceTree; }; KviPointerList<KviOptionsWidgetInstanceEntry> * instanceEntryTree(){ return m_pInstanceTree; };
KviOptionsWidget * getInstance(KviOptionsWidgetInstanceEntry * e,QWidget * par); KviOptionsWidget * getInstance(KviOptionsWidgetInstanceEntry * e,TQWidget * par);
KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName); KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName);
void cleanup(KviModule * m); void cleanup(KviModule * m);
protected: protected:
KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName,KviPointerList<KviOptionsWidgetInstanceEntry> * l); 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); void deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l);
protected Q_SLOTS: protected slots:
void widgetDestroyed(); void widgetDestroyed();
}; };

Loading…
Cancel
Save