summaryrefslogtreecommitdiffstats
path: root/kwordquiz/src
diff options
context:
space:
mode:
Diffstat (limited to 'kwordquiz/src')
-rw-r--r--kwordquiz/src/dlglanguagebase.ui18
-rw-r--r--kwordquiz/src/dlgrcbase.ui10
-rw-r--r--kwordquiz/src/dlgsortbase.ui4
-rw-r--r--kwordquiz/src/dlgspecchar.cpp6
-rw-r--r--kwordquiz/src/flashviewbase.ui32
-rw-r--r--kwordquiz/src/kvtmlwriter.cpp16
-rw-r--r--kwordquiz/src/kvtmlwriter.h2
-rw-r--r--kwordquiz/src/kwordquiz.cpp42
-rw-r--r--kwordquiz/src/kwordquiz.h2
-rw-r--r--kwordquiz/src/kwordquizdoc.cpp12
-rw-r--r--kwordquiz/src/kwordquizdoc.h2
-rw-r--r--kwordquiz/src/kwordquizprefs.cpp2
-rw-r--r--kwordquiz/src/kwordquizview.cpp8
-rw-r--r--kwordquiz/src/kwordquizview.h2
-rw-r--r--kwordquiz/src/kwqnewstuff.cpp4
-rw-r--r--kwordquiz/src/multipleviewbase.ui76
-rw-r--r--kwordquiz/src/prefcardappearancebase.ui10
-rw-r--r--kwordquiz/src/prefcharacterbase.ui14
-rw-r--r--kwordquiz/src/prefeditorbase.ui4
-rw-r--r--kwordquiz/src/prefquizbase.ui6
-rw-r--r--kwordquiz/src/qaviewbase.ui70
-rw-r--r--kwordquiz/src/wqlreader.cpp2
-rw-r--r--kwordquiz/src/wqlwriter.cpp10
-rw-r--r--kwordquiz/src/wqlwriter.h2
-rw-r--r--kwordquiz/src/wqprintdialogpage.cpp10
25 files changed, 183 insertions, 183 deletions
diff --git a/kwordquiz/src/dlglanguagebase.ui b/kwordquiz/src/dlglanguagebase.ui
index 10d6c095..38edf095 100644
--- a/kwordquiz/src/dlglanguagebase.ui
+++ b/kwordquiz/src/dlglanguagebase.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>120</height>
@@ -35,7 +35,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<grid>
<property name="name">
@@ -53,7 +53,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -90,7 +90,7 @@
<property name="frameShadow">
<enum>Sunken</enum>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignAuto</set>
</property>
<property name="toolTip" stdset="0">
@@ -127,7 +127,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -138,7 +138,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout2_2</cstring>
+ <cstring>layout2_2</cstring>
</property>
<grid>
<property name="name">
@@ -156,7 +156,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -187,7 +187,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignAuto</set>
</property>
<property name="toolTip" stdset="0">
@@ -224,7 +224,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/kwordquiz/src/dlgrcbase.ui b/kwordquiz/src/dlgrcbase.ui
index 6a06876b..3fec70fd 100644
--- a/kwordquiz/src/dlgrcbase.ui
+++ b/kwordquiz/src/dlgrcbase.ui
@@ -12,7 +12,7 @@
<height>156</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>150</height>
@@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<grid>
<property name="name">
@@ -43,7 +43,7 @@
<property name="maxLength">
<number>5</number>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignAuto</set>
</property>
<property name="validChars">
@@ -77,7 +77,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<grid>
<property name="name">
@@ -124,7 +124,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<grid>
<property name="name">
diff --git a/kwordquiz/src/dlgsortbase.ui b/kwordquiz/src/dlgsortbase.ui
index c9c4ed7b..59342257 100644
--- a/kwordquiz/src/dlgsortbase.ui
+++ b/kwordquiz/src/dlgsortbase.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>170</height>
@@ -35,7 +35,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
diff --git a/kwordquiz/src/dlgspecchar.cpp b/kwordquiz/src/dlgspecchar.cpp
index af521fd1..e44cb403 100644
--- a/kwordquiz/src/dlgspecchar.cpp
+++ b/kwordquiz/src/dlgspecchar.cpp
@@ -16,7 +16,7 @@
#include "dlgspecchar.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <klocale.h>
#include <kcharselect.h>
@@ -38,11 +38,11 @@ void DlgSpecChar::initDialog(const TQChar &_chr, const TQString &_font, bool /*_
grid = new TQGridLayout( page, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
- int t = (_chr.tqunicode()/256);
+ int t = (_chr.unicode()/256);
charSelect = new KCharSelect( page, "", _font, _chr, t);
connect(charSelect, TQT_SIGNAL(doubleClicked()),this, TQT_SLOT(slotDoubleClicked()));
- charSelect->resize( charSelect->tqsizeHint() );
+ charSelect->resize( charSelect->sizeHint() );
charSelect->enableFontCombo( false );
grid->addWidget( charSelect, 0, 0 );
diff --git a/kwordquiz/src/flashviewbase.ui b/kwordquiz/src/flashviewbase.ui
index a6eca621..c0ce8e61 100644
--- a/kwordquiz/src/flashviewbase.ui
+++ b/kwordquiz/src/flashviewbase.ui
@@ -26,7 +26,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>30</height>
@@ -43,7 +43,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -60,7 +60,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -126,7 +126,7 @@
<property name="text">
<string>Language 1</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@@ -203,7 +203,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
<property name="toolTip" stdset="0">
@@ -225,7 +225,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>30</height>
@@ -234,7 +234,7 @@
</spacer>
<widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<grid>
<property name="name">
@@ -259,7 +259,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<grid>
<property name="name">
@@ -292,7 +292,7 @@
<property name="text">
<string>00</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@@ -314,7 +314,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -360,7 +360,7 @@
<property name="text">
<string>00</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@@ -382,7 +382,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -413,7 +413,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -459,7 +459,7 @@
<property name="text">
<string>00</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@@ -481,7 +481,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -527,7 +527,7 @@
<property name="text">
<string>00</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
diff --git a/kwordquiz/src/kvtmlwriter.cpp b/kwordquiz/src/kvtmlwriter.cpp
index dc123113..4855dbf2 100644
--- a/kwordquiz/src/kvtmlwriter.cpp
+++ b/kwordquiz/src/kvtmlwriter.cpp
@@ -35,10 +35,10 @@ KVTMLWriter::KVTMLWriter(TQFile *file)
void KVTMLWriter::addHeader(const TQString &generator, int cols, int rows, const TQString &title)
{
TQString s = TQString("<kvtml\n generator=\"%1\"\n cols=\"%2\"\n lines=\"%3\"\n title=\"%4\">")
- .tqarg(generator)
- .tqarg(cols)
- .tqarg(rows)
- .tqarg(title);
+ .arg(generator)
+ .arg(cols)
+ .arg(rows)
+ .arg(title);
outputStream << s << endl << endl;
}
@@ -50,12 +50,12 @@ void KVTMLWriter::addFirstItem(const TQString &ll, int lwidth, const TQString &l
{
outputStream << " <e>" << endl;
TQString s = TQString(" <o width=\"%1\" l=\"%2\">")
- .tqarg(lwidth)
- .tqarg(ll);
+ .arg(lwidth)
+ .arg(ll);
outputStream << s << escape(left) << "</o>" << endl;
s = TQString(" <t width=\"%1\" l=\"%2\">")
- .tqarg(rwidth)
- .tqarg(rl);
+ .arg(rwidth)
+ .arg(rl);
outputStream << s << escape(right) << "</t>" << endl;
outputStream << " </e>" << endl;
}
diff --git a/kwordquiz/src/kvtmlwriter.h b/kwordquiz/src/kvtmlwriter.h
index ccf18071..3e1c4876 100644
--- a/kwordquiz/src/kvtmlwriter.h
+++ b/kwordquiz/src/kvtmlwriter.h
@@ -18,7 +18,7 @@
#define KVTMLWRITER_H
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
/**
@author Peter Hedlund
diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp
index b370f36c..654c21e0 100644
--- a/kwordquiz/src/kwordquiz.cpp
+++ b/kwordquiz/src/kwordquiz.cpp
@@ -304,7 +304,7 @@ void KWordQuizApp::initActions()
updateSpecialCharIcons();
if (!initialGeometrySet())
- resize( TQSize(650, 500).expandedTo(tqminimumSizeHint()));
+ resize( TQSize(650, 500).expandedTo(minimumSizeHint()));
setupGUI(ToolBar | Keys | StatusBar | Create);
setAutoSaveSettings();
@@ -610,7 +610,7 @@ bool KWordQuizApp::saveAsFileName( )
TQFileInfo fileinfo(url.path());
if (fileinfo.exists() && KMessageBox::warningContinueCancel(0,
i18n("<qt>The file<br><b>%1</b><br>already exists. Do you want to overwrite it?</qt>")
- .tqarg(url.path()),TQString(),i18n("Overwrite")) == KMessageBox::Cancel)
+ .arg(url.path()),TQString(),i18n("Overwrite")) == KMessageBox::Cancel)
{
// do nothing
}
@@ -801,7 +801,7 @@ void KWordQuizApp::slotVocabFont()
void KWordQuizApp::slotVocabKeyboard()
{
- slotStatusMsg(i18n("Changing the keyboard tqlayout..."));
+ slotStatusMsg(i18n("Changing the keyboard layout..."));
KMessageBox::sorry(0, i18n("Not implemented yet"));
slotStatusMsg(i18n("Ready"));
}
@@ -1064,7 +1064,7 @@ void KWordQuizApp::slotApplyPreferences()
kdDebug() << "Prefs Update" << endl;
editMarkBlank->setEnabled(Prefs::enableBlanks());
editUnmarkBlank->setEnabled(Prefs::enableBlanks());
- m_editView->viewport()->tqrepaint(true);
+ m_editView->viewport()->repaint(true);
updateSpecialCharIcons();
emit settingsChanged();
}
@@ -1074,14 +1074,14 @@ void KWordQuizApp::updateSpecialCharIcons( )
for (int i = 0; i < 9; i++){
KAction * act = actionCollection()->action(TQString("char_" + TQString::number(i + 1)).latin1());
act->setIcon(charIcon(Prefs::specialCharacters()[i]));
- act->setToolTip(i18n("Inserts the character %1").tqarg(Prefs::specialCharacters()[i]));
+ act->setToolTip(i18n("Inserts the character %1").arg(Prefs::specialCharacters()[i]));
}
}
TQString KWordQuizApp::charIcon(const TQChar & c)
{
///Create a name and path for the icon
- TQString s = locateLocal("icon", "char" + TQString::number(c.tqunicode()) + ".png");
+ TQString s = locateLocal("icon", "char" + TQString::number(c.unicode()) + ".png");
///No need to redraw if it already exists
if (KStandardDirs::exists(s))
@@ -1145,11 +1145,11 @@ void KWordQuizApp::updateMode(int m)
TQString s1 = m_editView -> horizontalHeader()->label(0);
TQString s2 = m_editView -> horizontalHeader()->label(1);
- mode1->setText(i18n("&1 %1 -> %2 In Order").tqarg(s1).tqarg(s2));
- mode2->setText(i18n("&2 %1 -> %2 In Order").tqarg(s2).tqarg(s1));
- mode3->setText(i18n("&3 %1 -> %2 Randomly").tqarg(s1).tqarg(s2));
- mode4->setText(i18n("&4 %1 -> %2 Randomly").tqarg(s2).tqarg(s1));
- mode5->setText(i18n("&5 %1 <-> %2 Randomly").tqarg(s1).tqarg(s2));
+ mode1->setText(i18n("&1 %1 -> %2 In Order").arg(s1).arg(s2));
+ mode2->setText(i18n("&2 %1 -> %2 In Order").arg(s2).arg(s1));
+ mode3->setText(i18n("&3 %1 -> %2 Randomly").arg(s1).arg(s2));
+ mode4->setText(i18n("&4 %1 -> %2 Randomly").arg(s2).arg(s1));
+ mode5->setText(i18n("&5 %1 <-> %2 Randomly").arg(s1).arg(s2));
mode1->setChecked(Prefs::mode() == 1);
mode2->setChecked(Prefs::mode() == 2);
@@ -1164,30 +1164,30 @@ void KWordQuizApp::updateMode(int m)
popup->setItemChecked(3, Prefs::mode() == 4);
popup->setItemChecked(4, Prefs::mode() == 5);
- popup->changeItem(0, i18n("&1 %1 -> %2 In Order").tqarg(s1).tqarg(s2));
- popup->changeItem(1, i18n("&2 %1 -> %2 In Order").tqarg(s2).tqarg(s1));
- popup->changeItem(2, i18n("&3 %1 -> %2 Randomly").tqarg(s1).tqarg(s2));
- popup->changeItem(3, i18n("&4 %1 -> %2 Randomly").tqarg(s2).tqarg(s1));
- popup->changeItem(4, i18n("&5 %1 <-> %2 Randomly").tqarg(s1).tqarg(s2));
+ popup->changeItem(0, i18n("&1 %1 -> %2 In Order").arg(s1).arg(s2));
+ popup->changeItem(1, i18n("&2 %1 -> %2 In Order").arg(s2).arg(s1));
+ popup->changeItem(2, i18n("&3 %1 -> %2 Randomly").arg(s1).arg(s2));
+ popup->changeItem(3, i18n("&4 %1 -> %2 Randomly").arg(s2).arg(s1));
+ popup->changeItem(4, i18n("&5 %1 <-> %2 Randomly").arg(s1).arg(s2));
TQString s;
mode->setIcon("mode" + s.setNum(Prefs::mode()));
switch( Prefs::mode() ){
case 1:
- statusBar()->changeItem(i18n("%1 -> %2 In Order").tqarg(s1).tqarg(s2), ID_STATUS_MSG_MODE);
+ statusBar()->changeItem(i18n("%1 -> %2 In Order").arg(s1).arg(s2), ID_STATUS_MSG_MODE);
break;
case 2:
- statusBar()->changeItem(i18n("%1 -> %2 In Order").tqarg(s2).tqarg(s1), ID_STATUS_MSG_MODE);
+ statusBar()->changeItem(i18n("%1 -> %2 In Order").arg(s2).arg(s1), ID_STATUS_MSG_MODE);
break;
case 3:
- statusBar()->changeItem(i18n("%1 -> %2 Randomly").tqarg(s1).tqarg(s2), ID_STATUS_MSG_MODE);
+ statusBar()->changeItem(i18n("%1 -> %2 Randomly").arg(s1).arg(s2), ID_STATUS_MSG_MODE);
break;
case 4:
- statusBar()->changeItem(i18n("%1 -> %2 Randomly").tqarg(s2).tqarg(s1), ID_STATUS_MSG_MODE);
+ statusBar()->changeItem(i18n("%1 -> %2 Randomly").arg(s2).arg(s1), ID_STATUS_MSG_MODE);
break;
case 5:
- statusBar()->changeItem(i18n("%1 <-> %2 Randomly").tqarg(s1).tqarg(s2), ID_STATUS_MSG_MODE);
+ statusBar()->changeItem(i18n("%1 <-> %2 Randomly").arg(s1).arg(s2), ID_STATUS_MSG_MODE);
break;
}
diff --git a/kwordquiz/src/kwordquiz.h b/kwordquiz/src/kwordquiz.h
index 59dc10a1..db923f56 100644
--- a/kwordquiz/src/kwordquiz.h
+++ b/kwordquiz/src/kwordquiz.h
@@ -79,7 +79,7 @@ class KWordQuizApp : public KMainWindow
bool saveAsFileName();
protected:
- /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration
+ /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
* file
*/
void saveOptions();
diff --git a/kwordquiz/src/kwordquizdoc.cpp b/kwordquiz/src/kwordquizdoc.cpp
index c1e3dacc..333f7713 100644
--- a/kwordquiz/src/kwordquizdoc.cpp
+++ b/kwordquiz/src/kwordquizdoc.cpp
@@ -73,14 +73,14 @@ const KURL& KWordQuizDoc::URL() const
void KWordQuizDoc::slotUpdateAllViews(KWordQuizView *sender)
{
- //m_view->tqrepaint();
+ //m_view->repaint();
/*KWordQuizView *w;
if(pViewList)
{
for(w=pViewList->first(); w!=0; w=pViewList->next())
{
if(w!=sender)
- w->tqrepaint();
+ w->repaint();
}
}*/
@@ -162,7 +162,7 @@ bool KWordQuizDoc::openDocument(const KURL& url, bool append, int index)
TQFile file(tmpfile);
if (!file.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;
}
@@ -333,7 +333,7 @@ bool KWordQuizDoc::saveDocument(const KURL& url, const char *format /*=0*/)
if (!file.open(IO_WriteOnly))
{
KMessageBox::error(0, i18n("<qt>Cannot write to file<br><b>%1</b></qt>")
- .tqarg(url.path()));
+ .arg(url.path()));
//if (filename == fname)
// filename = "";
return false;
@@ -347,7 +347,7 @@ bool KWordQuizDoc::saveDocument(const KURL& url, const char *format /*=0*/)
{
file.close();
KVTMLWriter writer(&file);
- writer.addHeader(TQString("kwordquiz %1").tqarg(KWTQ_VERSION), 2, g->numRows(), url.fileName());
+ writer.addHeader(TQString("kwordquiz %1").arg(KWTQ_VERSION), 2, g->numRows(), url.fileName());
writer.addFirstItem(g->horizontalHeader()->label(0), g->columnWidth(0), g->text(w, 0), g->horizontalHeader()->label(1), g->columnWidth(1), g->text(w, 1));
w++;
int r = g->numRows();
@@ -479,7 +479,7 @@ void KWordQuizDoc::slotModifiedOnDisk( const TQString & path)
/*@todo this code doesn't work very well. Have to look in more detail on how Kate does it.
if (doc_url.path() == path)
{
- TQString str = i18n("The file %1 was changed (modified) on disc by another program!\n\n").tqarg(doc_url.fileName());
+ TQString str = i18n("The file %1 was changed (modified) on disc by another program!\n\n").arg(doc_url.fileName());
int i = KMessageBox::warningYesNoCancel(0, str + i18n("Do you want to reload the modified file? Data loss may occur."),TQString(),i18n("Reload"),i18n("Do Not Reload"));
if ( i == KMessageBox::Yes)
openDocument(doc_url);
diff --git a/kwordquiz/src/kwordquizdoc.h b/kwordquiz/src/kwordquizdoc.h
index a84bc119..e5bbc4e6 100644
--- a/kwordquiz/src/kwordquizdoc.h
+++ b/kwordquiz/src/kwordquizdoc.h
@@ -76,7 +76,7 @@ class KWordQuizDoc : public TQObject
void setURL(const KURL& url);
public slots:
- /** calls tqrepaint() on all views connected to the document object and is called by the view by which the document has been changed.
+ /** calls repaint() on all views connected to the document object and is called by the view by which the document has been changed.
* As this view normally repaints itself, it is excluded from the paintEvent.
*/
void slotUpdateAllViews(KWordQuizView *sender);
diff --git a/kwordquiz/src/kwordquizprefs.cpp b/kwordquiz/src/kwordquizprefs.cpp
index 61380e68..fe33d78a 100644
--- a/kwordquiz/src/kwordquizprefs.cpp
+++ b/kwordquiz/src/kwordquizprefs.cpp
@@ -16,7 +16,7 @@
***************************************************************************/
#include <tqwidgetstack.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqradiobutton.h>
#include <tqcheckbox.h>
#include <tqlistview.h>
diff --git a/kwordquiz/src/kwordquizview.cpp b/kwordquiz/src/kwordquizview.cpp
index 021601bd..8868fd95 100644
--- a/kwordquiz/src/kwordquizview.cpp
+++ b/kwordquiz/src/kwordquizview.cpp
@@ -18,7 +18,7 @@
// include files for TQt
#include <tqpainter.h>
#include <tqtable.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqlineedit.h>
// include files for KDE
@@ -42,7 +42,7 @@ TQValueList<WTQUndo> *KWordQuizView::m_undoList = 0L;
KWTQTableItem::KWTQTableItem(TQTable* table, EditType et, const TQString & text) : TQTableItem(table, et, text)
{}
-int KWTQTableItem::tqalignment() const
+int KWTQTableItem::alignment() const
{
bool num;
bool ok1 = false;
@@ -211,12 +211,12 @@ void KWordQuizView::doNewPage( TQPainter & painter, int res, int type )
if (type == 2)
{
- painter.drawText(card_marg, card_marg - 20, i18n("KWordQuiz - %1").tqarg(getDocument()->URL().fileName()));
+ painter.drawText(card_marg, card_marg - 20, i18n("KWordQuiz - %1").arg(getDocument()->URL().fileName()));
return;
}
painter.drawLine(marg, marg, marg + cw0 + cw1 + cw2 + cw3, marg);
- painter.drawText(marg, marg - 20, i18n("KWordQuiz - %1").tqarg(getDocument()->URL().fileName()));
+ painter.drawText(marg, marg - 20, i18n("KWordQuiz - %1").arg(getDocument()->URL().fileName()));
if (type == 1)
{
diff --git a/kwordquiz/src/kwordquizview.h b/kwordquiz/src/kwordquizview.h
index b49ea65c..d0cf7466 100644
--- a/kwordquiz/src/kwordquizview.h
+++ b/kwordquiz/src/kwordquizview.h
@@ -45,7 +45,7 @@ class KWTQTableItem :public TQTableItem
{
public:
KWTQTableItem( TQTable* table, EditType et, const TQString & text );
- virtual int tqalignment() const;
+ virtual int alignment() const;
};
class KWordQuizView : public TQTable
diff --git a/kwordquiz/src/kwqnewstuff.cpp b/kwordquiz/src/kwqnewstuff.cpp
index d4868889..64d620cd 100644
--- a/kwordquiz/src/kwqnewstuff.cpp
+++ b/kwordquiz/src/kwqnewstuff.cpp
@@ -79,7 +79,7 @@ TQString KWQNewStuff::downloadDestination(KNS::Entry * entry)
{
int result = KMessageBox::questionYesNo(parentWidget(),
i18n("The file '%1' already exists. Do you want to overwrite it?")
- .tqarg(file),
+ .arg(file),
TQString(),
i18n("Overwrite"),i18n("Do Not Overwrite"));
if (result == KMessageBox::No)
@@ -87,7 +87,7 @@ TQString KWQNewStuff::downloadDestination(KNS::Entry * entry)
}
KMessageBox::information(parentWidget(),
i18n("<qt>The selected file will now be downloaded and saved as\n<b>'%1'</b>.</qt>")
- .tqarg(file),
+ .arg(file),
TQString(),
"NewStuffDownloadLocation");
return file;
diff --git a/kwordquiz/src/multipleviewbase.ui b/kwordquiz/src/multipleviewbase.ui
index 4e25f0c3..3d848b83 100644
--- a/kwordquiz/src/multipleviewbase.ui
+++ b/kwordquiz/src/multipleviewbase.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout58</cstring>
+ <cstring>layout58</cstring>
</property>
<grid>
<property name="name">
@@ -50,7 +50,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
@@ -64,7 +64,7 @@
<property name="text">
<string>Language 1</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@@ -95,7 +95,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@@ -117,7 +117,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -137,7 +137,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>tqlayout60</cstring>
+ <cstring>layout60</cstring>
</property>
<grid>
<property name="name">
@@ -155,7 +155,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -183,7 +183,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
@@ -197,7 +197,7 @@
<property name="text">
<string>Your Answer</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@@ -228,7 +228,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@@ -242,7 +242,7 @@
</widget>
<widget class="TQLayoutWidget" row="6" column="0">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<grid>
<property name="name">
@@ -267,7 +267,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<grid>
<property name="name">
@@ -300,7 +300,7 @@
<property name="text">
<string>00</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@@ -322,7 +322,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -368,7 +368,7 @@
<property name="text">
<string>00</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@@ -390,7 +390,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -421,7 +421,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -467,7 +467,7 @@
<property name="text">
<string>00</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@@ -489,7 +489,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -535,7 +535,7 @@
<property name="text">
<string>00</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@@ -551,7 +551,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="0">
<property name="name">
- <cstring>tqlayout61</cstring>
+ <cstring>layout61</cstring>
</property>
<grid>
<property name="name">
@@ -569,7 +569,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
@@ -583,7 +583,7 @@
<property name="text">
<string>Correct Answer</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@@ -614,7 +614,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@@ -636,7 +636,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -656,7 +656,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout63</cstring>
+ <cstring>layout63</cstring>
</property>
<grid>
<property name="name">
@@ -674,7 +674,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -702,7 +702,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -730,7 +730,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -758,7 +758,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
@@ -772,7 +772,7 @@
<property name="text">
<string>Language 2</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@@ -794,7 +794,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -814,7 +814,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout59</cstring>
+ <cstring>layout59</cstring>
</property>
<grid>
<property name="name">
@@ -832,7 +832,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
@@ -846,7 +846,7 @@
<property name="text">
<string>Previous Question</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@@ -877,7 +877,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
<property name="indent">
@@ -902,7 +902,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
diff --git a/kwordquiz/src/prefcardappearancebase.ui b/kwordquiz/src/prefcardappearancebase.ui
index 3ac9e381..a051b9de 100644
--- a/kwordquiz/src/prefcardappearancebase.ui
+++ b/kwordquiz/src/prefcardappearancebase.ui
@@ -34,13 +34,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>175</width>
<height>100</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>175</width>
<height>100</height>
@@ -98,7 +98,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
<property name="toolTip" stdset="0">
@@ -190,7 +190,7 @@
<property name="text">
<string>Front</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@@ -480,7 +480,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>400</width>
<height>20</height>
diff --git a/kwordquiz/src/prefcharacterbase.ui b/kwordquiz/src/prefcharacterbase.ui
index a9c63062..da54220a 100644
--- a/kwordquiz/src/prefcharacterbase.ui
+++ b/kwordquiz/src/prefcharacterbase.ui
@@ -12,7 +12,7 @@
<height>356</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>300</width>
<height>350</height>
@@ -52,7 +52,7 @@
<property name="text">
<string>Note: Select Settings -&gt; Configure Shortcuts... to change the shortcut associated with each action.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -299,7 +299,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>220</width>
<height>30</height>
@@ -308,7 +308,7 @@
</spacer>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<grid>
<property name="name">
@@ -324,7 +324,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>50</height>
@@ -355,7 +355,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>31</height>
@@ -382,7 +382,7 @@
<property name="text">
<string>A</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignBottom</set>
</property>
<property name="toolTip" stdset="0">
diff --git a/kwordquiz/src/prefeditorbase.ui b/kwordquiz/src/prefeditorbase.ui
index 67b096a4..dc2de3ba 100644
--- a/kwordquiz/src/prefeditorbase.ui
+++ b/kwordquiz/src/prefeditorbase.ui
@@ -12,7 +12,7 @@
<height>256</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>250</height>
@@ -113,7 +113,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>81</height>
diff --git a/kwordquiz/src/prefquizbase.ui b/kwordquiz/src/prefquizbase.ui
index 79f570db..2f7f333c 100644
--- a/kwordquiz/src/prefquizbase.ui
+++ b/kwordquiz/src/prefquizbase.ui
@@ -12,7 +12,7 @@
<height>356</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>300</width>
<height>350</height>
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>31</height>
@@ -162,7 +162,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>70</height>
diff --git a/kwordquiz/src/qaviewbase.ui b/kwordquiz/src/qaviewbase.ui
index 9be1bee1..fcb743a4 100644
--- a/kwordquiz/src/qaviewbase.ui
+++ b/kwordquiz/src/qaviewbase.ui
@@ -32,7 +32,7 @@
</widget>
<widget class="TQLayoutWidget" row="7" column="0">
<property name="name">
- <cstring>tqlayout23</cstring>
+ <cstring>layout23</cstring>
</property>
<grid>
<property name="name">
@@ -50,7 +50,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -88,7 +88,7 @@
<property name="text">
<string>00</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@@ -110,7 +110,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -141,7 +141,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -179,7 +179,7 @@
<property name="text">
<string>00</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@@ -208,7 +208,7 @@
<property name="text">
<string>00</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@@ -237,7 +237,7 @@
<property name="text">
<string>00</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@@ -259,7 +259,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -282,7 +282,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout51</cstring>
+ <cstring>layout51</cstring>
</property>
<grid>
<property name="name">
@@ -300,7 +300,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
@@ -314,7 +314,7 @@
<property name="text">
<string>Previous Question</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@@ -345,7 +345,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@@ -367,7 +367,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -387,7 +387,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>tqlayout52</cstring>
+ <cstring>layout52</cstring>
</property>
<grid>
<property name="name">
@@ -405,7 +405,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
@@ -419,7 +419,7 @@
<property name="text">
<string>Your Answer</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@@ -450,7 +450,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@@ -472,7 +472,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -492,7 +492,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="0">
<property name="name">
- <cstring>tqlayout53</cstring>
+ <cstring>layout53</cstring>
</property>
<grid>
<property name="name">
@@ -510,7 +510,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -538,7 +538,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
@@ -552,7 +552,7 @@
<property name="text">
<string>Correct Answer</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@@ -583,7 +583,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@@ -597,7 +597,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout54</cstring>
+ <cstring>layout54</cstring>
</property>
<grid>
<property name="name">
@@ -624,7 +624,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@@ -646,7 +646,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignAuto</set>
</property>
<property name="toolTip" stdset="0">
@@ -668,7 +668,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
@@ -682,7 +682,7 @@
<property name="text">
<string>Language 2</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@@ -704,7 +704,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -738,7 +738,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout57</cstring>
+ <cstring>layout57</cstring>
</property>
<grid>
<property name="name">
@@ -756,7 +756,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -770,7 +770,7 @@
<property name="text">
<string>Language 1</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@@ -792,7 +792,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -829,7 +829,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
<property name="toolTip" stdset="0">
diff --git a/kwordquiz/src/wqlreader.cpp b/kwordquiz/src/wqlreader.cpp
index 7eef97c7..5d87e56f 100644
--- a/kwordquiz/src/wqlreader.cpp
+++ b/kwordquiz/src/wqlreader.cpp
@@ -14,7 +14,7 @@
* *
***************************************************************************/
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqfile.h>
#include <kmessagebox.h>
diff --git a/kwordquiz/src/wqlwriter.cpp b/kwordquiz/src/wqlwriter.cpp
index 579561ff..2052c079 100644
--- a/kwordquiz/src/wqlwriter.cpp
+++ b/kwordquiz/src/wqlwriter.cpp
@@ -35,16 +35,16 @@ void WqlWriter::writeFont( const TQFont & font )
outputStream << "[Font Info]" << winendl;
outputStream << "FontName1=\"" << font.family() << "\"" << winendl;
outputStream << "FontSize1=" << TQString::number(font.pointSize()) << winendl;
- outputStream << TQString("FontBold1=%1").tqarg(font.bold() ? "1" : "0") <<winendl;
- outputStream << TQString("FontItalic1=%1").tqarg(font.italic() ? "1" : "0") <<winendl;
+ outputStream << TQString("FontBold1=%1").arg(font.bold() ? "1" : "0") <<winendl;
+ outputStream << TQString("FontItalic1=%1").arg(font.italic() ? "1" : "0") <<winendl;
outputStream << "FontColor1=0" << winendl;
outputStream << "CharSet1=0" << winendl;
outputStream << "Layout1=0" << winendl;
outputStream << "FontName2=\"" << font.family() << "\"" << winendl;
outputStream << "FontSize2=" << TQString::number(font.pointSize()) << winendl;
- outputStream << TQString("FontBold2=%1").tqarg(font.bold() ? "1" : "0") <<winendl;
- outputStream << TQString("FontItalic2=%1").tqarg(font.italic() ? "1" : "0") <<winendl;
+ outputStream << TQString("FontBold2=%1").arg(font.bold() ? "1" : "0") <<winendl;
+ outputStream << TQString("FontItalic2=%1").arg(font.italic() ? "1" : "0") <<winendl;
outputStream << "FontColor2=0" << winendl;
outputStream << "CharSet2=0" << winendl;
outputStream << "Layout2=0" << winendl << winendl;
@@ -83,7 +83,7 @@ void WqlWriter::writeFirstItem( const TQString & ll, const TQString & rl )
void WqlWriter::writeItem( const TQString & left, const TQString & right, int rh )
{
- outputStream << left << TQString( " [%1]").tqarg(rh * 15, 10, 10 ) << winendl ;
+ outputStream << left << TQString( " [%1]").arg(rh * 15, 10, 10 ) << winendl ;
outputStream << right << winendl;
}
diff --git a/kwordquiz/src/wqlwriter.h b/kwordquiz/src/wqlwriter.h
index 460483cb..d6b4ce06 100644
--- a/kwordquiz/src/wqlwriter.h
+++ b/kwordquiz/src/wqlwriter.h
@@ -17,7 +17,7 @@
#define WTQLWRITER_H
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqfont.h>
/**
diff --git a/kwordquiz/src/wqprintdialogpage.cpp b/kwordquiz/src/wqprintdialogpage.cpp
index 25d5b79b..8a261131 100644
--- a/kwordquiz/src/wqprintdialogpage.cpp
+++ b/kwordquiz/src/wqprintdialogpage.cpp
@@ -18,7 +18,7 @@
#include <tqbuttongroup.h>
#include <tqradiobutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqwhatsthis.h>
#include <klocale.h>
@@ -34,10 +34,10 @@ WQPrintDialogPage::WQPrintDialogPage(TQWidget *parent, const char *name )
g = new TQButtonGroup(i18n("Select Type of Printout"), this );
g->setColumnLayout(0, Qt::Vertical );
- g->tqlayout()->setSpacing( 6 );
- g->tqlayout()->setMargin( 11 );
- TQGridLayout * v = new TQGridLayout( g->tqlayout() );
- v->tqsetAlignment( TQt::AlignTop );
+ g->layout()->setSpacing( 6 );
+ g->layout()->setMargin( 11 );
+ TQGridLayout * v = new TQGridLayout( g->layout() );
+ v->setAlignment( TQt::AlignTop );
rb0 = new TQRadioButton(i18n("Vocabulary &list"), g );
v->addWidget( rb0, 0, 0 );