summaryrefslogtreecommitdiffstats
path: root/kanagram/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:47:17 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:47:17 -0600
commit6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3 (patch)
treecc90a09df2d1fd6d956cc084529a62d354316ad3 /kanagram/src
parent174fd5e23c68598774706ea9b571d3d178e36b81 (diff)
downloadtdeedu-6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3.tar.gz
tdeedu-6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kanagram/src')
-rw-r--r--kanagram/src/kanagram.cpp2
-rw-r--r--kanagram/src/kanagramgame.cpp2
-rw-r--r--kanagram/src/keduvocdocument.cpp10
-rw-r--r--kanagram/src/keduvockvtmlreader.cpp42
-rw-r--r--kanagram/src/keduvockvtmlwriter.cpp2
-rw-r--r--kanagram/src/leitnersystemview.cpp2
-rw-r--r--kanagram/src/mainsettingswidget.ui6
-rw-r--r--kanagram/src/newstuffwidget.ui2
-rw-r--r--kanagram/src/vocabeditwidget.ui14
-rw-r--r--kanagram/src/vocabsettingswidget.ui4
10 files changed, 43 insertions, 43 deletions
diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp
index 4a6f8787..bc3c8f21 100644
--- a/kanagram/src/kanagram.cpp
+++ b/kanagram/src/kanagram.cpp
@@ -225,7 +225,7 @@ void Kanagram::paintEvent(TQPaintEvent *)
p.setPen(TQPen(black, 3));
//Draw the border of the input box
- TQRect borderRect = m_inputBox->tqgeometry();
+ TQRect borderRect = m_inputBox->geometry();
borderRect.setLeft(borderRect.left() - 2);
borderRect.setTop(borderRect.top() - 2);
borderRect.setWidth(borderRect.width() + 2 * 1);
diff --git a/kanagram/src/kanagramgame.cpp b/kanagram/src/kanagramgame.cpp
index 207e607b..67212168 100644
--- a/kanagram/src/kanagramgame.cpp
+++ b/kanagram/src/kanagramgame.cpp
@@ -48,7 +48,7 @@ void KanagramGame::checkFile()
{
if (!TQFile::exists(locate("appdata", m_filename))) {
TQString msg = i18n("File %1 cannot be found.\n Please ensure that Kanagram is properly installed.")
- .tqarg(m_filename);
+ .arg(m_filename);
KMessageBox::sorry(m_parent, msg, i18n("Error"));
exit(0);
}
diff --git a/kanagram/src/keduvocdocument.cpp b/kanagram/src/keduvocdocument.cpp
index 0354b522..6d4eeaea 100644
--- a/kanagram/src/keduvocdocument.cpp
+++ b/kanagram/src/keduvocdocument.cpp
@@ -107,7 +107,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
TQFile f(tmpfile);
if (!f.open(IO_ReadOnly))
{
- KMessageBox::error(0, i18n("<qt>Cannot open file<br><b>%1</b></qt>").tqarg(url.path()));
+ KMessageBox::error(0, i18n("<qt>Cannot open file<br><b>%1</b></qt>").arg(url.path()));
return false;
}
@@ -163,7 +163,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
// TODO new readers provide an explicite error message
// the two messages should be merged
TQString format = i18n("Could not load \"%1\"\nDo you want to try again?");
- TQString msg = format.tqarg(url.path());
+ TQString msg = format.arg(url.path());
int result = KMessageBox::warningContinueCancel(0, msg,
kapp->makeStdCaption(i18n("I/O Failure")),
i18n("&Retry"));
@@ -211,7 +211,7 @@ bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType f
if (!f.open(IO_WriteOnly))
{
- KMessageBox::error(0, i18n("<qt>Cannot write to file<br><b>%1</b></qt>").tqarg(tmp.path()));
+ KMessageBox::error(0, i18n("<qt>Cannot write to file<br><b>%1</b></qt>").arg(tmp.path()));
return false;
}
@@ -253,7 +253,7 @@ bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType f
// TODO new writers provide an explicite error message
// the two messages should be merged
TQString format = i18n("Could not save \"%1\"\nDo you want to try again?");
- TQString msg = format.tqarg(tmp.path());
+ TQString msg = format.arg(tmp.path());
int result = KMessageBox::warningContinueCancel(0, msg,
kapp->makeStdCaption(i18n("I/O Failure")),
i18n("&Retry"));
@@ -989,7 +989,7 @@ KEduVocDocument::FileType KEduVocDocument::detectFT(const TQString &filename)
line.insert (0, c1);
f.close();
- bool stat = is.tqdevice()->status();
+ bool stat = is.device()->status();
if (stat != IO_Ok)
return kvd_none;
if (c1 == '<' && c2 == '?' && c3 == 'x' && c4 == 'm' && c5 == 'l')
diff --git a/kanagram/src/keduvockvtmlreader.cpp b/kanagram/src/keduvockvtmlreader.cpp
index 44a4772d..c1abc6b6 100644
--- a/kanagram/src/keduvockvtmlreader.cpp
+++ b/kanagram/src/keduvockvtmlreader.cpp
@@ -22,7 +22,7 @@
#include <kmessagebox.h>
#include <tqdom.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include "keduvockvtmlreader.h"
#include "keduvocdocument.h"
@@ -131,7 +131,7 @@ bool KEduVocKvtmlReader::readArticle(TQDomElement &domElementParent)
{
if (domElementEntry.tagName() != KV_ART_ENTRY)
{
- domError(i18n("expected tag <%1>").tqarg(KV_ART_ENTRY));
+ domError(i18n("expected tag <%1>").arg(KV_ART_ENTRY));
return false;
}
@@ -1059,7 +1059,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
if (domElementExpressionChild.tagName() != KV_ORG)
{
// must be preceded by "original"
- domError(i18n("starting tag <%1> is missing").tqarg(KV_ORG));
+ domError(i18n("starting tag <%1> is missing").arg(KV_ORG));
return false;
}
@@ -1139,7 +1139,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
{
if (bConjug)
{
- domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
+ domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
return false;
}
bConjug = true;
@@ -1152,7 +1152,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
{
if (bComparison)
{
- domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
+ domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
return false;
}
bComparison = true;
@@ -1165,7 +1165,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
{
if (bMultipleChoice)
{
- domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
+ domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
return false;
}
bMultipleChoice = true;
@@ -1236,7 +1236,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
if (domElementExpressionChild.tagName() != KV_TRANS)
{
// "original" must be followed by "translations"
- domError(i18n("starting tag <%1> is missing").tqarg(KV_TRANS));
+ domError(i18n("starting tag <%1> is missing").arg(KV_TRANS));
return false;
}
@@ -1317,7 +1317,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
{
if (bConjug)
{
- domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
+ domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
return false;
}
bConjug = true;
@@ -1330,7 +1330,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
{
if (bComparison)
{
- domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
+ domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
return false;
}
bComparison = true;
@@ -1343,7 +1343,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
{
if (bMultipleChoice)
{
- domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
+ domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
return false;
}
bMultipleChoice = true;
@@ -1456,7 +1456,7 @@ if (lines != 0)
{
if (lessgroup)
{
- domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
+ domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
return false;
}
lessgroup = true;
@@ -1468,7 +1468,7 @@ if (lines != 0)
{
if (articlegroup)
{
- domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
+ domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
return false;
}
articlegroup = true;
@@ -1480,7 +1480,7 @@ if (lines != 0)
{
if (conjuggroup)
{
- domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
+ domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
return false;
}
conjuggroup = true;
@@ -1492,7 +1492,7 @@ if (lines != 0)
{
if (optgroup)
{
- domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
+ domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
return false;
}
optgroup = true;
@@ -1504,7 +1504,7 @@ if (lines != 0)
{
if (attrgroup)
{
- domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
+ domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
return false;
}
attrgroup = true;
@@ -1516,7 +1516,7 @@ if (lines != 0)
{
if (tensegroup)
{
- domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
+ domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
return false;
}
tensegroup = true;
@@ -1528,7 +1528,7 @@ if (lines != 0)
{
if (usagegroup)
{
- domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
+ domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
return false;
}
usagegroup = true;
@@ -1590,7 +1590,7 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc)
if( domElementKvtml.tagName() != KV_DOCTYPE )
{
domError(i18n("Tag <%1> was expected "
- "but tag <%2> was read." ).tqarg(KV_DOCTYPE).tqarg(domElementKvtml.tagName()));
+ "but tag <%2> was read." ).arg(KV_DOCTYPE).arg(domElementKvtml.tagName()));
return false;
}
@@ -1667,7 +1667,7 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc)
void KEduVocKvtmlReader::domErrorUnknownElement(const TQString &elem)
{
- TQString ln = i18n("File:\t%1\n").tqarg(m_doc->URL().path());
+ TQString ln = i18n("File:\t%1\n").arg(m_doc->URL().path());
TQString format = i18n(
"Your document contains an unknown tag <%1>. " // keep trailing space
@@ -1676,7 +1676,7 @@ void KEduVocKvtmlReader::domErrorUnknownElement(const TQString &elem)
"Loading is aborted because KVocTrain cannot "
"read documents with unknown elements.\n"
);
- TQString msg = format.tqarg(elem);
+ TQString msg = format.arg(elem);
TQApplication::setOverrideCursor( arrowCursor, true );
TQString s = kapp->makeStdCaption(i18n("Unknown Element"));
KMessageBox::sorry(0, ln+msg, s);
@@ -1687,7 +1687,7 @@ void KEduVocKvtmlReader::domError(const TQString &text )
{
TQApplication::setOverrideCursor( arrowCursor, true );
TQString s = kapp->makeStdCaption(i18n("Error"));
- TQString ln = i18n("File:\t%1\n").tqarg(m_doc->URL().path());
+ TQString ln = i18n("File:\t%1\n").arg(m_doc->URL().path());
TQString msg = text;
KMessageBox::error(0, ln+msg, s);
TQApplication::restoreOverrideCursor();
diff --git a/kanagram/src/keduvockvtmlwriter.cpp b/kanagram/src/keduvockvtmlwriter.cpp
index 91f3e81e..760e68fa 100644
--- a/kanagram/src/keduvockvtmlwriter.cpp
+++ b/kanagram/src/keduvockvtmlwriter.cpp
@@ -18,7 +18,7 @@
#include <kdebug.h>
#include <tqdom.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include "keduvockvtmlwriter.h"
#include "keduvocdocument.h"
diff --git a/kanagram/src/leitnersystemview.cpp b/kanagram/src/leitnersystemview.cpp
index 1b8fc961..cbbb0400 100644
--- a/kanagram/src/leitnersystemview.cpp
+++ b/kanagram/src/leitnersystemview.cpp
@@ -116,7 +116,7 @@ void LeitnerSystemView::setSystem(LeitnerSystem* leitnersystem)
//calculate the new sizes
calculateSize();
updateContents();
- //tqrepaint
+ //repaint
//update();
//TQPainter* p = new TQPainter(this);
//drawContents( p, 0, 0, 0, 0 );
diff --git a/kanagram/src/mainsettingswidget.ui b/kanagram/src/mainsettingswidget.ui
index b8d29ccb..285d6d64 100644
--- a/kanagram/src/mainsettingswidget.ui
+++ b/kanagram/src/mainsettingswidget.ui
@@ -86,7 +86,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -114,7 +114,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -165,7 +165,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>16</height>
diff --git a/kanagram/src/newstuffwidget.ui b/kanagram/src/newstuffwidget.ui
index 55163cdd..1b45c449 100644
--- a/kanagram/src/newstuffwidget.ui
+++ b/kanagram/src/newstuffwidget.ui
@@ -41,7 +41,7 @@ the button to get new vocabulary files.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kanagram/src/vocabeditwidget.ui b/kanagram/src/vocabeditwidget.ui
index 370c7120..32104c5f 100644
--- a/kanagram/src/vocabeditwidget.ui
+++ b/kanagram/src/vocabeditwidget.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<grid>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -55,7 +55,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@@ -63,7 +63,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<grid>
<property name="name">
@@ -111,7 +111,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -119,7 +119,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@@ -161,7 +161,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<grid>
<property name="name">
diff --git a/kanagram/src/vocabsettingswidget.ui b/kanagram/src/vocabsettingswidget.ui
index 71d754d8..6ef70fd1 100644
--- a/kanagram/src/vocabsettingswidget.ui
+++ b/kanagram/src/vocabsettingswidget.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">