summaryrefslogtreecommitdiffstats
path: root/kvoctrain/kvoctrain/kvt-core
diff options
context:
space:
mode:
Diffstat (limited to 'kvoctrain/kvoctrain/kvt-core')
-rw-r--r--kvoctrain/kvoctrain/kvt-core/UsageManager.cpp2
-rw-r--r--kvoctrain/kvoctrain/kvt-core/UsageManager.h2
-rw-r--r--kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp32
-rw-r--r--kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp4
-rw-r--r--kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp2
-rw-r--r--kvoctrain/kvoctrain/kvt-core/kvoctraincore.h2
-rw-r--r--kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp4
-rw-r--r--kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h4
-rw-r--r--kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h2
-rw-r--r--kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h6
-rw-r--r--kvoctrain/kvoctrain/kvt-core/langset.cpp4
-rw-r--r--kvoctrain/kvoctrain/kvt-core/langset.h4
12 files changed, 34 insertions, 34 deletions
diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp b/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp
index f1161025..9180d6e4 100644
--- a/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp
@@ -135,7 +135,7 @@ vector<UsageRelation> UsageManager::getRelation ()
}
-bool UsageManager::tqcontains (const TQString& label, const TQString& collection)
+bool UsageManager::contains (const TQString& label, const TQString& collection)
{
TQString s = collection;
int pos;
diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.h b/kvoctrain/kvoctrain/kvt-core/UsageManager.h
index dcbb2ae5..647de685 100644
--- a/kvoctrain/kvoctrain/kvt-core/UsageManager.h
+++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.h
@@ -114,7 +114,7 @@ class UsageManager
UsageManager ();
- static bool tqcontains (const TQString& label, const TQString& collection);
+ static bool contains (const TQString& label, const TQString& collection);
static vector<UsageRelation> getRelation ();
static void setUsageNames (vector<TQString> names);
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
index 8d72ee87..e4906935 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
@@ -138,42 +138,42 @@ bool kvoctrainDoc::loadFromCsv (TQTextStream& is)
// autodetect utf8
if (!utf8_mode) {
for (int i = 0; !utf8_mode && i < (int) s.length(); ++i) {
- ushort trigger = s[i].tqunicode();
+ ushort trigger = s[i].unicode();
if (trigger >= 0x80) {
int remain = s.length() - i;
if ((trigger & 0xE0) == 0xC0){ // 110x xxxx
if ( (remain > 1)
- && (s[i+1].tqunicode() & 0xC0) == 0x80)
+ && (s[i+1].unicode() & 0xC0) == 0x80)
utf8_mode = true;
}
else if ((trigger & 0xF0) == 0xE0) { // 1110 xxxx
if ( remain > 2
- && s[i+1].tqunicode() & 0xC0 == 0x80
- && s[i+2].tqunicode() & 0xC0 == 0x80)
+ && s[i+1].unicode() & 0xC0 == 0x80
+ && s[i+2].unicode() & 0xC0 == 0x80)
utf8_mode = true;
}
else if ((trigger & 0xF8) == 0xF0) { // 1111 0xxx
if ( remain > 3
- && s[i+1].tqunicode() & 0xC0 == 0x80
- && s[i+2].tqunicode() & 0xC0 == 0x80
- && s[i+3].tqunicode() & 0xC0 == 0x80)
+ && s[i+1].unicode() & 0xC0 == 0x80
+ && s[i+2].unicode() & 0xC0 == 0x80
+ && s[i+3].unicode() & 0xC0 == 0x80)
utf8_mode = true;
}
else if ((trigger & 0xFC) == 0xF8) { // 1111 10xx
if ( remain > 4
- && s[i+1].tqunicode() & 0xC0 == 0x80
- && s[i+2].tqunicode() & 0xC0 == 0x80
- && s[i+3].tqunicode() & 0xC0 == 0x80
- && s[i+4].tqunicode() & 0xC0 == 0x80)
+ && s[i+1].unicode() & 0xC0 == 0x80
+ && s[i+2].unicode() & 0xC0 == 0x80
+ && s[i+3].unicode() & 0xC0 == 0x80
+ && s[i+4].unicode() & 0xC0 == 0x80)
utf8_mode = true;
}
else if ((trigger & 0xFE) == 0xFC) { // 1111 110x
if ( remain > 5
- && s[i+1].tqunicode() & 0xC0 == 0x80
- && s[i+2].tqunicode() & 0xC0 == 0x80
- && s[i+3].tqunicode() & 0xC0 == 0x80
- && s[i+4].tqunicode() & 0xC0 == 0x80
- && s[i+5].tqunicode() & 0xC0 == 0x80)
+ && s[i+1].unicode() & 0xC0 == 0x80
+ && s[i+2].unicode() & 0xC0 == 0x80
+ && s[i+3].unicode() & 0xC0 == 0x80
+ && s[i+4].unicode() & 0xC0 == 0x80
+ && s[i+5].unicode() & 0xC0 == 0x80)
utf8_mode = true;
}
}
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
index 3d635cfe..f07e906d 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
@@ -827,7 +827,7 @@ bool kvoctrainDoc::unknownAttribute (int line, const TQString &name,
TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line);
TQString format = i18n(
- "Your document tqcontains an unknown attribute <%1> " // keep trailing space
+ "Your document contains an unknown attribute <%1> " // keep trailing space
"in tag <%2>.\n"
"Maybe your version of KVocTrain is too old, "
"or the document is damaged.\n"
@@ -851,7 +851,7 @@ void kvoctrainDoc::unknownElement (int line, const TQString &elem )
TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line);
TQString format = i18n(
- "Your document tqcontains an unknown tag <%1>. " // keep trailing space
+ "Your document contains an unknown tag <%1>. " // keep trailing space
"Maybe your version of KVocTrain is too old, "
"or the document is damaged.\n"
"Loading is aborted because KVocTrain cannot "
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
index 5b8e229f..7cce072b 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
@@ -96,7 +96,7 @@ bool kvoctrainDoc::loadFromVoc(TQTextStream& is)
while (c < 2)
{
temp = is.readLine();
- c+= temp.tqcontains("\",");
+ c+= temp.contains("\",");
expression.append(temp);
if (c < 2)
expression.append(" ");
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h b/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h
index c0c48055..365882c6 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h
@@ -45,7 +45,7 @@
#define CFG_FFAMILY "FontFamily"
#define CFG_FCHARSET "FontCharSet"
#define CFG_SHOW_TOOLBAR "ShowToolbar"
-#define CFG_SHOW_STATUSBAR "ShowtqStatusbar"
+#define CFG_SHOW_STATUSBAR "ShowStatusbar"
#define CFG_TOOLBAR_POS "ToolBar_Pos"
#define CFG_GENERAL "General"
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
index 8a03fa96..a10aa28a 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
@@ -920,7 +920,7 @@ kvoctrainDoc::FileType kvoctrainDoc::detectFT(const TQString &filename)
TQDataStream is( &f );
- TQ_INT8 c1, c2, c3, c4, c5;
+ Q_INT8 c1, c2, c3, c4, c5;
is >> c1
>> c2
>> c3
@@ -949,7 +949,7 @@ kvoctrainDoc::FileType kvoctrainDoc::detectFT(const TQString &filename)
if (line == LEX_IDENT_50)
return vt_lex;
- if (c1 == '"' && (line.tqcontains('"') == 1 || line.tqcontains(TQRegExp("\",[0-9]"))))
+ if (c1 == '"' && (line.contains('"') == 1 || line.contains(TQRegExp("\",[0-9]"))))
return vt_voc;
return csv;
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h
index c44abf72..c331aac0 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h
@@ -237,7 +237,7 @@
#define KV_CON_P3PF "p3f" // 3. person plural female
#define KV_CON_P3PM "p3m" // 3. person plural male
#define KV_CON_P3PN "p3n" // 3. person plural natural
-#define KV_CONJ_COMMON "common" // female tqcontains common for all three
+#define KV_CONJ_COMMON "common" // female contains common for all three
#define LEX_IDENT_50 "Vocabulary Trainer V5.0"
@@ -247,7 +247,7 @@ class TQStringList;
class MultipleChoice;
/*************************************************************
- * This class tqcontains the expressions of your vocabulary
+ * This class contains the expressions of your vocabulary
************************************************************/
class kvoctrainDoc : public QObject
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h
index 490a498b..f31cd1e9 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h
@@ -67,7 +67,7 @@ typedef signed char grade_t;
typedef unsigned short count_t;
/***************************************************************
- * This class tqcontains one expression as original or in one
+ * This class contains one expression as original or in one
* translations
**************************************************************/
diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h
index c9664f2c..2c95a515 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h
@@ -23,7 +23,7 @@ using namespace std;
class KOXML_OSTREAM;
/**
* The XMLWriter class provides support for writing XML streams.
- * It tqcontains methods for output XML elements with attributes.
+ * It contains methods for output XML elements with attributes.
*
* Sample code:
* <pre>
@@ -32,8 +32,8 @@ class KOXML_OSTREAM;
*
* xml.startTag ("head"); // writes &lt;head&gt;
*
- * // write &lt;tqlayout format="a4" orientation="landscape"&gt;
- * xml.startTag ("tqlayout", false);
+ * // write &lt;layout format="a4" orientation="landscape"&gt;
+ * xml.startTag ("layout", false);
* xml.addAttribute ("format", "a4");
* xml.addAttribute ("orientation", "landscape");
* xml.closeTag (true);
diff --git a/kvoctrain/kvoctrain/kvt-core/langset.cpp b/kvoctrain/kvoctrain/kvt-core/langset.cpp
index 19f6108a..633e6f59 100644
--- a/kvoctrain/kvoctrain/kvt-core/langset.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/langset.cpp
@@ -212,9 +212,9 @@ void LangSet::setPixMapFile (const TQString & s, int index)
langs[index].PixMapFile = s;
}
-void LangSet::setKeyboardLayout(const TQString& tqlayout, int index)
+void LangSet::setKeyboardLayout(const TQString& layout, int index)
{
if (index < (int) langs.size()) {
- langs[index].keyboardLayout = tqlayout;
+ langs[index].keyboardLayout = layout;
}
}
diff --git a/kvoctrain/kvoctrain/kvt-core/langset.h b/kvoctrain/kvoctrain/kvt-core/langset.h
index 39886b15..526f330d 100644
--- a/kvoctrain/kvoctrain/kvt-core/langset.h
+++ b/kvoctrain/kvoctrain/kvt-core/langset.h
@@ -64,13 +64,13 @@ class LangSet
int indexShortId (TQString shortId) const;
int indexLongId (TQString longId) const;
int indexPixMapFile (TQString PixMapFile) const;
- // doesn't make sense for keyboard tqlayouts since there is no 1-to-1 relation to languages
+ // doesn't make sense for keyboard layouts since there is no 1-to-1 relation to languages
void setShortId (const TQString & shortId, int index);
void setShortId2 (const TQString & shortId2, int index);
void setLongId (const TQString & longId, int index);
void setPixMapFile (const TQString & PixMapFile, int index);
- void setKeyboardLayout(const TQString & tqlayout, int index);
+ void setKeyboardLayout(const TQString & layout, int index);
TQString findShortId (const TQString & longId) const;
TQString findLongId (const TQString & shortId) const;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 17:34:07 +0000