TQt4 port kdeedu

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

28 files changed, 280 insertions, 272 deletions

diff --git a/kanagram/src/fontutils.cpp b/kanagram/src/fontutils.cpp
index 14fff456..5b3dfdca 100644
--- a/kanagram/src/fontutils.cpp
+++ b/kanagram/src/fontutils.cpp
@@ -18,7 +18,7 @@ int fontUtils::fontSize(TQPainter &p, const TQString &s1, int w, int h)
 	f.setPointSize(28);
 	p.setFont(f);
 	
-	aux1 = p.boundingRect(TQRect(), Qt::AlignAuto, s1);
+	aux1 = p.boundingRect(TQRect(), TQt::AlignAuto, s1);
 	
-	return QMIN(w * 28 / aux1.width(), h * 28 / aux1.height());
+	return TQMIN(w * 28 / aux1.width(), h * 28 / aux1.height());
 }
diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp
index 42cb90f9..df845ac6 100644
--- a/kanagram/src/kanagram.cpp
+++ b/kanagram/src/kanagram.cpp
@@ -180,8 +180,8 @@ void Kanagram::setupRects()
 	//set appropriate yOffset for different fonts
 	if(m_useStandardFonts) yOffset = 6;
 	TQRect r = innerRect(m_blackboardRect, 6, yOffset);
-	m_hintRect = tmpp.boundingRect(r, Qt::AlignBottom|Qt::AlignLeft, i18n(m_textHint));
-	m_revealRect = tmpp.boundingRect(r, Qt::AlignBottom|Qt::AlignRight, i18n(m_textRevealWord));
+	m_hintRect = tmpp.boundingRect(r, TQt::AlignBottom|TQt::AlignLeft, i18n(m_textHint));
+	m_revealRect = tmpp.boundingRect(r, TQt::AlignBottom|TQt::AlignRight, i18n(m_textRevealWord));
 	tmpp.end();
 }
 
@@ -210,14 +210,14 @@ void Kanagram::paintEvent(TQPaintEvent *)
 		p.drawPixmap(520, 362, *m_quit);
 
 	//draw main Anagram
-	drawTextNew(p, m_game->getAnagram(), Qt::AlignCenter, 10, 10, m_blackboardRect, true, 28);
+	drawTextNew(p, m_game->getAnagram(), TQt::AlignCenter, 10, 10, m_blackboardRect, true, 28);
 
 	int yOffset = 0;
 	//set appropriate yOffset for different fonts
 	if(m_useStandardFonts) yOffset = 6;
 	//draw text using appropriate yOffset
-	drawTextNew(p, i18n(m_textRevealWord), Qt::AlignBottom | Qt::AlignRight, 6, yOffset, m_blackboardRect, m_overReveal, 14);
-	drawTextNew(p, i18n(m_textHint), Qt::AlignBottom | Qt::AlignLeft, 6, yOffset, m_blackboardRect, m_overHint, 14);
+	drawTextNew(p, i18n(m_textRevealWord), TQt::AlignBottom | TQt::AlignRight, 6, yOffset, m_blackboardRect, m_overReveal, 14);
+	drawTextNew(p, i18n(m_textHint), TQt::AlignBottom | TQt::AlignLeft, 6, yOffset, m_blackboardRect, m_overHint, 14);
 	
 	//draw vocab switcher
 	drawSwitcher(p, 9, 8);
@@ -225,7 +225,7 @@ void Kanagram::paintEvent(TQPaintEvent *)
 	p.setPen(TQPen(black, 3));
 
 	//Draw the border of the input box
-	TQRect borderRect = m_inputBox->geometry();
+	TQRect borderRect = m_inputBox->tqgeometry();
 	borderRect.setLeft(borderRect.left() - 2);
 	borderRect.setTop(borderRect.top() - 2);
 	borderRect.setWidth(borderRect.width() + 2 * 1);
@@ -340,7 +340,7 @@ void Kanagram::drawSwitcher(TQPainter &p, const int xMargin, const int yMargin)
 	r.normalize();
 	r.moveBy(- padding - (m_overSwitcher ? m_arrowOver : m_arrow )->width(), yMargin);
 	r.setHeight( (m_overSwitcher ? m_arrowOver : m_arrow )->height());
-	m_switcherRect = p.boundingRect(r, Qt::AlignVCenter|Qt::AlignRight, text);
+	m_switcherRect = p.boundingRect(r, TQt::AlignVCenter|TQt::AlignRight, text);
 	p.setFont(font);
 	if (m_overSwitcher)
 	{
@@ -353,7 +353,7 @@ void Kanagram::drawSwitcher(TQPainter &p, const int xMargin, const int yMargin)
 		p.drawPixmap(m_switcherRect.right() + padding, m_switcherRect.top(), *m_arrow);
 	}
 	m_switcherRect.moveBy(0, -2);
-	p.drawText(m_switcherRect, Qt::AlignVCenter|Qt::AlignRight, text);
+	p.drawText(m_switcherRect, TQt::AlignVCenter|TQt::AlignRight, text);
 }
 
 TQRect Kanagram::innerRect(const TQRect &rect, const int xMargin, const int yMargin)
@@ -377,7 +377,7 @@ TQRect Kanagram::innerRect(const TQRect &rect, const int xMargin, const int yMar
 void Kanagram::mousePressEvent(TQMouseEvent *e)
 {
 	
-	if (m_nextRect.contains(e->pos()))
+	if (m_nextRect.tqcontains(e->pos()))
 	{
 		hideHint();
 		m_game->nextAnagram();
@@ -386,53 +386,53 @@ void Kanagram::mousePressEvent(TQMouseEvent *e)
 		update();
 	}
 
-	if(m_configRect.contains(e->pos()))
+	if(m_configRect.tqcontains(e->pos()))
 	{
 		showSettings();
 	}
 
-	if(m_quitRect.contains(e->pos()))
+	if(m_quitRect.tqcontains(e->pos()))
 	{
 		kapp->quit();
 	}
 
-	if(m_revealRect.contains(e->pos()))
+	if(m_revealRect.tqcontains(e->pos()))
 	{
 		m_game->restoreWord();
 		update();
 	}
 
-	if(m_logoRect.contains(e->pos()))
+	if(m_logoRect.tqcontains(e->pos()))
 	{
 		m_helpMenu->aboutApplication();
 	}
 
 	if(!m_showHint && m_overHelp)
 	{
-		if(m_handbookRect.contains(e->pos()))
+		if(m_handbookRect.tqcontains(e->pos()))
 		{
 			m_helpMenu->appHelpActivated();
 		}
 
-		if(m_aboutKDERect.contains(e->pos()))
+		if(m_aboutKDERect.tqcontains(e->pos()))
 		{
 			m_helpMenu->aboutKDE();
 		}
 
-		if(m_aboutAppRect.contains(e->pos()))
+		if(m_aboutAppRect.tqcontains(e->pos()))
 		{
 			m_helpMenu->aboutApplication();
 		}
 	}
 
-	if(m_hintBoxRect.contains(e->pos()))
+	if(m_hintBoxRect.tqcontains(e->pos()))
 	{
 		hideHint();
 	}
 
-	if(m_switcherRect.contains(e->pos()) || m_arrowRect.contains(e->pos()))
+	if(m_switcherRect.tqcontains(e->pos()) || m_arrowRect.tqcontains(e->pos()))
 	{
-		if(!(e->button() == RightButton))
+		if(!(e->button() == Qt::RightButton))
 			m_game->nextVocab();
 		else
 			m_game->previousVocab();
@@ -444,7 +444,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e)
 		update();
 	}
 
-	if(m_hintRect.contains(e->pos()))
+	if(m_hintRect.tqcontains(e->pos()))
 	{
 		if(m_showHint == true) m_showHint = false;
 		else
@@ -459,7 +459,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e)
 		update();
 	}
 
-	if(m_upRect.contains(e->pos()) && m_inputBox->text() != "")
+	if(m_upRect.tqcontains(e->pos()) && m_inputBox->text() != "")
 	{
 		if(m_inputBox->text().lower().stripWhiteSpace() == m_game->getWord())
 		{
@@ -492,7 +492,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p)
 	bool haveToUpdate;
 	haveToUpdate = false;
 	
-	if (m_nextRect.contains(p))
+	if (m_nextRect.tqcontains(p))
 	{
 		if (!m_overNext)
 		{
@@ -506,7 +506,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p)
 		haveToUpdate = true;
 	}
 
-	if(m_configRect.contains(p))
+	if(m_configRect.tqcontains(p))
 	{
 		if(!m_overConfig)
 		{
@@ -520,7 +520,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p)
 		haveToUpdate = true;
 	}
 
-	if(m_helpRect.contains(p))
+	if(m_helpRect.tqcontains(p))
 	{
 		if(!m_overHelp)
 		{
@@ -534,7 +534,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p)
 		haveToUpdate = true;
 	}
 
-	if(m_quitRect.contains(p))
+	if(m_quitRect.tqcontains(p))
 	{
 		if(!m_overQuit)
 		{
@@ -548,7 +548,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p)
 		haveToUpdate = true;
 	}
 
-	if(m_hintRect.contains(p))
+	if(m_hintRect.tqcontains(p))
 	{
 		if(!m_overHint)
 		{
@@ -562,7 +562,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p)
 		haveToUpdate = true;
 	}
 
-	if(m_hintBoxRect.contains(p))
+	if(m_hintBoxRect.tqcontains(p))
 	{
 		if(!m_overHintBox)
 		{
@@ -576,7 +576,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p)
 		haveToUpdate = true;
 	}
 	
-	if(m_revealRect.contains(p))
+	if(m_revealRect.tqcontains(p))
 	{
 		if(!m_overReveal)
 		{
@@ -590,7 +590,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p)
 		haveToUpdate = true;
 	}
 
-	if(m_upRect.contains(p))
+	if(m_upRect.tqcontains(p))
 	{
 		if(!m_overUp)
 		{
@@ -604,7 +604,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p)
 		haveToUpdate = true;
 	}
 
-	if(m_switcherRect.contains(p) || m_arrowRect.contains(p))
+	if(m_switcherRect.tqcontains(p) || m_arrowRect.tqcontains(p))
 	{
 		if(!m_overSwitcher)
 		{
@@ -618,7 +618,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p)
 		haveToUpdate = true;
 	}
 
-	if(m_aboutAppRect.contains(p))
+	if(m_aboutAppRect.tqcontains(p))
 	{
 		if(!m_overAboutApp)
 		{
@@ -634,7 +634,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p)
 
 	if(!m_showHint)
 	{
-		if(m_handbookRect.contains(p))
+		if(m_handbookRect.tqcontains(p))
 		{
 			if(!m_overHandbook)
 			{
@@ -648,7 +648,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p)
 			haveToUpdate = true;
 		}
 	
-		if(m_aboutKDERect.contains(p))
+		if(m_aboutKDERect.tqcontains(p))
 		{
 			if(!m_overAboutKDE)
 			{
@@ -679,7 +679,7 @@ void Kanagram::drawText(TQPainter &p, const TQString &text, const TQPoint &cente
 	font.setBold(true);
 	p.setFont(font);
 	
-	r = p.boundingRect(TQRect(), Qt::AlignAuto, text);
+	r = p.boundingRect(TQRect(), TQt::AlignAuto, text);
 	r = TQRect(0, 0, r.width() + xMargin, r.height() + yMargin);
 	r.moveBy(center.x() - r.width() / 2, center.y() - r.height() / 2);
 
@@ -692,7 +692,7 @@ void Kanagram::drawText(TQPainter &p, const TQString &text, const TQPoint &cente
 	
 	if (!highlight) p.setPen(m_chalkColor);
 	else p.setPen(m_chalkHighlightColor);
-	p.drawText(r, Qt::AlignCenter, text);
+	p.drawText(r, TQt::AlignCenter, text);
 	
 	if(rect) *rect = r;
 }
diff --git a/kanagram/src/kanagram.h b/kanagram/src/kanagram.h
index db39fccc..504667c1 100644
--- a/kanagram/src/kanagram.h
+++ b/kanagram/src/kanagram.h
@@ -54,9 +54,10 @@ class KRandomSequence;
 class KanagramGame;
 class VocabSettings;
 
-class Kanagram : public QWidget
+class Kanagram : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 	public:
 		Kanagram();
 		~Kanagram();
diff --git a/kanagram/src/kanagramgame.cpp b/kanagram/src/kanagramgame.cpp
index 67212168..972c4c19 100644
--- a/kanagram/src/kanagramgame.cpp
+++ b/kanagram/src/kanagramgame.cpp
@@ -34,9 +34,9 @@
 
 #include <stdlib.h>
 
-KanagramGame::KanagramGame(TQWidget* parent) : m_index(0)
+KanagramGame::KanagramGame(TQWidget* tqparent) : m_index(0)
 {
-	m_parent = parent;
+	m_parent = tqparent;
 	loadDefaultVocab();
 }
 
@@ -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.")
-		  .arg(m_filename);
+		  .tqarg(m_filename);
 		KMessageBox::sorry(m_parent, msg, i18n("Error"));
 		exit(0);
 	}
@@ -138,7 +138,7 @@ void KanagramGame::nextAnagram()
 	{
 		m_answeredWords.clear();
 	}
-	while(m_answeredWords.findIndex(doc->getEntry(wordNumber)->getOriginal()) != -1)
+	while(m_answeredWords.tqfindIndex(doc->getEntry(wordNumber)->getOriginal()) != -1)
 	{
 		wordNumber = m_random.getLong(totalWords);
 	}
diff --git a/kanagram/src/kanagramgame.h b/kanagram/src/kanagramgame.h
index b7e30237..09b6c077 100644
--- a/kanagram/src/kanagramgame.h
+++ b/kanagram/src/kanagramgame.h
@@ -28,11 +28,12 @@
 
 class TQWidget;
 
-class KanagramGame : public QObject
+class KanagramGame : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 	public:
-		KanagramGame(TQWidget *parent);
+		KanagramGame(TQWidget *tqparent);
 		~KanagramGame();
 		void refreshVocabList();
 		void loadDefaultVocab();
diff --git a/kanagram/src/keduvocdocument.cpp b/kanagram/src/keduvocdocument.cpp
index 4bfe29fc..49f5402c 100644
--- a/kanagram/src/keduvocdocument.cpp
+++ b/kanagram/src/keduvocdocument.cpp
@@ -44,7 +44,7 @@ using namespace std;
 //  KEduVocDocument
 //********************************************************
 
-KEduVocDocument::KEduVocDocument(TQObject * /*parent*/)
+KEduVocDocument::KEduVocDocument(TQObject * /*tqparent*/)
 {
   Init();
 }
@@ -99,7 +99,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
   if (!url.isEmpty())
     doc_url = url;
 
-  // TODO EPT  connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) );
+  // TODO EPT  connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), tqparent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) );
 
   TQString tmpfile;
   if (KIO::NetAccess::download( url, tmpfile, 0 ))
@@ -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>").arg(url.path()));
+      KMessageBox::error(0, i18n("<qt>Cannot open file<br><b>%1</b></qt>").tqarg(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.arg(url.path());
+        TQString msg = format.tqarg(url.path());
         int result = KMessageBox::warningContinueCancel(0, msg,
                                                         kapp->makeStdCaption(i18n("I/O Failure")),
                                                         i18n("&Retry"));
@@ -180,9 +180,9 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
 }
 
 
-bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType ft, const TQString & generator)
+bool KEduVocDocument::saveAs(TQObject * /*tqparent*/, const KURL & url, FileType ft, const TQString & generator)
 {
-//  connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) );
+//  connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), tqparent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) );
 
   KURL tmp (url);
 
@@ -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>").arg(tmp.path()));
+      KMessageBox::error(0, i18n("<qt>Cannot write to file<br><b>%1</b></qt>").tqarg(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.arg(tmp.path());
+      TQString msg = format.tqarg(tmp.path());
       int result = KMessageBox::warningContinueCancel(0, msg,
                                                       kapp->makeStdCaption(i18n("I/O Failure")),
                                                       i18n("&Retry"));
@@ -717,7 +717,7 @@ void KEduVocDocument::setLeitnerSystem( LeitnerSystem* system )
 {
 	leitnerSystem = system;
 	
-	/*KWordQuizApp* app = (KWordQuizApp*) parent();
+	/*KWordQuizApp* app = (KWordQuizApp*) tqparent();
 	app->slotLeitnerSystem();*/
 }
 
@@ -901,11 +901,11 @@ int KEduVocDocument::search(TQString substr, int id,
    if (id == 0) {
      for (int i = first; i < last; i++) {
        if (word_start) {
-         if (getEntry(i)->getOriginal().find (substr, 0, false) == 0)  // case insensitive
+         if (getEntry(i)->getOriginal().tqfind (substr, 0, false) == 0)  // case insensitive
            return i;
        }
        else {
-         if (getEntry(i)->getOriginal().find (substr, 0, false) > -1)  // case insensitive
+         if (getEntry(i)->getOriginal().tqfind (substr, 0, false) > -1)  // case insensitive
            return i;
        }
      }
@@ -913,11 +913,11 @@ int KEduVocDocument::search(TQString substr, int id,
    else {
      for (int i = first; i < last; i++) {
        if (word_start) {
-         if (getEntry(i)->getTranslation(id).find (substr, 0, false) == 0) // case insensitive
+         if (getEntry(i)->getTranslation(id).tqfind (substr, 0, false) == 0) // case insensitive
            return i;
        }
        else {
-         if (getEntry(i)->getTranslation(id).find (substr, 0, false) > -1) // case insensitive
+         if (getEntry(i)->getTranslation(id).tqfind (substr, 0, false) > -1) // case insensitive
            return i;
        }
      }
@@ -972,7 +972,7 @@ KEduVocDocument::FileType KEduVocDocument::detectFT(const TQString &filename)
 
    TQDataStream is( &f );
 
-   Q_INT8 c1, c2, c3, c4, c5;
+   TQ_INT8 c1, c2, c3, c4, c5;
    is >> c1
       >> c2
       >> c3
@@ -989,13 +989,13 @@ KEduVocDocument::FileType KEduVocDocument::detectFT(const TQString &filename)
    line.insert (0, c1);
    f.close();
 
-   bool stat = is.device()->status();
+   bool stat = is.tqdevice()->status();
    if (stat != IO_Ok)
      return kvd_none;
    if (c1 == '<' && c2 == '?' && c3 == 'x' && c4 == 'm' && c5 == 'l')
      return kvtml;
 
-   if (line.find (VCB_SEPARATOR) >= 0)
+   if (line.tqfind (VCB_SEPARATOR) >= 0)
      return vt_vcb;
 
    if (line == LEX_IDENT_50)
diff --git a/kanagram/src/keduvocdocument.h b/kanagram/src/keduvocdocument.h
index ebc48010..468f3089 100644
--- a/kanagram/src/keduvocdocument.h
+++ b/kanagram/src/keduvocdocument.h
@@ -48,7 +48,7 @@
 #define KV_ORG         "o"         // original expression in specified language
 #define KV_TRANS       "t"         // translated expression in specified language
 #define KV_LANG        "l"         // language: en, de, it, fr ...
-#define KV_QUERY       "q"         // query: org or translation
+#define KV_TQUERY       "q"         // query: org or translation
 #define KV_O           "o"         // org
 #define KV_T           "t"         // translation
 #define KV_GRADE       "g"         // grade of knowledge: 0=well known, x=not known for x times
@@ -104,7 +104,7 @@
 #define KV_LESS_GRP    "lesson"    // lesson descriptor group
 #define KV_LESS_CURR   "current"   // is current lesson
 #define KV_LESS_DESC   "desc"      // lesson descriptor
-#define KV_LESS_QUERY  "query"     // lesson contained in query
+#define KV_LESS_TQUERY  "query"     // lesson contained in query
 #define KV_LESS_NO     "no"        // lesson descriptor number
 
 /*
@@ -232,7 +232,7 @@
 
 #define KVTML_EXT        "kvtml"
 #define VT5_LEX_EXT      "lex"
-#define QVOCAB_EXT       "qvo"
+#define TQVOCAB_EXT       "qvo"
 #define VCB_EXT          "vocab"
 #define KVL_EXT          "vl"
 #define CSV_EXT          "csv"
@@ -249,9 +249,10 @@ class LeitnerSystem;
   * This class contains the expressions of your vocabulary
   ************************************************************/
 
-class KEduVocDocument : public QObject
+class KEduVocDocument : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class KEduVocKvtmlWriter;
   friend class KEduVocKvtmlReader;
  
@@ -439,7 +440,7 @@ class KEduVocDocument : public QObject
    * @param url     if url is empty (or NULL) actual name is preserved
    * @result         true if successful
    */
-  bool saveAs(TQObject *parent, const KURL & url, FileType ft, const TQString & generator);
+  bool saveAs(TQObject *tqparent, const KURL & url, FileType ft, const TQString & generator);
 
   /** returns count of entries
    */
diff --git a/kanagram/src/keduvocexpression.cpp b/kanagram/src/keduvocexpression.cpp
index 8d01c8ba..0c82897b 100644
--- a/kanagram/src/keduvocexpression.cpp
+++ b/kanagram/src/keduvocexpression.cpp
@@ -55,7 +55,7 @@ KEduVocExpression::KEduVocExpression (TQString &s, TQString separator, int _less
   lesson = _lesson;
 
   if (separator.length() ) {
-    int pos = s.find(separator);
+    int pos = s.tqfind(separator);
 
     if (pos == -1) {
       setOriginal(s.stripWhiteSpace());
@@ -67,7 +67,7 @@ KEduVocExpression::KEduVocExpression (TQString &s, TQString separator, int _less
 //      s.stripWhiteSpace();
 
       // gather all translations
-      while ((pos = s.find(separator)) != -1) {
+      while ((pos = s.tqfind(separator)) != -1) {
         se = s.left(pos).stripWhiteSpace();
         addTranslation(se, KV_NORM_GRADE, KV_NORM_GRADE);
         s.remove (0, pos+separator.length() );
diff --git a/kanagram/src/keduvocexpression.h b/kanagram/src/keduvocexpression.h
index eb3ac4ec..c86acf8e 100644
--- a/kanagram/src/keduvocexpression.h
+++ b/kanagram/src/keduvocexpression.h
@@ -23,7 +23,7 @@
 #define KV_MIN_GRADE       0
 
 #define KV_NORM_GRADE      0       // not queried yet
-#define KV_NORM_COLOR      Qt::black
+#define KV_NORM_COLOR      TQt::black
 #define KV_NORM_TEXT       I18N_NOOP("Not Queried Yet")
 
 #define KV_LEV1_GRADE      1
diff --git a/kanagram/src/keduvockvtmlreader.cpp b/kanagram/src/keduvockvtmlreader.cpp
index fc1441f6..687fdaee 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_QUERY);
+      TQDomAttr domAttrQuery = domElementChild.attributeNode(KV_LESS_TQUERY);
       if (!domAttrQuery.isNull())
         m_doc->lessons_in_query.push_back(domAttrQuery.value().toInt() != 0);
       else
@@ -131,7 +131,7 @@ bool KEduVocKvtmlReader::readArticle(TQDomElement &domElementParent)
   {
     if (domElementEntry.tagName() != KV_ART_ENTRY)
     {
-      domError(i18n("expected tag <%1>").arg(KV_ART_ENTRY));
+      domError(i18n("expected tag <%1>").tqarg(KV_ART_ENTRY));
       return false;
     }
 
@@ -331,7 +331,7 @@ bool KEduVocKvtmlReader::readConjug(TQDomElement &domElementParent,
 
       if (type.length() != 0 && type.left(1) == UL_USER_TENSE)
       {
-        int num = QMIN(type.mid (1, 40).toInt(), 1000); // paranoia check
+        int num = TQMIN(type.mid (1, 40).toInt(), 1000); // paranoia check
         if( num > (int) m_doc->tense_descr.size() )
         {
           // description missing ?
@@ -783,7 +783,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement
   if (!domAttrGrade.isNull())
   {
     TQString s = domAttrGrade.value();
-    if ((pos = s.find(';')) >= 1)
+    if ((pos = s.tqfind(';')) >= 1)
     {
       grade = s.left(pos).toInt();
       rev_grade = s.mid(pos+1, s.length()).toInt();
@@ -798,7 +798,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement
   if (!domAttrCount.isNull())
   {
     TQString s = domAttrCount.value();
-    if ((pos = s.find(';')) >= 1)
+    if ((pos = s.tqfind(';')) >= 1)
     {
       count = s.left(pos).toInt();
       rev_count = s.mid(pos+1, s.length()).toInt();
@@ -813,7 +813,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement
   if (!domAttrBad.isNull())
   {
     TQString s = domAttrBad.value();
-    if ((pos = s.find(';')) >= 1)
+    if ((pos = s.tqfind(';')) >= 1)
     {
       bcount = s.left(pos).toInt();
       rev_bcount = s.mid(pos+1, s.length()).toInt();
@@ -828,7 +828,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement
   if (!domAttrDate.isNull())
   {
     TQString s = domAttrDate.value();
-    if ((pos = s.find(';')) >= 1)
+    if ((pos = s.tqfind(';')) >= 1)
     {
       date = s.left(pos).toInt();
       rev_date = s.mid(pos+1, s.length()).toInt();
@@ -841,7 +841,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement
   if (!domAttrDate2.isNull())
   {
     TQString s = domAttrDate2.value();
-    if ((pos = s.find(';')) >= 1)
+    if ((pos = s.tqfind(';')) >= 1)
     {
       date = m_doc->decompressDate(s.left(pos));
       rev_date = m_doc->decompressDate(s.mid(pos+1, s.length()));
@@ -882,7 +882,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement
     usage = domAttrUsage.value();
     if (usage.length() != 0 && usage.left(1) == UL_USER_USAGE)
     {
-      int num = QMIN(usage.mid (1, 40).toInt(), 1000); // paranioa check
+      int num = TQMIN(usage.mid (1, 40).toInt(), 1000); // paranioa check
       if( num > (int) m_doc->usage_descr.size() )
       {
         // description missing ?
@@ -912,15 +912,15 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement
   {
     type = domAttrExprType.value();
     if (type == "1")
-      type = QM_VERB;
+      type = TQM_VERB;
     else if (type == "2")  // convert from pre-0.5 versions
-      type = QM_NOUN;
+      type = TQM_NOUN;
     else if (type == "3")
-      type = QM_NAME;
+      type = TQM_NAME;
 
-    if (type.length() != 0 && type.left(1) == QM_USER_TYPE)
+    if (type.length() != 0 && type.left(1) == TQM_USER_TYPE)
     {
-      int num = QMIN(type.mid (1, 40).toInt(), 1000); // paranoia check
+      int num = TQMIN(type.mid (1, 40).toInt(), 1000); // paranoia check
       if( num > (int) m_doc->type_descr.size() )
       {
         // description missing ?
@@ -941,7 +941,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( TQDomElement &domElement
     pronunce = domAttrPronunce.value();
 
   query_id = "";
-  TQDomAttr domAttrQuery = domElementExpressionChild.attributeNode(KV_QUERY);
+  TQDomAttr domAttrQuery = domElementExpressionChild.attributeNode(KV_TQUERY);
   if (!domAttrQuery.isNull())
     query_id = domAttrQuery.value();
 
@@ -1010,15 +1010,15 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
   {
     exprtype = !domAttrType.value().toInt();
     if (exprtype == "1")
-      exprtype = QM_VERB;
+      exprtype = TQM_VERB;
     else if (exprtype == "2")  // convert from pre-0.5 versions
-      exprtype = QM_NOUN;
+      exprtype = TQM_NOUN;
     else if (exprtype == "3")
-      exprtype = QM_NAME;
+      exprtype = TQM_NAME;
 
-    if (exprtype.length() != 0 && exprtype.left(1) == QM_USER_TYPE)
+    if (exprtype.length() != 0 && exprtype.left(1) == TQM_USER_TYPE)
     {
-      int num = QMIN(exprtype.mid (1, 40).toInt(), 1000); // paranoia check
+      int num = TQMIN(exprtype.mid (1, 40).toInt(), 1000); // paranoia check
       if( num > (int) m_doc->type_descr.size() )
       {
         // description missing ?
@@ -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").arg(KV_ORG));
+    domError(i18n("starting tag <%1> is missing").tqarg(KV_ORG));
     return false;
   }
 
@@ -1139,7 +1139,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
     {
       if (bConjug)
       {
-        domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
         return false;
       }
       bConjug = true;
@@ -1152,7 +1152,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
     {
       if (bComparison)
       {
-        domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
         return false;
       }
       bComparison = true;
@@ -1165,7 +1165,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
     {
       if (bMultipleChoice)
       {
-        domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").tqarg(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").arg(KV_TRANS));
+      domError(i18n("starting tag <%1> is missing").tqarg(KV_TRANS));
       return false;
     }
 
@@ -1317,7 +1317,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
       {
         if (bConjug)
         {
-          domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
+          domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
           return false;
         }
         bConjug = true;
@@ -1330,7 +1330,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
       {
         if (bComparison)
         {
-          domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
+          domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
           return false;
         }
         bComparison = true;
@@ -1343,7 +1343,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
       {
         if (bMultipleChoice)
         {
-          domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
+          domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
           return false;
         }
         bMultipleChoice = true;
@@ -1456,7 +1456,7 @@ if (lines != 0)
     {
       if (lessgroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
         return false;
       }
       lessgroup = true;
@@ -1468,7 +1468,7 @@ if (lines != 0)
     {
       if (articlegroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
         return false;
       }
       articlegroup = true;
@@ -1480,7 +1480,7 @@ if (lines != 0)
     {
       if (conjuggroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
         return false;
       }
       conjuggroup = true;
@@ -1492,7 +1492,7 @@ if (lines != 0)
     {
       if (optgroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
         return false;
       }
       optgroup = true;
@@ -1504,7 +1504,7 @@ if (lines != 0)
     {
       if (attrgroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
         return false;
       }
       attrgroup = true;
@@ -1516,7 +1516,7 @@ if (lines != 0)
     {
       if (tensegroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
         return false;
       }
       tensegroup = true;
@@ -1528,7 +1528,7 @@ if (lines != 0)
     {
       if (usagegroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").tqarg(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." ).arg(KV_DOCTYPE).arg(domElementKvtml.tagName()));
+            "but tag <%2> was read." ).tqarg(KV_DOCTYPE).tqarg(domElementKvtml.tagName()));
     return false;
   }
 
@@ -1602,7 +1602,7 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc)
   if (!domAttrEncoding.isNull())
   {
     // TODO handle old encodings
-    // Qt DOM API autodetects encoding, so is there anything to do ?
+    // TQt DOM API autodetects encoding, so is there anything to do ?
   }
 
   TQDomAttr domAttrTitle = domElementKvtml.attributeNode(KV_TITLE);
@@ -1633,7 +1633,7 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc)
   if (!domAttrGenerator.isNull())
   {
     m_doc->generator = domAttrGenerator.value();
-    int pos = m_doc->generator.findRev (KVD_VERS_PREFIX);
+    int pos = m_doc->generator.tqfindRev (KVD_VERS_PREFIX);
     if (pos >= 0)
     {
       m_doc->doc_version = m_doc->generator;
@@ -1667,7 +1667,7 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc)
 
 void KEduVocKvtmlReader::domErrorUnknownElement(const TQString &elem)
 {
-  TQString ln = i18n("File:\t%1\n").arg(m_doc->URL().path());
+  TQString ln = i18n("File:\t%1\n").tqarg(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.arg(elem);
+  TQString msg = format.tqarg(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").arg(m_doc->URL().path());
+  TQString ln = i18n("File:\t%1\n").tqarg(m_doc->URL().path());
   TQString msg = text;
   KMessageBox::error(0, ln+msg, s);
   TQApplication::restoreOverrideCursor();
diff --git a/kanagram/src/keduvockvtmlreader.h b/kanagram/src/keduvockvtmlreader.h
index a68d4575..acd29782 100644
--- a/kanagram/src/keduvockvtmlreader.h
+++ b/kanagram/src/keduvockvtmlreader.h
@@ -30,36 +30,36 @@ class KEduVocDocument;
 
 // internal types, indented are subtypes
 
-#define QM_VERB           "v"    // go
-#define   QM_VERB_IRR     "ir"
-#define   QM_VERB_REG     "re"
-#define QM_NOUN           "n"    // table, coffee
-#define   QM_NOUN_F       "f"
-#define   QM_NOUN_M       "m"
-#define   QM_NOUN_S       "s"
-#define QM_NAME           "nm"
-#define QM_ART            "ar"   // article
-#define   QM_ART_DEF      "def"  // definite    a/an
-#define   QM_ART_IND      "ind"  // indefinite  the
-#define QM_ADJ            "aj"   // adjective   expensive, good
-#define QM_ADV            "av"   // adverb      today, strongly
-#define QM_PRON           "pr"   // pronoun     you, she
-#define   QM_PRON_POS     "pos"  // possessive  my, your
-#define   QM_PRON_PER     "per"  // personal
-#define QM_PHRASE         "ph"
-#define QM_NUM            "num"  // numeral
-#define   QM_NUM_ORD      "ord"  // ordinal     first, second
-#define   QM_NUM_CARD     "crd"  // cardinal    one, two
-#define QM_INFORMAL       "ifm"
-#define QM_FIG            "fig"
-#define QM_CON            "con"  // conjuncton  and, but
-#define QM_PREP           "pre"  // preposition behind, between
-#define QM_QUEST          "qu"   // question    who, what
+#define TQM_VERB           "v"    // go
+#define   TQM_VERB_IRR     "ir"
+#define   TQM_VERB_REG     "re"
+#define TQM_NOUN           "n"    // table, coffee
+#define   TQM_NOUN_F       "f"
+#define   TQM_NOUN_M       "m"
+#define   TQM_NOUN_S       "s"
+#define TQM_NAME           "nm"
+#define TQM_ART            "ar"   // article
+#define   TQM_ART_DEF      "def"  // definite    a/an
+#define   TQM_ART_IND      "ind"  // indefinite  the
+#define TQM_ADJ            "aj"   // adjective   expensive, good
+#define TQM_ADV            "av"   // adverb      today, strongly
+#define TQM_PRON           "pr"   // pronoun     you, she
+#define   TQM_PRON_POS     "pos"  // possessive  my, your
+#define   TQM_PRON_PER     "per"  // personal
+#define TQM_PHRASE         "ph"
+#define TQM_NUM            "num"  // numeral
+#define   TQM_NUM_ORD      "ord"  // ordinal     first, second
+#define   TQM_NUM_CARD     "crd"  // cardinal    one, two
+#define TQM_INFORMAL       "ifm"
+#define TQM_FIG            "fig"
+#define TQM_CON            "con"  // conjuncton  and, but
+#define TQM_PREP           "pre"  // preposition behind, between
+#define TQM_QUEST          "qu"   // question    who, what
 
 // type delimiters
 
-#define QM_USER_TYPE  "#"   // designates number of user type
-#define QM_TYPE_DIV   ":"   // divide main from subtype
+#define TQM_USER_TYPE  "#"   // designates number of user type
+#define TQM_TYPE_DIV   ":"   // divide main from subtype
 
 // usage delimiters (also declared in UsageManager.h)
 
@@ -68,7 +68,7 @@ class KEduVocDocument;
 /**
 @author Eric Pignet
 */
-class KEduVocKvtmlReader : public QObject
+class KEduVocKvtmlReader : public TQObject
 {
 public:
 	KEduVocKvtmlReader(TQFile *file);
diff --git a/kanagram/src/keduvockvtmlwriter.cpp b/kanagram/src/keduvockvtmlwriter.cpp
index 5aef1645..8789c7d6 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_QUERY, 1);
+        domElementDesc.setAttribute (KV_LESS_TQUERY, 1);
 
       domElementDesc.appendChild(domTextDesc);
       domElementLesson.appendChild(domElementDesc);
@@ -268,7 +268,7 @@ bool KEduVocKvtmlWriter::saveConjugHeader(TQDomDocument &domDoc, TQDomElement &d
   TQDomElement domElementConjug = domDoc.createElement(KV_CONJUG_GRP);
   TQString s;
 
-  for (int ent = 0; ent < QMIN((int) curr_conjug.size(), m_doc->numLangs()); ent++)
+  for (int ent = 0; ent < TQMIN((int) curr_conjug.size(), m_doc->numLangs()); ent++)
   {
     TQDomElement domElementEntry = domDoc.createElement(KV_CON_ENTRY);
 
@@ -478,7 +478,7 @@ bool KEduVocKvtmlWriter::saveArticleKvtMl(TQDomDocument &domDoc, TQDomElement &d
   TQDomElement domElementArticle = domDoc.createElement(KV_ARTICLE_GRP);
   TQString def, indef, s;
 
-  for (int lfn = 0; lfn < QMIN((int) m_doc->articles.size(), m_doc->numLangs()); lfn++)
+  for (int lfn = 0; lfn < TQMIN((int) m_doc->articles.size(), m_doc->numLangs()); lfn++)
   {
     TQDomElement domElementEntry = domDoc.createElement(KV_ART_ENTRY);
     if (lfn == 0)
@@ -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_QUERY, (TQString) KV_O);
+        domElementOriginal.setAttribute(KV_TQUERY, (TQString) KV_O);
       else if (s == q_trans)
-        domElementOriginal.setAttribute(KV_QUERY, (TQString) KV_T);
+        domElementOriginal.setAttribute(KV_TQUERY, (TQString) KV_T);
 
     }
 
@@ -781,20 +781,20 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const TQString &generato
 
     TQString s;
     TQString entype = s = (*first).getType(0);
-    int pos = s.find (QM_TYPE_DIV);
+    int pos = s.tqfind (TQM_TYPE_DIV);
     if (pos >= 0)
       entype = s.left (pos);
     else
       entype = s;
 
-    if (entype == QM_VERB
+    if (entype == TQM_VERB
         && (*first).getConjugation(0).numEntries() > 0)
     {
       Conjugation conj = (*first).getConjugation(0);
       if (!saveConjugEntry(domDoc, domElementOriginal, conj))
         return false;
     }
-    else if (entype == QM_ADJ
+    else if (entype == TQM_ADJ
              && !(*first).getComparison(0).isEmpty())
     {
       Comparison comp = (*first).getComparison(0);
@@ -825,9 +825,9 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const TQString &generato
         }
         domElementTranslation.setAttribute(KV_LANG, s);
         if (s == q_org)
-          domElementTranslation.setAttribute(KV_QUERY, (TQString) KV_O);
+          domElementTranslation.setAttribute(KV_TQUERY, (TQString) KV_O);
         else if (s == q_trans)
-          domElementTranslation.setAttribute(KV_QUERY, (TQString) KV_T);
+          domElementTranslation.setAttribute(KV_TQUERY, (TQString) KV_T);
       }
 
       TQString s1, s2;
@@ -901,13 +901,13 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const TQString &generato
 
       TQString s;
       TQString entype = s = (*first).getType(0);
-      int pos = s.find (QM_TYPE_DIV);
+      int pos = s.tqfind (TQM_TYPE_DIV);
       if (pos >= 0)
         entype = s.left (pos);
       else
         entype = s;
 
-      if (entype == QM_VERB
+      if (entype == TQM_VERB
           && (*first).getConjugation(trans).numEntries() > 0)
       {
         Conjugation conj = (*first).getConjugation(trans);
@@ -915,7 +915,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const TQString &generato
           return false;
       }
 
-      if (entype == QM_ADJ
+      if (entype == TQM_ADJ
           && !(*first).getComparison(trans).isEmpty())
       {
         Comparison comp = (*first).getComparison(trans);
diff --git a/kanagram/src/keduvockvtmlwriter.h b/kanagram/src/keduvockvtmlwriter.h
index 969cedf0..e8ff5de8 100644
--- a/kanagram/src/keduvockvtmlwriter.h
+++ b/kanagram/src/keduvockvtmlwriter.h
@@ -30,36 +30,36 @@ class KEduVocDocument;
 
 // internal types, indented are subtypes
 
-#define QM_VERB           "v"    // go
-#define   QM_VERB_IRR     "ir"
-#define   QM_VERB_REG     "re"
-#define QM_NOUN           "n"    // table, coffee
-#define   QM_NOUN_F       "f"
-#define   QM_NOUN_M       "m"
-#define   QM_NOUN_S       "s"
-#define QM_NAME           "nm"
-#define QM_ART            "ar"   // article
-#define   QM_ART_DEF      "def"  // definite    a/an
-#define   QM_ART_IND      "ind"  // indefinite  the
-#define QM_ADJ            "aj"   // adjective   expensive, good
-#define QM_ADV            "av"   // adverb      today, strongly
-#define QM_PRON           "pr"   // pronoun     you, she
-#define   QM_PRON_POS     "pos"  // possessive  my, your
-#define   QM_PRON_PER     "per"  // personal
-#define QM_PHRASE         "ph"
-#define QM_NUM            "num"  // numeral
-#define   QM_NUM_ORD      "ord"  // ordinal     first, second
-#define   QM_NUM_CARD     "crd"  // cardinal    one, two
-#define QM_INFORMAL       "ifm"
-#define QM_FIG            "fig"
-#define QM_CON            "con"  // conjuncton  and, but
-#define QM_PREP           "pre"  // preposition behind, between
-#define QM_QUEST          "qu"   // question    who, what
+#define TQM_VERB           "v"    // go
+#define   TQM_VERB_IRR     "ir"
+#define   TQM_VERB_REG     "re"
+#define TQM_NOUN           "n"    // table, coffee
+#define   TQM_NOUN_F       "f"
+#define   TQM_NOUN_M       "m"
+#define   TQM_NOUN_S       "s"
+#define TQM_NAME           "nm"
+#define TQM_ART            "ar"   // article
+#define   TQM_ART_DEF      "def"  // definite    a/an
+#define   TQM_ART_IND      "ind"  // indefinite  the
+#define TQM_ADJ            "aj"   // adjective   expensive, good
+#define TQM_ADV            "av"   // adverb      today, strongly
+#define TQM_PRON           "pr"   // pronoun     you, she
+#define   TQM_PRON_POS     "pos"  // possessive  my, your
+#define   TQM_PRON_PER     "per"  // personal
+#define TQM_PHRASE         "ph"
+#define TQM_NUM            "num"  // numeral
+#define   TQM_NUM_ORD      "ord"  // ordinal     first, second
+#define   TQM_NUM_CARD     "crd"  // cardinal    one, two
+#define TQM_INFORMAL       "ifm"
+#define TQM_FIG            "fig"
+#define TQM_CON            "con"  // conjuncton  and, but
+#define TQM_PREP           "pre"  // preposition behind, between
+#define TQM_QUEST          "qu"   // question    who, what
 
 // type delimiters
 
-#define QM_USER_TYPE  "#"   // designates number of user type
-#define QM_TYPE_DIV   ":"   // divide main from subtype
+#define TQM_USER_TYPE  "#"   // designates number of user type
+#define TQM_TYPE_DIV   ":"   // divide main from subtype
 
 /**
 @author Eric Pignet
diff --git a/kanagram/src/leitnersystem.cpp b/kanagram/src/leitnersystem.cpp
index 0705c5c2..6a44593b 100644
--- a/kanagram/src/leitnersystem.cpp
+++ b/kanagram/src/leitnersystem.cpp
@@ -79,7 +79,7 @@ const TQString& LeitnerSystem::getNextBox( TQString& previousBox )
 			return getBox( i );
 	}
 	
-	return TQString::null;
+	return TQString();
 }
 
 const TQString& LeitnerSystem::getCorrectBox( int box )
@@ -114,7 +114,7 @@ void LeitnerSystem::deleteBox( LeitnerBox* box )
 
 bool LeitnerSystem::insertBox( const TQString& name, int correctWordBox, int wrongWordBox )
 {
-	if( getBoxNameList().contains( name ) != 0 )
+	if( getBoxNameList().tqcontains( name ) != 0 )
 		return false;
 	
 	LeitnerBox tmpBox;
@@ -133,9 +133,9 @@ void LeitnerSystem::setSystemName( const TQString& name )
 
 int LeitnerSystem::getNumber( LeitnerBox* box )
 {
-	if( m_boxes.findIndex( *box ) == -1 )
+	if( m_boxes.tqfindIndex( *box ) == -1 )
 		kdDebug() << "muhaha" << endl;
-	return m_boxes.findIndex( *box );
+	return m_boxes.tqfindIndex( *box );
 }
 
 bool LeitnerSystem::setBoxName( int box, const TQString& name )
@@ -164,7 +164,7 @@ bool LeitnerSystem::setBoxName( LeitnerBox* box, const TQString& name )
 
 bool LeitnerSystem::insertBox( const TQString& name )
 {
-	if( getBoxNameList().contains( name ) != 0 )
+	if( getBoxNameList().tqcontains( name ) != 0 )
 		return false;
 	
 	LeitnerBox tmpBox;
diff --git a/kanagram/src/leitnersystemview.cpp b/kanagram/src/leitnersystemview.cpp
index cbbb0400..e49c0e07 100644
--- a/kanagram/src/leitnersystemview.cpp
+++ b/kanagram/src/leitnersystemview.cpp
@@ -20,8 +20,8 @@
 
 #include <kdebug.h>
 
-LeitnerSystemView::LeitnerSystemView(TQWidget * parent, const char* name, WFlags f)
- : TQScrollView(parent, name, f)
+LeitnerSystemView::LeitnerSystemView(TQWidget * tqparent, const char* name, WFlags f)
+ : TQScrollView(tqparent, name, f)
 {
 	m_highlightedBox = -1;
 }
@@ -116,7 +116,7 @@ void LeitnerSystemView::setSystem(LeitnerSystem* leitnersystem)
 	//calculate the new sizes
 	calculateSize();
 	updateContents();
-	//repaint
+	//tqrepaint
 	//update();
 	//TQPainter* p = new TQPainter(this);
 	//drawContents( p, 0, 0, 0, 0 );
diff --git a/kanagram/src/leitnersystemview.h b/kanagram/src/leitnersystemview.h
index 9f540cdf..11108f9f 100644
--- a/kanagram/src/leitnersystemview.h
+++ b/kanagram/src/leitnersystemview.h
@@ -22,12 +22,13 @@ class LeitnerSystem;
 @author Martin Pfeiffer
 */
 
-class LeitnerSystemView : public QScrollView
+class LeitnerSystemView : public TQScrollView
 {
 	Q_OBJECT
+  TQ_OBJECT
 		
 public:
-    LeitnerSystemView(TQWidget* parent = 0, const char* name = 0, WFlags f = 0);
+    LeitnerSystemView(TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0);
 
     ~LeitnerSystemView();
 
diff --git a/kanagram/src/mainsettings.cpp b/kanagram/src/mainsettings.cpp
index 1e026758..6ca548ee 100644
--- a/kanagram/src/mainsettings.cpp
+++ b/kanagram/src/mainsettings.cpp
@@ -35,11 +35,11 @@
 #include "mainsettings.h"
 #include "kanagramsettings.h"
 
-MainSettings::MainSettings(TQWidget *parent) : MainSettingsWidget(parent)
+MainSettings::MainSettings(TQWidget *tqparent) : MainSettingsWidget(tqparent)
 {
-	m_parent = (KConfigDialog*)parent;
+	m_parent = (KConfigDialog*)tqparent;
 
-	connect(parent, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotChangeTranslation()));
+	connect(tqparent, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotChangeTranslation()));
 	connect(cboxTranslation, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdateParent()));
 	
 	setupTranslations();
@@ -109,7 +109,7 @@ void MainSettings::setupTranslations()
 		temp_languages.remove("..");
 		for (TQStringList::const_iterator it2 = temp_languages.begin(); it2 != temp_languages.end(); ++it2 )
 		{
-			if (!languages.contains(*it2)) languages.append(*it2);
+			if (!languages.tqcontains(*it2)) languages.append(*it2);
 		}
 	}
 	
diff --git a/kanagram/src/mainsettings.h b/kanagram/src/mainsettings.h
index 172b5276..c82d8fd6 100644
--- a/kanagram/src/mainsettings.h
+++ b/kanagram/src/mainsettings.h
@@ -30,8 +30,9 @@ class KConfigDialog;
 class MainSettings : public MainSettingsWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 	public:
-		MainSettings(TQWidget *parent);
+		MainSettings(TQWidget *tqparent);
 		~MainSettings();
 	
 	public slots:
diff --git a/kanagram/src/mainsettingswidget.ui b/kanagram/src/mainsettingswidget.ui
index ef9d017e..2848bb43 100644
--- a/kanagram/src/mainsettingswidget.ui
+++ b/kanagram/src/mainsettingswidget.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>MainSettingsWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>MainSettingsWidget</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -33,7 +33,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1_2</cstring>
                     </property>
@@ -41,7 +41,7 @@
                         <string>Auto-hide hints after:</string>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <item>
                         <property name="text">
                             <string>Do Not Auto-Hide Hints</string>
@@ -73,7 +73,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox3</cstring>
             </property>
@@ -84,15 +84,15 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
@@ -103,7 +103,7 @@
                                 <cstring>cboxTranslation</cstring>
                             </property>
                         </widget>
-                        <widget class="QComboBox">
+                        <widget class="TQComboBox">
                             <property name="name">
                                 <cstring>cboxTranslation</cstring>
                             </property>
@@ -112,15 +112,15 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>kcfg_useStandardFonts</cstring>
                     </property>
@@ -134,7 +134,7 @@
                         <string>Uses a standard font for the chalkboard/interface.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>getFontsButton</cstring>
                     </property>
@@ -144,7 +144,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>kcfg_useSounds</cstring>
             </property>
@@ -165,7 +165,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>16</height>
@@ -178,5 +178,5 @@
     <tabstop>kcfg_hintHideTime</tabstop>
     <tabstop>kcfg_useSounds</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kanagram/src/newstuff.cpp b/kanagram/src/newstuff.cpp
index 7c72f938..d437f953 100644
--- a/kanagram/src/newstuff.cpp
+++ b/kanagram/src/newstuff.cpp
@@ -11,7 +11,7 @@
 #include "kanagramsettings.h"
 #include "newstuffdialog.h"
 
-NewStuff::NewStuff(TQWidget *parent) : NewStuffWidget(parent)
+NewStuff::NewStuff(TQWidget *tqparent) : NewStuffWidget(tqparent)
 {
 	connect(btnGetNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewVocabs()));
 }
diff --git a/kanagram/src/newstuff.h b/kanagram/src/newstuff.h
index cad963f7..880f5e7d 100644
--- a/kanagram/src/newstuff.h
+++ b/kanagram/src/newstuff.h
@@ -6,8 +6,9 @@
 class NewStuff : public NewStuffWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 	public:
-		NewStuff(TQWidget *parent);
+		NewStuff(TQWidget *tqparent);
 		~NewStuff();
 
 	private slots:
diff --git a/kanagram/src/newstuffwidget.ui b/kanagram/src/newstuffwidget.ui
index f1b1bb23..d5670df2 100644
--- a/kanagram/src/newstuffwidget.ui
+++ b/kanagram/src/newstuffwidget.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>NewStuffWidget</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>NewStuffWidget</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -41,14 +41,14 @@ the button to get new vocabulary files.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="2" column="0">
+        <widget class="TQPushButton" row="2" column="0">
             <property name="name">
                 <cstring>btnGetNew</cstring>
             </property>
@@ -58,5 +58,5 @@ the button to get new vocabulary files.</string>
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kanagram/src/vocabedit.cpp b/kanagram/src/vocabedit.cpp
index 46a81450..2315faa4 100644
--- a/kanagram/src/vocabedit.cpp
+++ b/kanagram/src/vocabedit.cpp
@@ -41,12 +41,12 @@
 #include "kanagramsettings.h"
 
 
-VocabEdit::VocabEdit(TQWidget *parent, TQString fileName) : VocabEditWidget(parent), m_fileName("")
+VocabEdit::VocabEdit(TQWidget *tqparent, TQString fileName) : VocabEditWidget(tqparent), m_fileName("")
 {
 	if(fileName != "")
 	{
 		m_fileName = fileName;
-		KEduVocDocument	*doc = new KEduVocDocument(this);
+		KEduVocDocument	*doc = new KEduVocDocument(TQT_TQOBJECT(this));
 		doc->open(KURL(m_fileName), false);
 		for(int i = 0; i < doc->numEntries(); i++)
 		{
@@ -83,7 +83,7 @@ VocabEdit::~VocabEdit()
 
 void VocabEdit::slotSave()
 {
-	KEduVocDocument *doc = new KEduVocDocument(this);
+	KEduVocDocument *doc = new KEduVocDocument(TQT_TQOBJECT(this));
 	doc->setTitle(txtVocabName->text());
 	doc->setDocRemark(txtDescription->text());
 	for(uint i = 0; i < m_vocabList.size(); i++)
@@ -94,15 +94,15 @@ void VocabEdit::slotSave()
 	TQString fileName;
 	if(m_fileName == "")
 	{
-		fileName = KGlobal::dirs()->saveLocation("data", "kanagram/data/" + KanagramSettings::dataLanguage()) + txtVocabName->text().lower().replace(" ", "") + ".kvtml";
+		fileName = KGlobal::dirs()->saveLocation("data", "kanagram/data/" + KanagramSettings::dataLanguage()) + txtVocabName->text().lower().tqreplace(" ", "") + ".kvtml";
 	}
 	else
 	{
 		fileName = m_fileName;
 	}
-	doc->saveAs(this, KURL(fileName), KEduVocDocument::automatic, "kanagram");
+	doc->saveAs(TQT_TQOBJECT(this), KURL(fileName), KEduVocDocument::automatic, "kanagram");
 
-	VocabSettings *settings = (VocabSettings*)this->parentWidget();
+	VocabSettings *settings = (VocabSettings*)this->tqparentWidget();
 	settings->refreshView();
 
 	if(m_textChanged)
diff --git a/kanagram/src/vocabedit.h b/kanagram/src/vocabedit.h
index d4e84238..99b0e868 100644
--- a/kanagram/src/vocabedit.h
+++ b/kanagram/src/vocabedit.h
@@ -32,9 +32,10 @@ class KEduVocExpression;
 class VocabEdit : public VocabEditWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 	public:
-		VocabEdit(TQWidget *parent);
-		VocabEdit(TQWidget *parent, TQString fileName);
+		VocabEdit(TQWidget *tqparent);
+		VocabEdit(TQWidget *tqparent, TQString fileName);
 		~VocabEdit();
 	
 	public slots:
diff --git a/kanagram/src/vocabeditwidget.ui b/kanagram/src/vocabeditwidget.ui
index d4d1229d..c80f8ba8 100644
--- a/kanagram/src/vocabeditwidget.ui
+++ b/kanagram/src/vocabeditwidget.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>VocabEditWidget</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>VocabEditWidget</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -19,23 +19,23 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget" row="1" column="0">
+                <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>btnSave</cstring>
                             </property>
@@ -43,7 +43,7 @@
                                 <string>Save</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>btnClose</cstring>
                             </property>
@@ -53,23 +53,23 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <vbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout5</cstring>
+                                <cstring>tqlayout5</cstring>
                             </property>
                             <grid>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel" row="1" column="0">
+                                <widget class="TQLabel" row="1" column="0">
                                     <property name="name">
                                         <cstring>textLabel2</cstring>
                                     </property>
@@ -80,15 +80,15 @@
                                         <cstring>txtDescription</cstring>
                                     </property>
                                     <property name="whatsThis" stdset="0">
-                                        <string>The description of the vocabulary. If you're creating a new vocabulary, add a description so that users of your vocabulary will know what kinds of words it contains.</string>
+                                        <string>The description of the vocabulary. If you're creating a new vocabulary, add a description so that users of your vocabulary will know what kinds of words it tqcontains.</string>
                                     </property>
                                 </widget>
-                                <widget class="QLineEdit" row="0" column="1">
+                                <widget class="TQLineEdit" row="0" column="1">
                                     <property name="name">
                                         <cstring>txtVocabName</cstring>
                                     </property>
                                 </widget>
-                                <widget class="QLabel" row="0" column="0">
+                                <widget class="TQLabel" row="0" column="0">
                                     <property name="name">
                                         <cstring>textLabel1</cstring>
                                     </property>
@@ -102,30 +102,30 @@
                                         <string>The name of the vocabulary you are editing.</string>
                                     </property>
                                 </widget>
-                                <widget class="QLineEdit" row="1" column="1">
+                                <widget class="TQLineEdit" row="1" column="1">
                                     <property name="name">
                                         <cstring>txtDescription</cstring>
                                     </property>
                                 </widget>
                             </grid>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout7</cstring>
+                                <cstring>tqlayout7</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLayoutWidget">
+                                <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>layout6</cstring>
+                                        <cstring>tqlayout6</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
                                             <cstring>unnamed</cstring>
                                         </property>
-                                        <widget class="QPushButton">
+                                        <widget class="TQPushButton">
                                             <property name="name">
                                                 <cstring>btnRemoveWord</cstring>
                                             </property>
@@ -136,7 +136,7 @@
                                                 <string>Removes the selected word.</string>
                                             </property>
                                         </widget>
-                                        <widget class="QPushButton">
+                                        <widget class="TQPushButton">
                                             <property name="name">
                                                 <cstring>btnNewWord</cstring>
                                             </property>
@@ -149,7 +149,7 @@
                                         </widget>
                                     </vbox>
                                 </widget>
-                                <widget class="QListBox">
+                                <widget class="TQListBox">
                                     <property name="name">
                                         <cstring>lboxWords</cstring>
                                     </property>
@@ -159,15 +159,15 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout4</cstring>
+                                <cstring>tqlayout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel" row="0" column="0">
+                                <widget class="TQLabel" row="0" column="0">
                                     <property name="name">
                                         <cstring>textLabel3</cstring>
                                     </property>
@@ -181,17 +181,17 @@
                                         <string>The selected word. This box allows you to edit the selected word.</string>
                                     </property>
                                 </widget>
-                                <widget class="QLineEdit" row="1" column="1">
+                                <widget class="TQLineEdit" row="1" column="1">
                                     <property name="name">
                                         <cstring>txtHint</cstring>
                                     </property>
                                 </widget>
-                                <widget class="QLineEdit" row="0" column="1">
+                                <widget class="TQLineEdit" row="0" column="1">
                                     <property name="name">
                                         <cstring>txtWord</cstring>
                                     </property>
                                 </widget>
-                                <widget class="QLabel" row="1" column="0">
+                                <widget class="TQLabel" row="1" column="0">
                                     <property name="name">
                                         <cstring>textLabel4</cstring>
                                     </property>
@@ -224,5 +224,5 @@
     <tabstop>btnClose</tabstop>
     <tabstop>lboxWords</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kanagram/src/vocabsettings.cpp b/kanagram/src/vocabsettings.cpp
index 730f9216..97d05162 100644
--- a/kanagram/src/vocabsettings.cpp
+++ b/kanagram/src/vocabsettings.cpp
@@ -16,7 +16,7 @@
 #include "keduvocdocument.h"
 #include "kanagramsettings.h"
 
-VocabSettings::VocabSettings(TQWidget *parent) : VocabSettingsWidget(parent)
+VocabSettings::VocabSettings(TQWidget *tqparent) : VocabSettingsWidget(tqparent)
 {
 	connect(btnCreateNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCreateNew()));
 	connect(btnEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit()));
@@ -37,7 +37,7 @@ void VocabSettings::refreshView()
 	m_fileList = KGlobal::dirs()->findAllResources("appdata", "data/" + KanagramSettings::dataLanguage() + "/" + "*.kvtml");
 	for(uint i = 0; i < m_fileList.size(); i++)
 	{
-		KEduVocDocument *doc = new KEduVocDocument(this);
+		KEduVocDocument *doc = new KEduVocDocument(TQT_TQOBJECT(this));
 		doc->open(KURL(m_fileList[i]), false);
 		TQListViewItem *item = new TQListViewItem(lviewVocab, 0);
 		item->setText( 0, doc->getTitle() );
diff --git a/kanagram/src/vocabsettings.h b/kanagram/src/vocabsettings.h
index 7b86720f..a2e30c1d 100644
--- a/kanagram/src/vocabsettings.h
+++ b/kanagram/src/vocabsettings.h
@@ -6,8 +6,9 @@
 class VocabSettings : public VocabSettingsWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 	public:
-		VocabSettings(TQWidget *parent);
+		VocabSettings(TQWidget *tqparent);
 		~VocabSettings();
 		void refreshView();
 
diff --git a/kanagram/src/vocabsettingswidget.ui b/kanagram/src/vocabsettingswidget.ui
index b329da4e..8a6c988e 100644
--- a/kanagram/src/vocabsettingswidget.ui
+++ b/kanagram/src/vocabsettingswidget.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>VocabSettingsWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>VocabSettingsWidget</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -19,23 +19,23 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>btnCreateNew</cstring>
                             </property>
@@ -46,7 +46,7 @@
                                 <string>Creates a new vocabulary.</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>btnEdit</cstring>
                             </property>
@@ -57,7 +57,7 @@
                                 <string>Edits the selected vocabulary.</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>btnDelete</cstring>
                             </property>
@@ -70,7 +70,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QListView">
+                <widget class="TQListView">
                     <column>
                         <property name="text">
                             <string>Title</string>
@@ -110,8 +110,8 @@
         </widget>
     </grid>
 </widget>
-<slots>
+<Q_SLOTS>
     <slot>createNew()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>