From 8cc6ae08fc114bf7b1987c51441cf75414428729 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 13 Apr 2012 00:14:02 -0500 Subject: [PATCH] Fix inadvertent "TQ" changes. (cherry picked from commit c3f2c830d0394a175f308b1866b09143e28b2fe0) --- kanagram/src/keduvocdocument.h | 4 +-- kanagram/src/keduvockvtmlreader.cpp | 4 +-- kanagram/src/keduvockvtmlwriter.cpp | 10 +++---- kig/filters/kgeo-resource.h | 2 +- kig/filters/kseg-defs.h | 6 ++-- kstars/kstars/indi/skycommander.c | 2 +- kstars/kstars/indi/webcam/pwc-ioctl.h | 4 +-- kstars/kstars/indi/webcam/v4l1_pwc.cpp | 4 +-- kstars/kstars/indi/webcam/v4l2_base.cpp | 30 +++++++++---------- kstars/kstars/indi/webcam/videodev2.h | 18 +++++------ .../kvoctrain/common-dialogs/queryoptions.h | 4 +-- .../entry-dialogs/PhoneticEntryPage.cpp | 2 +- kvoctrain/kvoctrain/kv_resource.h | 4 +-- kvoctrain/kvoctrain/kva_config.cpp | 4 +-- kvoctrain/kvoctrain/kva_header.cpp | 20 ++++++------- kvoctrain/kvoctrain/kva_query.cpp | 8 ++--- kvoctrain/kvoctrain/kvoctrain.cpp | 12 ++++---- .../kvoctrain/kvt-core/kvd_rb_kvtml1.cpp | 2 +- kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp | 2 +- kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp | 10 +++---- kvoctrain/kvoctrain/kvt-core/kvoctraincore.h | 14 ++++----- kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h | 4 +-- kwordquiz/src/kwordquiz.cpp | 2 +- kwordquiz/src/kwordquiz.h | 6 ++-- kwordquiz/src/kwordquizdoc.h | 6 ++-- kwordquiz/src/kwordquizprefs.h | 4 +-- kwordquiz/src/kwordquizview.cpp | 8 ++--- kwordquiz/src/kwordquizview.h | 8 ++--- kwordquiz/src/prefquiz.h | 4 +-- kwordquiz/src/wqundo.h | 6 ++-- 30 files changed, 107 insertions(+), 107 deletions(-) diff --git a/kanagram/src/keduvocdocument.h b/kanagram/src/keduvocdocument.h index b84430bb..0b58d5b5 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_TQUERY "q" // query: org or translation +#define KV_QUERY "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_TQUERY "query" // lesson contained in query +#define KV_LESS_QUERY "query" // lesson contained in query #define KV_LESS_NO "no" // lesson descriptor number /* diff --git a/kanagram/src/keduvockvtmlreader.cpp b/kanagram/src/keduvockvtmlreader.cpp index 80ee39c6..799079a6 100644 --- a/kanagram/src/keduvockvtmlreader.cpp +++ b/kanagram/src/keduvockvtmlreader.cpp @@ -78,7 +78,7 @@ bool KEduVocKvtmlReader::readLesson(TQDomElement &domElementParent) if (isCurr && no != 0) m_doc->setCurrentLesson(no); - TQDomAttr domAttrQuery = domElementChild.attributeNode(KV_LESS_TQUERY); + TQDomAttr domAttrQuery = domElementChild.attributeNode(KV_LESS_QUERY); if (!domAttrQuery.isNull()) m_doc->lessons_in_query.push_back(domAttrQuery.value().toInt() != 0); else @@ -941,7 +941,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement pronunce = domAttrPronunce.value(); query_id = ""; - TQDomAttr domAttrQuery = domElementExpressionChild.attributeNode(KV_TQUERY); + TQDomAttr domAttrQuery = domElementExpressionChild.attributeNode(KV_QUERY); if (!domAttrQuery.isNull()) query_id = domAttrQuery.value(); diff --git a/kanagram/src/keduvockvtmlwriter.cpp b/kanagram/src/keduvockvtmlwriter.cpp index 91f3e81e..8cb96cc6 100644 --- a/kanagram/src/keduvockvtmlwriter.cpp +++ b/kanagram/src/keduvockvtmlwriter.cpp @@ -126,7 +126,7 @@ bool KEduVocKvtmlWriter::saveLessonKvtMl (TQDomDocument &domDoc, TQDomElement &d if (m_doc->getCurrentLesson() == lfn+1) domElementDesc.setAttribute (KV_LESS_CURR, 1); if (lfn < (int) m_doc->lessons_in_query.size() && m_doc->lessons_in_query[lfn]) - domElementDesc.setAttribute (KV_LESS_TQUERY, 1); + domElementDesc.setAttribute (KV_LESS_QUERY, 1); domElementDesc.appendChild(domTextDesc); domElementLesson.appendChild(domElementDesc); @@ -746,9 +746,9 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const TQString &generato s = "original"; domElementOriginal.setAttribute (KV_LANG, s); if (s == q_org) - domElementOriginal.setAttribute(KV_TQUERY, (TQString) KV_O); + domElementOriginal.setAttribute(KV_QUERY, (TQString) KV_O); else if (s == q_trans) - domElementOriginal.setAttribute(KV_TQUERY, (TQString) KV_T); + domElementOriginal.setAttribute(KV_QUERY, (TQString) KV_T); } @@ -825,9 +825,9 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const TQString &generato } domElementTranslation.setAttribute(KV_LANG, s); if (s == q_org) - domElementTranslation.setAttribute(KV_TQUERY, (TQString) KV_O); + domElementTranslation.setAttribute(KV_QUERY, (TQString) KV_O); else if (s == q_trans) - domElementTranslation.setAttribute(KV_TQUERY, (TQString) KV_T); + domElementTranslation.setAttribute(KV_QUERY, (TQString) KV_T); } TQString s1, s2; diff --git a/kig/filters/kgeo-resource.h b/kig/filters/kgeo-resource.h index 9a392ac8..f7af0f64 100644 --- a/kig/filters/kgeo-resource.h +++ b/kig/filters/kgeo-resource.h @@ -71,7 +71,7 @@ #define ID_FILE_PRINT 10080 -#define ID_FILE_TQUIT 10090 +#define ID_FILE_QUIT 10090 /////////////////////////////////////////////////////////////////// // Edit-menu entries diff --git a/kig/filters/kseg-defs.h b/kig/filters/kseg-defs.h index 5319afaf..c9a57447 100644 --- a/kig/filters/kseg-defs.h +++ b/kig/filters/kseg-defs.h @@ -61,7 +61,7 @@ inline int SIGN(double x) { return (x < 0) ? -1 : 1; } inline int INTRAND(int a, int b) { return TQMIN(a, b) + rand() % abs(a - b); } #define SQR(x) ((x) * (x)) #define CUBE(x) ((x) * (x) * (x)) -#define TQUAD(x) (((x) * (x)) * ((x) * (x))) +#define QUAD(x) (((x) * (x)) * ((x) * (x))) enum G_Type { @@ -254,9 +254,9 @@ enum MenuIDs ID_CONSTRUCTION_MAKE_INITIAL, ID_CONSTRUCTION_RECURSE, - ID_PLAY_TQUICKPLAY, + ID_PLAY_QUICKPLAY, - ID_TQUICKPLAY_SET_DIRECTORY, + ID_QUICKPLAY_SET_DIRECTORY, ID_FILE_RECENTLIST_START //should be the last entry }; diff --git a/kstars/kstars/indi/skycommander.c b/kstars/kstars/indi/skycommander.c index 6bf23437..261b6808 100644 --- a/kstars/kstars/indi/skycommander.c +++ b/kstars/kstars/indi/skycommander.c @@ -54,7 +54,7 @@ INumber eq[] = { {"DEC", "Dec D:M:S", "%10.6m", -90., 90., 0., 0., 0, 0, 0}, }; INumberVectorProperty eqNum = { - mydev, "ETQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RO, 0, IPS_IDLE, + mydev, "EQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RO, 0, IPS_IDLE, eq, NARRAY(eq), "", 0}; diff --git a/kstars/kstars/indi/webcam/pwc-ioctl.h b/kstars/kstars/indi/webcam/pwc-ioctl.h index 6df68780..9b650298 100644 --- a/kstars/kstars/indi/webcam/pwc-ioctl.h +++ b/kstars/kstars/indi/webcam/pwc-ioctl.h @@ -121,9 +121,9 @@ struct pwc_leds the preferred mode is not available. */ /* Set preferred compression quality (0 = uncompressed, 3 = highest compression) */ -#define VIDIOCPWCSCTQUAL _IOW('v', 195, int) +#define VIDIOCPWCSCQUAL _IOW('v', 195, int) /* Get preferred compression quality */ -#define VIDIOCPWCGCTQUAL _IOR('v', 195, int) +#define VIDIOCPWCGCQUAL _IOR('v', 195, int) /* This is a probe function; since so many devices are supported, it diff --git a/kstars/kstars/indi/webcam/v4l1_pwc.cpp b/kstars/kstars/indi/webcam/v4l1_pwc.cpp index f87d9c82..9f644885 100644 --- a/kstars/kstars/indi/webcam/v4l1_pwc.cpp +++ b/kstars/kstars/indi/webcam/v4l1_pwc.cpp @@ -259,13 +259,13 @@ int V4L1_PWC::setExposure(int val, char *errmsg) void V4L1_PWC::setCompression(int val) { - ioctl(fd, VIDIOCPWCSCTQUAL, &val); + ioctl(fd, VIDIOCPWCSCQUAL, &val); } int V4L1_PWC::getCompression() { int gain; - ioctl(fd, VIDIOCPWCGCTQUAL , &gain); + ioctl(fd, VIDIOCPWCGCQUAL , &gain); if (gain < 0) gain*=-1; return gain; } diff --git a/kstars/kstars/indi/webcam/v4l2_base.cpp b/kstars/kstars/indi/webcam/v4l2_base.cpp index a4ba8d72..1c2a184c 100644 --- a/kstars/kstars/indi/webcam/v4l2_base.cpp +++ b/kstars/kstars/indi/webcam/v4l2_base.cpp @@ -453,8 +453,8 @@ int V4L2_Base::init_mmap(char *errmsg) buf.memory = V4L2_MEMORY_MMAP; buf.index = n_buffers; - if (-1 == xioctl (fd, VIDIOC_TQUERYBUF, &buf)) - return errno_exit ("VIDIOC_TQUERYBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_QUERYBUF, &buf)) + return errno_exit ("VIDIOC_QUERYBUF", errmsg); buffers[n_buffers].length = buf.length; buffers[n_buffers].start = @@ -514,7 +514,7 @@ int V4L2_Base::init_device(char *errmsg, int pixelFormat , int width, int height { unsigned int min; - if (-1 == xioctl (fd, VIDIOC_TQUERYCAP, &cap)) + if (-1 == xioctl (fd, VIDIOC_QUERYCAP, &cap)) { if (EINVAL == errno) { fprintf (stderr, "%s is no V4L2 device\n", @@ -522,7 +522,7 @@ int V4L2_Base::init_device(char *errmsg, int pixelFormat , int width, int height snprintf(errmsg, ERRMSGSIZ, "%s is no V4L2 device\n", dev_name); return -1; } else { - return errno_exit ("VIDIOC_TQUERYCAP", errmsg); + return errno_exit ("VIDIOC_QUERYCAP", errmsg); } } @@ -953,7 +953,7 @@ void V4L2_Base::enumerate_ctrl (void) for (queryctrl.id = V4L2_CID_BASE; queryctrl.id < V4L2_CID_LASTP1; queryctrl.id++) { - if (0 == xioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) + if (0 == xioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) { cerr << "Control " << queryctrl.name << endl; @@ -969,14 +969,14 @@ void V4L2_Base::enumerate_ctrl (void) if (errno == EINVAL) continue; - errno_exit("VIDIOC_TQUERYCTRL", errmsg); + errno_exit("VIDIOC_QUERYCTRL", errmsg); return; } } for (queryctrl.id = V4L2_CID_PRIVATE_BASE; ; queryctrl.id++) { - if (0 == xioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) + if (0 == xioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) { cerr << "Private Control " << queryctrl.name << endl; @@ -989,7 +989,7 @@ void V4L2_Base::enumerate_ctrl (void) if (errno == EINVAL) break; - errno_exit ("VIDIOC_TQUERYCTRL", errmsg); + errno_exit ("VIDIOC_QUERYCTRL", errmsg); return; } @@ -1007,12 +1007,12 @@ void V4L2_Base::enumerate_menu (void) for (querymenu.index = queryctrl.minimum; querymenu.index <= queryctrl.maximum; querymenu.index++) { - if (0 == xioctl (fd, VIDIOC_TQUERYMENU, &querymenu)) + if (0 == xioctl (fd, VIDIOC_QUERYMENU, &querymenu)) { cerr << " " << querymenu.name << endl; } else { - errno_exit("VIDIOC_TQUERYMENU", errmsg); + errno_exit("VIDIOC_QUERYMENU", errmsg); return; } } @@ -1027,10 +1027,10 @@ int V4L2_Base::query_ctrl(unsigned int ctrl_id, double & ctrl_min, double & ctr queryctrl.id = ctrl_id; - if (-1 == ioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) + if (-1 == ioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) { if (errno != EINVAL) - return errno_exit ("VIDIOC_TQUERYCTRL", errmsg); + return errno_exit ("VIDIOC_QUERYCTRL", errmsg); else { @@ -1074,7 +1074,7 @@ int V4L2_Base::queryINTControls(INumberVectorProperty *nvp) for (queryctrl.id = V4L2_CID_BASE; queryctrl.id < V4L2_CID_LASTP1; queryctrl.id++) { - if (0 == ioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) + if (0 == ioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) { if (queryctrl.flags & V4L2_CTRL_FLAG_DISABLED) { @@ -1113,13 +1113,13 @@ int V4L2_Base::queryINTControls(INumberVectorProperty *nvp) } } else if (errno != EINVAL) - return errno_exit ("VIDIOC_TQUERYCTRL", errmsg); + return errno_exit ("VIDIOC_QUERYCTRL", errmsg); } for (queryctrl.id = V4L2_CID_PRIVATE_BASE; ; queryctrl.id++) { - if (0 == ioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) + if (0 == ioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) { if (queryctrl.flags & V4L2_CTRL_FLAG_DISABLED) { diff --git a/kstars/kstars/indi/webcam/videodev2.h b/kstars/kstars/indi/webcam/videodev2.h index b6a05dbd..27e2f74e 100644 --- a/kstars/kstars/indi/webcam/videodev2.h +++ b/kstars/kstars/indi/webcam/videodev2.h @@ -388,7 +388,7 @@ struct v4l2_buffer /* Flags for 'flags' field */ #define V4L2_BUF_FLAG_MAPPED 0x0001 /* Buffer is mapped (flag) */ -#define V4L2_BUF_FLAG_TQUEUED 0x0002 /* Buffer is queued for processing */ +#define V4L2_BUF_FLAG_QUEUED 0x0002 /* Buffer is queued for processing */ #define V4L2_BUF_FLAG_DONE 0x0004 /* Buffer is ready */ #define V4L2_BUF_FLAG_KEYFRAME 0x0008 /* Image is a keyframe (I-frame) */ #define V4L2_BUF_FLAG_PFRAME 0x0010 /* Image is a P-frame */ @@ -448,7 +448,7 @@ struct v4l2_captureparm __u32 reserved[4]; }; /* Flags for 'capability' and 'capturemode' fields */ -#define V4L2_MODE_HIGHTQUALITY 0x0001 /* High quality imaging mode */ +#define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */ #define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */ struct v4l2_outputparm @@ -624,7 +624,7 @@ struct v4l2_control __s32 value; }; -/* Used in the VIDIOC_TQUERYCTRL ioctl for querying controls */ +/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ struct v4l2_queryctrl { __u32 id; @@ -638,7 +638,7 @@ struct v4l2_queryctrl __u32 reserved[2]; }; -/* Used in the VIDIOC_TQUERYMENU ioctl for querying menu items */ +/* Used in the VIDIOC_QUERYMENU ioctl for querying menu items */ struct v4l2_querymenu { __u32 id; @@ -829,7 +829,7 @@ struct v4l2_streamparm * I O C T L C O D E S F O R V I D E O D E V I C E S * */ -#define VIDIOC_TQUERYCAP _IOR ('V', 0, struct v4l2_capability) +#define VIDIOC_QUERYCAP _IOR ('V', 0, struct v4l2_capability) #define VIDIOC_RESERVED _IO ('V', 1) #define VIDIOC_ENUM_FMT _IOWR ('V', 2, struct v4l2_fmtdesc) #define VIDIOC_G_FMT _IOWR ('V', 4, struct v4l2_format) @@ -839,7 +839,7 @@ struct v4l2_streamparm #define VIDIOC_S_COMP _IOW ('V', 7, struct v4l2_compression) #endif #define VIDIOC_RETQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers) -#define VIDIOC_TQUERYBUF _IOWR ('V', 9, struct v4l2_buffer) +#define VIDIOC_QUERYBUF _IOWR ('V', 9, struct v4l2_buffer) #define VIDIOC_G_FBUF _IOR ('V', 10, struct v4l2_framebuffer) #define VIDIOC_S_FBUF _IOW ('V', 11, struct v4l2_framebuffer) #define VIDIOC_OVERLAY _IOW ('V', 14, int) @@ -859,8 +859,8 @@ struct v4l2_streamparm #define VIDIOC_S_TUNER _IOW ('V', 30, struct v4l2_tuner) #define VIDIOC_G_AUDIO _IOR ('V', 33, struct v4l2_audio) #define VIDIOC_S_AUDIO _IOW ('V', 34, struct v4l2_audio) -#define VIDIOC_TQUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl) -#define VIDIOC_TQUERYMENU _IOWR ('V', 37, struct v4l2_querymenu) +#define VIDIOC_QUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl) +#define VIDIOC_QUERYMENU _IOWR ('V', 37, struct v4l2_querymenu) #define VIDIOC_G_INPUT _IOR ('V', 38, int) #define VIDIOC_S_INPUT _IOWR ('V', 39, int) #define VIDIOC_G_OUTPUT _IOR ('V', 46, int) @@ -877,7 +877,7 @@ struct v4l2_streamparm #define VIDIOC_S_CROP _IOW ('V', 60, struct v4l2_crop) #define VIDIOC_G_JPEGCOMP _IOR ('V', 61, struct v4l2_jpegcompression) #define VIDIOC_S_JPEGCOMP _IOW ('V', 62, struct v4l2_jpegcompression) -#define VIDIOC_TQUERYSTD _IOR ('V', 63, v4l2_std_id) +#define VIDIOC_QUERYSTD _IOR ('V', 63, v4l2_std_id) #define VIDIOC_TRY_FMT _IOWR ('V', 64, struct v4l2_format) #define VIDIOC_ENUMAUDIO _IOWR ('V', 65, struct v4l2_audio) #define VIDIOC_ENUMAUDOUT _IOWR ('V', 66, struct v4l2_audioout) diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptions.h b/kvoctrain/kvoctrain/common-dialogs/queryoptions.h index 19e6e2fa..8699c9a7 100644 --- a/kvoctrain/kvoctrain/common-dialogs/queryoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/queryoptions.h @@ -23,8 +23,8 @@ * * ***************************************************************************/ -#ifndef TQUERYOPTIONS_H -#define TQUERYOPTIONS_H +#ifndef QUERYOPTIONS_H +#define QUERYOPTIONS_H #include "queryoptionsbase.h" diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp index 78554297..4f086cb2 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp @@ -116,7 +116,7 @@ KV_Unicode_Ref kv_unicode_ref[] = { {0x0282, "LATIN SMALL LETTER S WITH HOOK", I18N_NOOP_maybe("voiceless retroflex fricative")}, {0x0283, "LATIN SMALL LETTER ESH", I18N_NOOP_maybe("voiceless postalveolar fricative")}, {0x0284, "LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK", I18N_NOOP_maybe("implosive palatal stop")}, - {0x0285, "LATIN SMALL LETTER STQUAT REVERSED ESH", I18N_NOOP_maybe("apical retroflex vowel")}, + {0x0285, "LATIN SMALL LETTER SQUAT REVERSED ESH", I18N_NOOP_maybe("apical retroflex vowel")}, {0x0286, "LATIN SMALL LETTER ESH WITH CURL", I18N_NOOP_maybe("palatalized voiceless postalveolar fricative")}, {0x0287, "LATIN SMALL LETTER TURNED T", I18N_NOOP_maybe("dental click")}, {0x0288, "LATIN SMALL LETTER T WITH RETROFLEX HOOK", I18N_NOOP_maybe("voiceless retroflex stop")}, diff --git a/kvoctrain/kvoctrain/kv_resource.h b/kvoctrain/kvoctrain/kv_resource.h index 59318424..6f704913 100644 --- a/kvoctrain/kvoctrain/kv_resource.h +++ b/kvoctrain/kvoctrain/kv_resource.h @@ -51,7 +51,7 @@ static const char *IDS_DEFAULT = I18N_NOOP("Ready."); #define IDH_NULL 0 #define IDH_REMOVE 1 #define IDH_APPEND 2 -#define IDH_START_TQUERY 3 +#define IDH_START_QUERY 3 #define IDH_RESET_GRADE 4 #define IDH_CREATE_LESSON 5 #define IDH_SET_LANG 6 @@ -65,7 +65,7 @@ static const char *IDS_DEFAULT = I18N_NOOP("Ready."); #define IDH_START_ANTONYM 14 #define IDH_START_EXAMPLE 15 #define IDH_START_PARAPHRASE 16 -#define ID_RESUME_TQUERY 13070 +#define ID_RESUME_QUERY 13070 #define ID_RESUME_MULTIPLE 13110 diff --git a/kvoctrain/kvoctrain/kva_config.cpp b/kvoctrain/kvoctrain/kva_config.cpp index c5ebcfc3..a04ed0ca 100644 --- a/kvoctrain/kvoctrain/kva_config.cpp +++ b/kvoctrain/kvoctrain/kva_config.cpp @@ -123,7 +123,7 @@ void kvoctrainApp::saveProperties(KConfig *config ) config->writeEntry(CFG_TITLE,doc->getTitle()); config->writeEntry(CFG_MODIFIED,doc->isModified()); - config->writeEntry(CFG_TQUERYMODE, querymode); + config->writeEntry(CFG_QUERYMODE, querymode); TQString filename=doc->URL().path(); TQString tempname = kapp->tempSaveName(filename); @@ -135,7 +135,7 @@ void kvoctrainApp::saveProperties(KConfig *config ) void kvoctrainApp::readProperties(KConfig *config) { - querymode = config->readBoolEntry(CFG_TQUERYMODE, 0); + querymode = config->readBoolEntry(CFG_QUERYMODE, 0); TQString filename = config->readEntry(CFG_FILENAME); TQString title = config->readEntry(CFG_TITLE); diff --git a/kvoctrain/kvoctrain/kva_header.cpp b/kvoctrain/kvoctrain/kva_header.cpp index 54f7a7ee..04988b9b 100644 --- a/kvoctrain/kvoctrain/kva_header.cpp +++ b/kvoctrain/kvoctrain/kva_header.cpp @@ -95,10 +95,10 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ header_m = new TQPopupMenu(); if (header != KV_COL_ORG - KV_EXTRA_COLS ) { - header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), (header << 16) | IDH_START_TQUERY); + header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), (header << 16) | IDH_START_QUERY); header_m->insertItem(SmallIconSet("run_multi"), i18n("Create &Multiple Choice"), (header << 16) | IDH_START_MULTIPLE); header_m->setItemEnabled((header << 16) | IDH_START_MULTIPLE, doc->numLangs() > 1); - header_m->setItemEnabled((header << 16) | IDH_START_TQUERY, doc->numLangs() > 1); + header_m->setItemEnabled((header << 16) | IDH_START_QUERY, doc->numLangs() > 1); header_m->insertSeparator(); header_m->insertItem(i18n("&Verbs"), (header << 16) | IDH_START_VERB); header_m->insertItem(i18n("&Articles"), (header << 16) | IDH_START_ARTICLE); @@ -135,10 +135,10 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ && !langset.PixMapFile(j).isEmpty() && !langset.longId(j).isEmpty() ) { query_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(names[i-1]), - (i << (16+8)) | IDH_START_TQUERY); // hack: IDs => header-ids + cmd + (i << (16+8)) | IDH_START_QUERY); // hack: IDs => header-ids + cmd } else { - query_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) | IDH_START_TQUERY); + query_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) | IDH_START_QUERY); } } header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL); @@ -238,7 +238,7 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/ case IDH_NULL: break; - case ID_RESUME_TQUERY: + case ID_RESUME_QUERY: slotStatusHelpMsg(i18n("Resumes random query with existing selection")); break; @@ -299,7 +299,7 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/ } break; - case IDH_START_TQUERY: + case IDH_START_QUERY: case IDH_START_MULTIPLE: { TQString to = header1 ? doc->getIdent(header1) : doc->getOriginalIdent(); if (!langset.findLongId(to).isEmpty()) @@ -313,14 +313,14 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/ TQString format; if (doc->numLangs() == 1) { - if (cmd == IDH_START_TQUERY) + if (cmd == IDH_START_QUERY) format = i18n("Creates and starts query to %1"); else format = i18n("Creates and starts multiple choice to %1"); msg = format.arg(to); } else { - if (cmd == IDH_START_TQUERY) + if (cmd == IDH_START_QUERY) format = i18n("Creates and starts query from %1 to %2"); else format = i18n("Creates and starts multiple choice from %1 to %2"); @@ -421,7 +421,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/ case IDH_NULL: break; - case ID_RESUME_TQUERY: + case ID_RESUME_QUERY: queryType = TQT_Random; slotRestartQuery(); break; @@ -455,7 +455,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/ } break; - case IDH_START_TQUERY: + case IDH_START_QUERY: delete randomQueryDlg; randomQueryDlg = 0; queryType = TQT_Random; diff --git a/kvoctrain/kvoctrain/kva_query.cpp b/kvoctrain/kvoctrain/kva_query.cpp index 564566c9..e181936f 100644 --- a/kvoctrain/kvoctrain/kva_query.cpp +++ b/kvoctrain/kvoctrain/kva_query.cpp @@ -36,7 +36,7 @@ #include "query-dialogs/SimpleQueryDlg.h" #include "prefs.h" -#define MAX_TQUERY_TIMEOUT 3 +#define MAX_QUERY_TIMEOUT 3 static const char not_answered[] = I18N_NOOP( @@ -205,7 +205,7 @@ void kvoctrainApp::slotTimeOutProperty(QueryDlgBase::Result res) doc->setModified(); switch (res) { case QueryDlgBase::Timeout: - if (++num_queryTimeout >= MAX_TQUERY_TIMEOUT) { + if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) { slotStopQuery(true); KMessageBox::information(this, i18n(not_answered), kapp->makeStdCaption(i18n("Stopping Query"))); @@ -411,7 +411,7 @@ void kvoctrainApp::slotTimeOutType(QueryDlgBase::Result res) doc->setModified(); switch (res) { case QueryDlgBase::Timeout: - if (++num_queryTimeout >= MAX_TQUERY_TIMEOUT) { + if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) { slotStopQuery(true); KMessageBox::information(this, i18n(not_answered), kapp->makeStdCaption(i18n("Stopping Query"))); @@ -715,7 +715,7 @@ void kvoctrainApp::slotTimeOutQuery(QueryDlgBase::Result res) switch (res) { case QueryDlgBase::Timeout: - if (++num_queryTimeout >= MAX_TQUERY_TIMEOUT) { + if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) { slotStopQuery(true); KMessageBox::information(this, i18n(not_answered), kapp->makeStdCaption(i18n("Stopping Query"))); diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp index c9be7784..31be75df 100644 --- a/kvoctrain/kvoctrain/kvoctrain.cpp +++ b/kvoctrain/kvoctrain/kvoctrain.cpp @@ -1114,11 +1114,11 @@ void kvoctrainApp::aboutToShowLearn() int j; header_m = new TQPopupMenu(); if (header != 0 ) { - header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), (header << 16) | IDH_START_TQUERY); + header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), (header << 16) | IDH_START_QUERY); header_m->insertItem(SmallIconSet("run_multi"), i18n("Create &Multiple Choice"), (header << 16) | IDH_START_MULTIPLE); header_m->setItemEnabled((header << 16) | IDH_START_MULTIPLE, doc->numLangs() > 1); - header_m->setItemEnabled((header << 16) | IDH_START_TQUERY, doc->numLangs() > 1); + header_m->setItemEnabled((header << 16) | IDH_START_QUERY, doc->numLangs() > 1); header_m->insertSeparator(); header_m->insertItem(i18n("&Verbs"), (header << 16) | IDH_START_VERB); @@ -1141,10 +1141,10 @@ void kvoctrainApp::aboutToShowLearn() && !langset.PixMapFile(j).isEmpty() && !langset.longId(j).isEmpty() ) { query_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(main_names[i]), - (i << (16+8)) | IDH_START_TQUERY); // hack: IDs => header-ids + cmd + (i << (16+8)) | IDH_START_QUERY); // hack: IDs => header-ids + cmd } else { - query_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) | IDH_START_TQUERY); + query_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) | IDH_START_QUERY); } } @@ -1197,10 +1197,10 @@ void kvoctrainApp::aboutToShowLearn() } learn_menu->insertSeparator(); - learn_menu->insertItem(SmallIconSet("run_query"), i18n("Resume &Query"), ID_RESUME_TQUERY ); + learn_menu->insertItem(SmallIconSet("run_query"), i18n("Resume &Query"), ID_RESUME_QUERY ); learn_menu->insertItem(SmallIconSet("run_multi"), i18n("Resume &Multiple Choice"), ID_RESUME_MULTIPLE ); - learn_menu->setItemEnabled(ID_RESUME_TQUERY, query_num != 0); + learn_menu->setItemEnabled(ID_RESUME_QUERY, query_num != 0); learn_menu->setItemEnabled(ID_RESUME_MULTIPLE, query_num != 0); } diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp index f1c4bbc3..4a3bdb7b 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp @@ -466,7 +466,7 @@ bool kvoctrainDoc::extract_O_T_attr ( pronunce = (*first).stringValue(); } - else if ((*first).name () == KV_TQUERY) { + else if ((*first).name () == KV_QUERY) { query_id = (*first).stringValue(); } diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp index edaa945f..90cb7cb3 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp @@ -143,7 +143,7 @@ bool kvoctrainDoc::extract_L_DESCR_attr (XmlReader &xml, no = (*first).intValue(); else if ((*first).name () == KV_LESS_CURR) isCurr = (*first).intValue() != 0; - else if ((*first).name () == KV_LESS_TQUERY) + else if ((*first).name () == KV_LESS_QUERY) inQuery = (*first).intValue() != 0; else { if (!unknownAttribute(xml.lineNumber(), "descr", (*first).name ())) diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp index 55e4491f..d30598b1 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp @@ -126,7 +126,7 @@ bool kvoctrainDoc::saveLessonKvtMl (XmlWriter &xml) if (getCurrentLesson() == lfn+1) xml.addAttribute (KV_LESS_CURR, (TQString) "1" ); if (lfn < (int) lessons_in_query.size() && lessons_in_query[lfn]) - xml.addAttribute (KV_LESS_TQUERY, (TQString) "1" ); + xml.addAttribute (KV_LESS_QUERY, (TQString) "1" ); xml.closeTag(); xml.writeText (lesson_descr[lfn]); xml.endTag (KV_LESS_DESC, true); @@ -759,9 +759,9 @@ bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) { s = "original"; xml.addAttribute (KV_LANG, s); if (s == q_org) - xml.addAttribute (KV_TQUERY, (TQString) KV_O); + xml.addAttribute (KV_QUERY, (TQString) KV_O); else if (s == q_trans) - xml.addAttribute (KV_TQUERY, (TQString) KV_T); + xml.addAttribute (KV_QUERY, (TQString) KV_T); } @@ -841,9 +841,9 @@ bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) { } xml.addAttribute (KV_LANG, s); if (s == q_org) - xml.addAttribute (KV_TQUERY, (TQString) KV_O); + xml.addAttribute (KV_QUERY, (TQString) KV_O); else if (s == q_trans) - xml.addAttribute (KV_TQUERY, (TQString) KV_T); + xml.addAttribute (KV_QUERY, (TQString) KV_T); } TQString s1, s2; diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h b/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h index d2403e7a..defdcf2b 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h +++ b/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h @@ -58,8 +58,8 @@ #define CFG_LESSONSIZE "LessonSize" -#define CFG_TQUERYPROP "QueryProperties" -#define CFG_TQUERYMODE "QueryMode" +#define CFG_QUERYPROP "QueryProperties" +#define CFG_QUERYMODE "QueryMode" #define CFG_DEFTRANS "DefaultTranslation" #define CFG_DEFORG "DefaultOriginal" @@ -72,11 +72,11 @@ #define CFG_L_FONT "Font" #define CFG_L_STDFONT "SpecialFont" -#define CFG_TQUERYMANAG "QueryManager" +#define CFG_QUERYMANAG "QueryManager" #define CFG_TQM_DATE_ITEM "DateItem" #define CFG_TQM_DATE_COMP "DateComp" -#define CFG_TQM_TQUERY_ITEM "QueryItem" -#define CFG_TQM_TQUERY_COMP "QueryComp" +#define CFG_TQM_QUERY_ITEM "QueryItem" +#define CFG_TQM_QUERY_COMP "QueryComp" #define CFG_TQM_BAD_ITEM "BadItem" #define CFG_TQM_BAD_COMP "BadComp" #define CFG_TQM_TYPE_ITEM "TypeItem" @@ -88,12 +88,12 @@ #define CFG_TQM_BLOCK_ITEM "BlockItem" #define CFG_TQM_EXPIRE_ITEM "ExpireItem" -#define CFG_TQUERY_PRESETTING "QueryPreSettings" +#define CFG_QUERY_PRESETTING "QueryPreSettings" #define CFG_TQP_NUM "NumPreSetting" #define CFG_TQP_NAME "Name" #define CFG_TQP_THRESH "Threshhold" #define CFG_TQP_BLOCK "Blocking" -#define CFG_TQP_TQUERY "Query" +#define CFG_TQP_QUERY "Query" #define KVTML_EXT "kvtml" #define VT5_LEX_EXT "lex" diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h index 40d83333..fa9b4e31 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h +++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h @@ -59,7 +59,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_TQUERY "q" // query: org or translation +#define KV_QUERY "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 @@ -115,7 +115,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_TQUERY "query" // lesson contained in query +#define KV_LESS_QUERY "query" // lesson contained in query #define KV_LESS_NO "no" // lesson descriptor number /* diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp index 654c21e0..a004094f 100644 --- a/kwordquiz/src/kwordquiz.cpp +++ b/kwordquiz/src/kwordquiz.cpp @@ -52,7 +52,7 @@ #define ID_MODE_1 1 -#define ID_MENU_TQUIZ 1001 +#define ID_MENU_QUIZ 1001 KWordQuizApp::KWordQuizApp(TQWidget* , const char* name):KMainWindow(0, name) { diff --git a/kwordquiz/src/kwordquiz.h b/kwordquiz/src/kwordquiz.h index db923f56..28cd42b4 100644 --- a/kwordquiz/src/kwordquiz.h +++ b/kwordquiz/src/kwordquiz.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KWORDTQUIZ_H -#define KWORDTQUIZ_H +#ifndef KWORDQUIZ_H +#define KWORDQUIZ_H #ifdef HAVE_CONFIG_H @@ -320,4 +320,4 @@ class KWordQuizApp : public KMainWindow void openURL(const KURL& url); }; -#endif // KWORDTQUIZ_H +#endif // KWORDQUIZ_H diff --git a/kwordquiz/src/kwordquizdoc.h b/kwordquiz/src/kwordquizdoc.h index e5bbc4e6..4ac2ba39 100644 --- a/kwordquiz/src/kwordquizdoc.h +++ b/kwordquiz/src/kwordquizdoc.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KWORDTQUIZDOC_H -#define KWORDTQUIZDOC_H +#ifndef KWORDQUIZDOC_H +#define KWORDQUIZDOC_H #ifdef HAVE_CONFIG_H #include @@ -93,4 +93,4 @@ class KWordQuizDoc : public TQObject KWordQuizView *m_view; }; -#endif // KWORDTQUIZDOC_H +#endif // KWORDQUIZDOC_H diff --git a/kwordquiz/src/kwordquizprefs.h b/kwordquiz/src/kwordquizprefs.h index 984ab375..214111a0 100644 --- a/kwordquiz/src/kwordquizprefs.h +++ b/kwordquiz/src/kwordquizprefs.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KWORDTQUIZPREFS_H -#define KWORDTQUIZPREFS_H +#ifndef KWORDQUIZPREFS_H +#define KWORDQUIZPREFS_H #include diff --git a/kwordquiz/src/kwordquizview.cpp b/kwordquiz/src/kwordquizview.cpp index bc66055c..bc6acc68 100644 --- a/kwordquiz/src/kwordquizview.cpp +++ b/kwordquiz/src/kwordquizview.cpp @@ -37,7 +37,7 @@ #include "dlgrc.h" #include "dlgspecchar.h" -TQValueList *KWordQuizView::m_undoList = 0L; +TQValueList *KWordQuizView::m_undoList = 0L; KWTQTableItem::KWTQTableItem(TQTable* table, EditType et, const TQString & text) : TQTableItem(table, et, text) {} @@ -58,7 +58,7 @@ int KWTQTableItem::alignment() const KWordQuizView::KWordQuizView(TQWidget *parent, const char *name) : TQTable(parent, name) { if(!m_undoList) - m_undoList = new TQValueList(); + m_undoList = new TQValueList(); setNumCols(2); setNumRows(50); @@ -356,7 +356,7 @@ void KWordQuizView::doEditUndo( ) } else { - WTQUndo undo; + WQUndo undo; if (m_undoList->count() > 0) { setUpdatesEnabled(false); @@ -966,7 +966,7 @@ void KWordQuizView::addUndo( const TQString & caption ) m_undoList->remove(m_undoList->begin()); } - WTQUndo* undo = new WTQUndo(); + WQUndo* undo = new WQUndo(); undo->setText(caption); undo->setFont(font()); undo->setColWidth0(verticalHeader()->width()); diff --git a/kwordquiz/src/kwordquizview.h b/kwordquiz/src/kwordquizview.h index d0cf7466..126762ff 100644 --- a/kwordquiz/src/kwordquizview.h +++ b/kwordquiz/src/kwordquizview.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KWORDTQUIZVIEW_H -#define KWORDTQUIZVIEW_H +#ifndef KWORDQUIZVIEW_H +#define KWORDQUIZVIEW_H #ifdef HAVE_CONFIG_H #include @@ -114,11 +114,11 @@ class KWordQuizView : public TQTable DlgSpecChar* dlgSpecChar; TQWidget * cellEditor; /** the list of the undo objects */ - static TQValueList *m_undoList; + static TQValueList *m_undoList; void doNewPage(TQPainter & painter, int res, int type); void doEndOfPage(TQPainter & painter, int vPos, int pageNum, int res, int type); bool checkForBlank(const TQString & s, bool blank); }; -#endif // KWORDTQUIZVIEW_H +#endif // KWORDQUIZVIEW_H diff --git a/kwordquiz/src/prefquiz.h b/kwordquiz/src/prefquiz.h index df4dc75f..b4ac3790 100644 --- a/kwordquiz/src/prefquiz.h +++ b/kwordquiz/src/prefquiz.h @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef PREFTQUIZ_H -#define PREFTQUIZ_H +#ifndef PREFQUIZ_H +#define PREFQUIZ_H #include "prefquizbase.h" diff --git a/kwordquiz/src/wqundo.h b/kwordquiz/src/wqundo.h index b0d584dd..d9b5e9c7 100644 --- a/kwordquiz/src/wqundo.h +++ b/kwordquiz/src/wqundo.h @@ -13,8 +13,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef WTQUNDO_H -#define WTQUNDO_H +#ifndef WQUNDO_H +#define WQUNDO_H #include @@ -23,7 +23,7 @@ /** @author Peter Hedlund */ -class WTQUndo{ +class WQUndo{ public: TQFont font() const {return m_font;} void setFont(const TQFont & font) {m_font = font;}