From a374efce3a207b39514be3c52264091400ce297e Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 04:44:41 +0000 Subject: TQt4 port kdeedu This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kanagram/src/keduvocdocument.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'kanagram/src/keduvocdocument.h') diff --git a/kanagram/src/keduvocdocument.h b/kanagram/src/keduvocdocument.h index ebc48010..468f3089 100644 --- a/kanagram/src/keduvocdocument.h +++ b/kanagram/src/keduvocdocument.h @@ -48,7 +48,7 @@ #define KV_ORG "o" // original expression in specified language #define KV_TRANS "t" // translated expression in specified language #define KV_LANG "l" // language: en, de, it, fr ... -#define KV_QUERY "q" // query: org or translation +#define KV_TQUERY "q" // query: org or translation #define KV_O "o" // org #define KV_T "t" // translation #define KV_GRADE "g" // grade of knowledge: 0=well known, x=not known for x times @@ -104,7 +104,7 @@ #define KV_LESS_GRP "lesson" // lesson descriptor group #define KV_LESS_CURR "current" // is current lesson #define KV_LESS_DESC "desc" // lesson descriptor -#define KV_LESS_QUERY "query" // lesson contained in query +#define KV_LESS_TQUERY "query" // lesson contained in query #define KV_LESS_NO "no" // lesson descriptor number /* @@ -232,7 +232,7 @@ #define KVTML_EXT "kvtml" #define VT5_LEX_EXT "lex" -#define QVOCAB_EXT "qvo" +#define TQVOCAB_EXT "qvo" #define VCB_EXT "vocab" #define KVL_EXT "vl" #define CSV_EXT "csv" @@ -249,9 +249,10 @@ class LeitnerSystem; * This class contains the expressions of your vocabulary ************************************************************/ -class KEduVocDocument : public QObject +class KEduVocDocument : public TQObject { Q_OBJECT + TQ_OBJECT friend class KEduVocKvtmlWriter; friend class KEduVocKvtmlReader; @@ -439,7 +440,7 @@ class KEduVocDocument : public QObject * @param url if url is empty (or NULL) actual name is preserved * @result true if successful */ - bool saveAs(TQObject *parent, const KURL & url, FileType ft, const TQString & generator); + bool saveAs(TQObject *tqparent, const KURL & url, FileType ft, const TQString & generator); /** returns count of entries */ -- cgit v1.2.1