From 0a80cfd57d271dd44221467efb426675fa470356 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 28 Jun 2011 18:31:12 +0000 Subject: TQt4 port kvirc This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/modules/options/instances.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src/modules/options/instances.h') diff --git a/src/modules/options/instances.h b/src/modules/options/instances.h index fc8674cc..c5564d9e 100644 --- a/src/modules/options/instances.h +++ b/src/modules/options/instances.h @@ -41,16 +41,16 @@ typedef struct _KviOptionsWidgetInstanceEntry KviOptionsWidgetInstanceEntry; typedef struct _KviOptionsWidgetInstanceEntry { - KviOptionsWidget * (*createProc)(QWidget *); + KviOptionsWidget * (*createProc)(TQWidget *); KviOptionsWidget * pWidget; // singleton int iIcon; - QString szName; - QString szNameNoLocale; + TQString szName; + TQString szNameNoLocale; const char * szClassName; int iPriority; - QString szKeywords; - QString szKeywordsNoLocale; - QString szGroup; + TQString szKeywords; + TQString szKeywordsNoLocale; + TQString szGroup; bool bIsContainer; bool bIsNotContained; KviPointerList * pChildList; @@ -58,9 +58,10 @@ typedef struct _KviOptionsWidgetInstanceEntry } KviOptionsWidgetInstanceEntry; -class KviOptionsInstanceManager : public QObject +class KviOptionsInstanceManager : public TQObject { Q_OBJECT + TQ_OBJECT public: KviOptionsInstanceManager(); virtual ~KviOptionsInstanceManager(); @@ -68,12 +69,12 @@ 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 slots: void widgetDestroyed(); -- cgit v1.2.1