Rename obsolete tq methods to standard names

39 files changed, 220 insertions, 220 deletions

diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index 6945cd1e..9d704ec7 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -107,11 +107,11 @@ void KviCompletionBox::updateContents(TQString buffer)
 	if(pos>0)
 	{
 		szModule=buffer.left(pos);
-		if(szModule[0].tqunicode()=='$')
+		if(szModule[0].unicode()=='$')
 			szModule.remove(0,1);
 	}
 	
-	if(pCur->tqunicode() == '$')
+	if(pCur->unicode() == '$')
 	{
 		buffer.remove(0,1);
 		if(!buffer.isEmpty())
@@ -369,13 +369,13 @@ void KviScriptEditorWidget::keyPressEvent(TQKeyEvent * e)
 				TQString szPrev=text(para-1);
 				if(!szPrev.isEmpty())
 				{
-					if(szPrev.at(szPrev.length() - 1).tqunicode() == ' ')
+					if(szPrev.at(szPrev.length() - 1).unicode() == ' ')
 						szPrev.remove(szPrev.length() - 1,1);
 					TQString szCur;
 					const TQChar * pCur = (const TQChar *)szPrev.ucs2();
 					if(pCur)
 					{
-						while(pCur->tqunicode() && pCur->isSpace()) 
+						while(pCur->unicode() && pCur->isSpace()) 
 						{
 							szCur.append(*pCur);
 							pCur++;
@@ -557,9 +557,9 @@ void KviScriptEditorWidget::slotComplete(const TQString &str)
 	bool bIsFirstWordInLine;
 	getWordBeforeCursor(buffer,index,&bIsFirstWordInLine);
 	int len=buffer.length();
-//	if (buffer[1].tqunicode() == '$') len --;
+//	if (buffer[1].unicode() == '$') len --;
 	complete.remove(0,len-1);
-	if (buffer[1].tqunicode() == '$') complete.append("(");
+	if (buffer[1].unicode() == '$') complete.append("(");
 	else complete.append(" ");
 	insert (complete);
 	completelistbox->hide();
@@ -595,19 +595,19 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
 	const TQChar * pBegin;
 
 
-	while(c->tqunicode())
+	while(c->unicode())
 	{
 		if(bInComment)
 		{
 			pBegin = c;
-			while(c->tqunicode() && (c->tqunicode() != '*'))c++;
-			if(!c->tqunicode())
+			while(c->unicode() && (c->unicode() != '*'))c++;
+			if(!c->unicode())
 			{
 				setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrComment);
 				return IN_COMMENT;
 			}
 			c++;
-			if(c->tqunicode() == '/')
+			if(c->unicode() == '/')
 			{
 				// end of the comment!
 				c++;
@@ -620,14 +620,14 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
 
 		if(c->isSpace())
 		{
-			while(c->tqunicode() && c->isSpace())c++;
-			if(!c->tqunicode())continue;
+			while(c->unicode() && c->isSpace())c++;
+			if(!c->unicode())continue;
 		}
 
 		pBegin = c;
 
 		// this does not break the bNewCommand flag
-		if((c->tqunicode() == '{') || (c->tqunicode() == '}'))
+		if((c->unicode() == '{') || (c->unicode() == '}'))
 		{
 			c++;
 			setFormat(pBegin - pBuf,1,g_fntNormal,g_clrBracket);
@@ -639,12 +639,12 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
 		{
 			bNewCommand = false;
 
-			if(c->tqunicode() == '#')
+			if(c->unicode() == '#')
 			{
 				if(c > pBuf)
 				{
 					const TQChar * prev = c - 1;
-					if((prev->tqunicode() == ']') || (prev->tqunicode() == '}'))
+					if((prev->unicode() == ']') || (prev->unicode() == '}'))
 					{
 						// array or hash count
 						c++;
@@ -653,19 +653,19 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
 					}
 				}
 				// comment until the end of the line
-				while(c->tqunicode())c++;
+				while(c->unicode())c++;
 				setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrComment);
 				continue;
 			}
-			if(c->tqunicode() == '/')
+			if(c->unicode() == '/')
 			{
 				c++;
-				if(c->tqunicode() == '/')
+				if(c->unicode() == '/')
 				{
-					while(c->tqunicode())c++;
+					while(c->unicode())c++;
 					setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrComment);
 					continue;
-				} else if(c->tqunicode() == '*')
+				} else if(c->unicode() == '*')
 				{
 					c++;
 					setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrComment);
@@ -674,13 +674,13 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
 				}
 				c--;
 			}
-			if(c->tqunicode() && (c->isLetterOrNumber() || (c->tqunicode() == '_')))
+			if(c->unicode() && (c->isLetterOrNumber() || (c->unicode() == '_')))
 			{
 				c++;
-				while(c->tqunicode() && (c->isLetterOrNumber() || (c->tqunicode() == '.') || (c->tqunicode() == '_') || (c->tqunicode() == ':')))c++;
+				while(c->unicode() && (c->isLetterOrNumber() || (c->unicode() == '.') || (c->unicode() == '_') || (c->unicode() == ':')))c++;
 				setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrKeyword);
 				// special processing for callbacks and magic commands
-				if(pBegin->tqunicode() == 'e')
+				if(pBegin->unicode() == 'e')
 				{
 					if(c - pBegin == 4)
 					{
@@ -691,7 +691,7 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
 					}
 				}
 				else
-				if(pBegin->tqunicode() == 'f')
+				if(pBegin->unicode() == 'f')
 				{
 					if(c - pBegin == 8)
 					{
@@ -702,7 +702,7 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
 					}
 				}
 
-				if(pBegin->tqunicode() == 'i')
+				if(pBegin->unicode() == 'i')
 				{
 					if(c - pBegin == 8)
 					{
@@ -717,28 +717,28 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
 				continue;
 			}
 		}
-		if(c->tqunicode() == '$')
+		if(c->unicode() == '$')
 		{
 			c++;
-			if(c->tqunicode() == '$')
+			if(c->unicode() == '$')
 			{
 				c++;
 				setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrKeyword);
 			} else {
-				while(c->tqunicode() && (c->isLetterOrNumber() || (c->tqunicode() == '.') || (c->tqunicode() == '_') || (c->tqunicode() == ':')))c++;
+				while(c->unicode() && (c->isLetterOrNumber() || (c->unicode() == '.') || (c->unicode() == '_') || (c->unicode() == ':')))c++;
 				setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrFunction);
 			}
 			continue;
 		}
 		
-		if(c->tqunicode() == '-')
+		if(c->unicode() == '-')
 		{
 			TQChar * pTmp =(TQChar *) c;
 			c++;
-			if(c->tqunicode() == '-')	c++;
+			if(c->unicode() == '-')	c++;
 			if(c->isLetter())
 			{
-				while(c->tqunicode() && (c->isLetterOrNumber() || (c->tqunicode() == '_')))c++;
+				while(c->unicode() && (c->isLetterOrNumber() || (c->unicode() == '_')))c++;
 				setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrKeyword);
 				continue;
 			} else {
@@ -746,35 +746,35 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
 			}
 		}
 
-		if(c->tqunicode() == '%')
+		if(c->unicode() == '%')
 		{
 			c++;
-			if(c->tqunicode() && (c->isLetterOrNumber() || (c->tqunicode() == ':') || (c->tqunicode() == '_')))
+			if(c->unicode() && (c->isLetterOrNumber() || (c->unicode() == ':') || (c->unicode() == '_')))
 			{
-				while(c->tqunicode() && (c->isLetterOrNumber() || (c->tqunicode() == ':') || (c->tqunicode() == '_')))c++;
+				while(c->unicode() && (c->isLetterOrNumber() || (c->unicode() == ':') || (c->unicode() == '_')))c++;
 				setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrVariable);
 				continue;
 			}
 			c--;
 		}
 
-		if(!c->tqunicode())continue;
+		if(!c->unicode())continue;
 
-		if(c->isLetterOrNumber() || c->tqunicode() == '_')
+		if(c->isLetterOrNumber() || c->unicode() == '_')
 		{
 			c++;
-			while(c->tqunicode() && c->isLetterOrNumber() || (c->tqunicode() == '_'))c++;
+			while(c->unicode() && c->isLetterOrNumber() || (c->unicode() == '_'))c++;
 			setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrNormalText);
 			continue;
 		}
 
-		if(c->tqunicode() == '\\')
+		if(c->unicode() == '\\')
 		{
 			c++;
 			setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrPunctuation);
 			// the next char is to be interpreted as normal text
 			pBegin = c;
-			if(c->tqunicode() && (c->tqunicode() != '\n'))
+			if(c->unicode() && (c->unicode() != '\n'))
 			{
 				c++;
 				setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrNormalText);
@@ -785,13 +785,13 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
 			return IN_LINE;
 		}
 
-		if(c->tqunicode() == '"')
+		if(c->unicode() == '"')
 		{
 			bInString = !bInString;
 			c++;
 			setFormat(pBegin - pBuf,c - pBegin,g_fntNormal,g_clrPunctuation);
 			continue;
-		} else if(c->tqunicode() == ';')
+		} else if(c->unicode() == ';')
 		{
 			if(!bInString)	bNewCommand = true; // the next will be a new command
 		}
@@ -1124,7 +1124,7 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* parent, co
 	emit initFind();
 	setPaletteForegroundColor( TQColor( 0, 0, 0 ) );
 	setPaletteBackgroundColor( TQColor( 236, 233, 216 ) );
-	TQGridLayout *tqlayout = new TQGridLayout( this, 1, 1, 11, 6, "replace tqlayout"); 
+	TQGridLayout *layout = new TQGridLayout( this, 1, 1, 11, 6, "replace layout"); 
  
 	m_pFindlineedit = new TQLineEdit( this, "findlineedit" );
 #ifndef COMPILE_USE_QT4
@@ -1133,14 +1133,14 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* parent, co
 	m_pFindlineedit->setFrameShadow( TQLineEdit::Sunken );
 #endif
 
-	tqlayout->addMultiCellWidget( m_pFindlineedit, 2, 2, 1, 2 );
+	layout->addMultiCellWidget( m_pFindlineedit, 2, 2, 1, 2 );
 
 	m_pReplacelineedit = new TQLineEdit( this, "replacelineedit" );
 #ifndef COMPILE_USE_QT4
 	m_pReplacelineedit->setFrameShape( TQLineEdit::LineEditPanel );
 	m_pReplacelineedit->setFrameShadow( TQLineEdit::Sunken );
 #endif
-	tqlayout->addMultiCellWidget( m_pReplacelineedit, 3, 3, 1, 2 );
+	layout->addMultiCellWidget( m_pReplacelineedit, 3, 3, 1, 2 );
 
    	m_pFindlineedit->setFocus();
 
@@ -1150,36 +1150,36 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* parent, co
 	findlabel->setAutoResize(true);
 #endif
 
-	tqlayout->addWidget( findlabel, 2, 0 );
+	layout->addWidget( findlabel, 2, 0 );
 
     TQLabel *replacelabel = new TQLabel( this, "replacelabel" );
 	replacelabel->setText(tr("Replace with"));
 #ifndef COMPILE_USE_QT4
 	replacelabel->setAutoResize(true);
 #endif
-	tqlayout->addWidget( replacelabel, 3, 0 );
+	layout->addWidget( replacelabel, 3, 0 );
 
     TQPushButton *cancelbutton = new TQPushButton( this, "cancelButton" );
 	cancelbutton->setText(tr("&Cancel"));
-	tqlayout->addWidget( cancelbutton, 5, 2 );
+	layout->addWidget( cancelbutton, 5, 2 );
 
     replacebutton = new TQPushButton( this, "replacebutton" );
 	replacebutton->setText(tr("&Replace"));
 	replacebutton->setEnabled( FALSE );
-	tqlayout->addWidget( replacebutton, 5, 0 );
+	layout->addWidget( replacebutton, 5, 0 );
 
 	checkReplaceAll = new KviStyledCheckBox( this, "replaceAll" );
 	checkReplaceAll->setText(tr("&Replace in all Aliases"));
-	tqlayout->addWidget( checkReplaceAll, 4, 0 );
+	layout->addWidget( checkReplaceAll, 4, 0 );
 	
 	findNext = new TQPushButton(this, "findNext(WIP)" );	
 	findNext->setText(tr("&Findnext"));
-	tqlayout->addWidget( findNext, 2, 3 );
+	layout->addWidget( findNext, 2, 3 );
 	findNext->setEnabled(false);
 
 	replace = new TQPushButton(this, "replace" );	
 	replace->setText(tr("&Replace(WIP)"));
-	tqlayout->addWidget( replace, 3, 3 );
+	layout->addWidget( replace, 3, 3 );
 	replace->setEnabled(false);
 
 #ifndef COMPILE_USE_QT4
diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp
index 14ddad5b..009340f9 100644
--- a/src/modules/file/libkvifile.cpp
+++ b/src/modules/file/libkvifile.cpp
@@ -873,7 +873,7 @@ static bool file_kvs_fnc_readLines(KviKvsModuleFunctionCall * c)
 	@switches:
 		!sw: -l | --local-8-bit
 		Causes the lines to be saved in local 8 bit character set instead
-		of the default tqunicode encoding.
+		of the default unicode encoding.
 		!sw: -a | --append
 		If the file already exists, then the lines are appended to the end
 		instead of overwriting the file.
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
index 92749468..0990e176 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
@@ -580,12 +580,12 @@ void KviFileTransferWindow::copyLocalFileToClipboard()
 	TQString tmp = t->localFileName();
 	if(tmp.isEmpty())return;
 #ifdef COMPILE_USE_QT4
-	TQApplication::tqclipboard()->setText(tmp);
+	TQApplication::clipboard()->setText(tmp);
 #else
-	TQApplication::tqclipboard()->setSelectionMode(false);
-	TQApplication::tqclipboard()->setText(tmp);
-	TQApplication::tqclipboard()->setSelectionMode(true);
-	TQApplication::tqclipboard()->setText(tmp);
+	TQApplication::clipboard()->setSelectionMode(false);
+	TQApplication::clipboard()->setText(tmp);
+	TQApplication::clipboard()->setSelectionMode(true);
+	TQApplication::clipboard()->setText(tmp);
 #endif
 }
 
diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp
index c0f7f1c3..96a7edb9 100644
--- a/src/modules/help/helpwidget.cpp
+++ b/src/modules/help/helpwidget.cpp
@@ -138,7 +138,7 @@ TQSize KviHelpWidget::sizeHint() const
 
 bool KviHelpWidget::eventFilter(TQObject * o, TQEvent *e)
 {
-	TQClipboard *cb = TQApplication::tqclipboard();
+	TQClipboard *cb = TQApplication::clipboard();
 	
 	if(e->type() == TQEvent::MouseButtonRelease) {
 		if(m_pTextBrowser->hasSelectedText()) {
diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp
index 46dc4f22..d77e6fed 100755
--- a/src/modules/help/index.cpp
+++ b/src/modules/help/index.cpp
@@ -164,7 +164,7 @@ void Index::parseDocument( const TQString &filename, int docNum )
     if (text.isNull())
         return;
     bool valid = TRUE;
-    const TQChar *buf = text.tqunicode();
+    const TQChar *buf = text.unicode();
     TQChar str[64];
     TQChar c = buf[0];
     int j = 0;
@@ -727,7 +727,7 @@ bool Index::searchForPattern( const TQStringList &patterns, const TQStringList &
 
     bool valid = TRUE;
 
-    const TQChar *buf = text.tqunicode();
+    const TQChar *buf = text.unicode();
 
     TQChar str[64];
 
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index acc6fd10..b7bd8bc9 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -145,7 +145,7 @@ void KviChannelListViewItem::paintCell(TQPainter * p,const TQColorGroup &cg,int
 		if ( isEnabled() || !lv )
 			p->setPen( cg.text() );
 		else if ( !isEnabled() && lv)
-			p->setPen( lv->tqpalette().disabled().text() );
+			p->setPen( lv->palette().disabled().text() );
 	}
 	
 	KviTopicWidget::paintColoredText(p,szText,cg,height(),width);
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index 55b36225..84a67118 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -90,67 +90,67 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 	m_pSearchTab  = new TQWidget(m_pTabWidget);
 	m_pTabWidget->insertTab(m_pSearchTab,__tr2qs_ctx("Filter","logview"));
 
-	TQGridLayout *tqlayout = new TQGridLayout(m_pSearchTab,10,2,3,5);
+	TQGridLayout *layout = new TQGridLayout(m_pSearchTab,10,2,3,5);
 	
 	m_pShowChannelsCheck = new KviStyledCheckBox(__tr2qs_ctx("Show channel logs","logview"),m_pSearchTab);
 	m_pShowChannelsCheck->setChecked(true);
-	tqlayout->addMultiCellWidget(m_pShowChannelsCheck,0,0,0,1);
+	layout->addMultiCellWidget(m_pShowChannelsCheck,0,0,0,1);
 	
 	m_pShowQueryesCheck  = new KviStyledCheckBox(__tr2qs_ctx("Show query logs","logview"),m_pSearchTab);
 	m_pShowQueryesCheck->setChecked(true);
-	tqlayout->addMultiCellWidget(m_pShowQueryesCheck,1,1,0,1);
+	layout->addMultiCellWidget(m_pShowQueryesCheck,1,1,0,1);
 	
 	m_pShowConsolesCheck = new KviStyledCheckBox(__tr2qs_ctx("Show console logs","logview"),m_pSearchTab);
 	m_pShowConsolesCheck->setChecked(true);
-	tqlayout->addMultiCellWidget(m_pShowConsolesCheck,2,2,0,1);
+	layout->addMultiCellWidget(m_pShowConsolesCheck,2,2,0,1);
 
 	m_pShowDccChatCheck  = new KviStyledCheckBox(__tr2qs_ctx("Show DCC chat logs","logview"),m_pSearchTab);
 	m_pShowDccChatCheck->setChecked(true);
-	tqlayout->addMultiCellWidget(m_pShowDccChatCheck,3,3,0,1);
+	layout->addMultiCellWidget(m_pShowDccChatCheck,3,3,0,1);
 	
 	m_pShowOtherCheck   = new KviStyledCheckBox(__tr2qs_ctx("Show other logs","logview"),m_pSearchTab);
 	m_pShowOtherCheck->setChecked(true);
-	tqlayout->addMultiCellWidget(m_pShowOtherCheck,4,4,0,1);
+	layout->addMultiCellWidget(m_pShowOtherCheck,4,4,0,1);
 	
 	TQLabel *l;
 	l = new TQLabel(__tr2qs_ctx("Contents filter","logview"),m_pSearchTab);
-	tqlayout->addMultiCellWidget(l,5,5,0,1);
+	layout->addMultiCellWidget(l,5,5,0,1);
 
 	l = new TQLabel(__tr2qs_ctx("Log name mask:","logview"),m_pSearchTab);
 	m_pFileNameMask = new TQLineEdit(m_pSearchTab);
 	connect(m_pFileNameMask,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(applyFilter()));
-	tqlayout->addWidget(l,6,0);
-	tqlayout->addWidget(m_pFileNameMask,6,1);
+	layout->addWidget(l,6,0);
+	layout->addWidget(m_pFileNameMask,6,1);
 
 	l = new TQLabel(__tr2qs_ctx("Log contents mask:","logview"),m_pSearchTab);
 	m_pContentsMask = new TQLineEdit(m_pSearchTab);
 	connect(m_pContentsMask,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(applyFilter()));
-	tqlayout->addWidget(l,7,0);
-	tqlayout->addWidget(m_pContentsMask,7,1);
+	layout->addWidget(l,7,0);
+	layout->addWidget(m_pContentsMask,7,1);
 
 	m_pEnableFromFilter = new KviStyledCheckBox(__tr2qs_ctx("Only older than","logview"),m_pSearchTab);
 	m_pFromDateEdit = new TQDateEdit(m_pSearchTab);
 	m_pFromDateEdit->setDate(TQDate::currentDate());
-	tqlayout->addWidget(m_pEnableFromFilter,8,0);
-	tqlayout->addWidget(m_pFromDateEdit,8,1);
+	layout->addWidget(m_pEnableFromFilter,8,0);
+	layout->addWidget(m_pFromDateEdit,8,1);
 	connect(m_pEnableFromFilter,TQT_SIGNAL(toggled(bool)),m_pFromDateEdit,TQT_SLOT(setEnabled(bool)));
 	m_pFromDateEdit->setEnabled(false);
 
 	m_pEnableToFilter = new KviStyledCheckBox(__tr2qs_ctx("Only newier than","logview"),m_pSearchTab);
 	m_pToDateEdit = new TQDateEdit(m_pSearchTab);
 	m_pToDateEdit->setDate(TQDate::currentDate());
-	tqlayout->addWidget(m_pEnableToFilter,9,0);
-	tqlayout->addWidget(m_pToDateEdit,9,1);
+	layout->addWidget(m_pEnableToFilter,9,0);
+	layout->addWidget(m_pToDateEdit,9,1);
 	connect(m_pEnableToFilter,TQT_SIGNAL(toggled(bool)),m_pToDateEdit,TQT_SLOT(setEnabled(bool)));
 	m_pToDateEdit->setEnabled(false);
 
 	TQPushButton *pb = new TQPushButton(__tr2qs_ctx("Apply filter","logview"),m_pSearchTab);
 	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(applyFilter()));
-	tqlayout->addWidget(pb,10,1);
+	layout->addWidget(pb,10,1);
 
 	TQWidget *w = new TQWidget(m_pSearchTab);
 	w->setSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored);
-	tqlayout->addWidget(w,11,1);
+	layout->addWidget(w,11,1);
 
 	m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this);
 #ifdef COMPILE_USE_QT4
diff --git a/src/modules/notifier/notifierwindow.h b/src/modules/notifier/notifierwindow.h
index dfc9d6de..cbb26828 100644
--- a/src/modules/notifier/notifierwindow.h
+++ b/src/modules/notifier/notifierwindow.h
@@ -77,7 +77,7 @@ protected:
 	TQPixmap m_pixBackgroundHighlighted;
 	TQPixmap m_pixForeground;         // we paint the stuff HERE
 	
-	// Notifier graphic tqlayout
+	// Notifier graphic layout
 	TQPixmap m_pixBckgrnd;
 
 	TQImage  m_imgBuffer;             // here we merge the two images
diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp
index 0a4f58a7..96ecc40c 100644
--- a/src/modules/objects/class_buttongroup.cpp
+++ b/src/modules/objects/class_buttongroup.cpp
@@ -48,8 +48,8 @@
 	@description:
 		This widget organizes buttons in a group.
 		It will be usually a parent for other child controls.
-		You can either use a child tqlayout to manage the children geometries
-		or use $setColumnLayout function to manage the tqlayout automatically.
+		You can either use a child layout to manage the children geometries
+		or use $setColumnLayout function to manage the layout automatically.
 		The class ineriths groupbox.
 
 	@functions:
diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index 852db9dc..c0942a67 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -49,11 +49,11 @@
 		[class]widget[/class]
 	@description:
 		A window dockable to the KVIrc main frame borders (like a toolbar).
-		The window has an implicit tqlayout that will automatically manage
+		The window has an implicit layout that will automatically manage
 		the children depending on the dock window's orientation.
 	@functions:
 		!fn: $addWidget(<widget:hobject>)
-			Adds <widget> to the internal tqlayout of this dock window.[br]
+			Adds <widget> to the internal layout of this dock window.[br]
 			The widget must be a child of this dock window (otherwise strange things may happen).
 		!fn: <string> $orientation()
 			Returns the string "vertical" or "horizontal" depending on the orientation of this dock window.
diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp
index a1f5c11f..7c011403 100644
--- a/src/modules/objects/class_groupbox.cpp
+++ b/src/modules/objects/class_groupbox.cpp
@@ -60,8 +60,8 @@ const int align_cod[] = {
 	@description:
 		This widget can be used to display a groupbox.
 		It will be usually a parent for other child controls.
-		You can either use a child tqlayout to manage the children geometries
-		or use $setColumnLayout to manage the tqlayout automatically.
+		You can either use a child layout to manage the children geometries
+		or use $setColumnLayout to manage the layout automatically.
 	@functions:
 		!fn: $setTitle(<text:String>)
 		Sets the group box title to <text>.
@@ -96,7 +96,7 @@ const int align_cod[] = {
 		!fn: $setOrientation<orientation:string>
 		Sets the group box's orientation. Valid values are:Qt::Horizontal,Qt::Vertical.
 		!fn: $setColumnLayout(<columns:integer>,<orientation:string>)
-		Enables the automatic tqlayout management. The children are arranged in n columns with the specified orientation.[br]
+		Enables the automatic layout management. The children are arranged in n columns with the specified orientation.[br]
 		Valid values for <orientation> are:Qt::Horizontal,Qt::Vertical.
 	@examples:
 		[example]
@@ -120,16 +120,16 @@ const int align_cod[] = {
 		%inputpass->$setechomode("password")[br]
 		[br]
 		#now lets' layouting the groupbox's element's.[br]
-		%layoutgb=$new(tqlayout,%gb)[br]
+		%layoutgb=$new(layout,%gb)[br]
 		%layoutgb->$setmargin(20)[br]
 		%layoutgb->$addwidget(%labeluser,0,0)[br]
 		%layoutgb->$addwidget(%labelpass,1,0)[br]
 		%layoutgb->$addwidget(%inputuser,0,1)[br]
 		%layoutgb->$addwidget(%inputpass,1,1)[br]
 		[br]
-		# now we create a fake widget and managing the two buttons tqlayout.[br]
+		# now we create a fake widget and managing the two buttons layout.[br]
 		%fakewidget=$new(widget,%widget)[br]
-		%layoutbtn=$new(tqlayout,%fakewidget)[br]
+		%layoutbtn=$new(layout,%fakewidget)[br]
 		%btnok=$new(button,%fakewidget)[br]
 		%btnok->$settext("OK")[br]
 		%btncancel=$new(button,%fakewidget)[br]
@@ -137,13 +137,13 @@ const int align_cod[] = {
 		%layoutbtn->$addwidget(%btnok,0,0)[br]
 		%layoutbtn->$addwidget(%btncancel,0,1)[br]
 		[br]
-		#And finally we create a main tqlayout with the groupbox (and its "children")[br]
+		#And finally we create a main layout with the groupbox (and its "children")[br]
 		#and fakewiget (with its buttons children).
-		%maintqlayout=$new(tqlayout,%widget)[br]
-		%maintqlayout->$setspacing(10)[br]
-		%maintqlayout->$setmargin(10)[br]
-		%maintqlayout->$addwidget(%gb,0,0)[br]
-		%maintqlayout->$addwidget(%fakewidget,1,0)[br]
+		%mainlayout=$new(layout,%widget)[br]
+		%mainlayout->$setspacing(10)[br]
+		%mainlayout->$setmargin(10)[br]
+		%mainlayout->$addwidget(%gb,0,0)[br]
+		%mainlayout->$addwidget(%fakewidget,1,0)[br]
 		[br]
 		#Let's show our nice login request =D ! [br]
 		%widget->$show()[br]
diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp
index 0f6ae24c..21167be1 100644
--- a/src/modules/objects/class_hbox.cpp
+++ b/src/modules/objects/class_hbox.cpp
@@ -44,7 +44,7 @@
 		!fn: $setSpacing(<spacing:uint>)
 		Sets the default spacing of the widgets in pixels
 		!fn: $setMargin(<margin:uint>)
-		Sets the dimension of the tqlayout margin : the distance from the border to the outermost child widget edges.
+		Sets the dimension of the layout margin : the distance from the border to the outermost child widget edges.
 		!fn: $setStretchFactor(<widget:hobject>,<stretch:uint>)
 		Sets the stretch factor of widget to stretch.
 */
diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp
index 5caac1d9..7b2d252d 100644
--- a/src/modules/objects/class_layout.cpp
+++ b/src/modules/objects/class_layout.cpp
@@ -40,11 +40,11 @@
 
 
 /*
-	@doc: tqlayout
+	@doc: layout
 	@keyterms:
-		tqlayout object class, child widgets
+		layout object class, child widgets
 	@title:
-		tqlayout class
+		layout class
 	@type:
 		class
 	@short:
@@ -52,25 +52,25 @@
 	@inherits:
 		[class]object[/class]
 	@description:
-		The tqlayout is a geometry management tool for child widgets.
-		You create a tqlayout , give it some widgets to manage and it will tqlayout them
+		The layout is a geometry management tool for child widgets.
+		You create a layout , give it some widgets to manage and it will layout them
 		automatically.[br]
-		The parent of the tqlayout must be the widget for which child widget geometries have to be managed.
-		A tqlayout is a grid of NxM cells in which you insert child widgets with [classfnc:tqlayout]$addWidget[/classfnc]().[br]
-		Widgets that must span multiple cells can be added to the tqlayout with [classfnc:tqlayout]$addMultiCellWidget[/classfnc]().[br]
+		The parent of the layout must be the widget for which child widget geometries have to be managed.
+		A layout is a grid of NxM cells in which you insert child widgets with [classfnc:layout]$addWidget[/classfnc]().[br]
+		Widgets that must span multiple cells can be added to the layout with [classfnc:layout]$addMultiCellWidget[/classfnc]().[br]
 	@functions:
 		!fn: $addWidget(<widget:object widget>,<row:uint>,<column:uint>)
-		Adds a widget to this tqlayout placing it at position <row>,<column> in the grid
+		Adds a widget to this layout placing it at position <row>,<column> in the grid
 		!fn: $addMultiCellWidget(<widget:object widget>,<start_row:uint>,<end_row:uint>,<start_col:uint>,<end_col:uint>)
-		Adds a widget to this tqlayout spanning multiple grid cells
+		Adds a widget to this layout spanning multiple grid cells
 		!fn: $setRowStretch(<row:uint>,<stretch:uint>)
-		Sets the stretch value for a particular row of this tqlayout. The <stretch_value>
+		Sets the stretch value for a particular row of this layout. The <stretch_value>
 		must be a positive integer. The rows with bigger stretch values will take more space
-		in the tqlayout.
+		in the layout.
 		!fn: $setColStretch(<column:uint>,<stretch:uint>)
-		Sets the stretch value for a particular column in this tqlayout. The <stretch_value>
+		Sets the stretch value for a particular column in this layout. The <stretch_value>
 		must be a positive integer. The rows with bigger stretch values will take more space
-		in the tqlayout.
+		in the layout.
 		!fn: $addRowSpacing(<row:uint>,<spacing:uint>)
 		Sets the minimum height of the specified <row> to <spacing> which must be a positive integer
 		!fn: $addColSpacing(<column:uint>,<spacing:uint>)
@@ -78,18 +78,18 @@
 		!fn: $setSpacing(<spacing:uint>)
 		Sets the default spacing of the widgets in pixels
 		!fn: $setMargin(<margin:uint>)
-		Sets the dimension of the tqlayout margin : the distance from the border to the outermost child widget edges.
+		Sets the dimension of the layout margin : the distance from the border to the outermost child widget edges.
 		!fn: $setResizeMode(<resize_mode:string>)
-		Sets the resize mode of the parent widget in relation to this tqlayout.
+		Sets the resize mode of the parent widget in relation to this layout.
 		<mode> can be one of:[br]
 		-Auto: this is the default[br]
-		-Fixed: the parent widget of this tqlayout is resized to the "sizeHint" value and it cannot be resized by the user.[br]
-		-Minimum: the minimum size of the parent widget of this tqlayout is set to minimumSize() and it cannot be smaller[br]
-		-FreeResize: the parent widget of this tqlayout is not constrained at all[br]
+		-Fixed: the parent widget of this layout is resized to the "sizeHint" value and it cannot be resized by the user.[br]
+		-Minimum: the minimum size of the parent widget of this layout is set to minimumSize() and it cannot be smaller[br]
+		-FreeResize: the parent widget of this layout is not constrained at all[br]
 */
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_layout,"tqlayout","object")
+KVSO_BEGIN_REGISTERCLASS(KviKvsObject_layout,"layout","object")
 	KVSO_REGISTER_HANDLER(KviKvsObject_layout,"addWidget", functionAddWidget)
 	KVSO_REGISTER_HANDLER(KviKvsObject_layout,"addMultiCellWidget", functionAddMultiCellWidget)
 	KVSO_REGISTER_HANDLER(KviKvsObject_layout,"setRowStretch", functionSetRowStretch)
@@ -116,7 +116,7 @@ bool KviKvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
 
 	if(!w)
 	{
-		pContext->warning(__tr2qs("The parent of a tqlayout must be a widget!"));
+		pContext->warning(__tr2qs("The parent of a layout must be a widget!"));
 		return false;
 	}
 	setObject(TQT_TQOBJECT(new TQGridLayout(w)));
diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
index 81cc3f6a..09499455 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/class_painter.cpp
@@ -323,7 +323,7 @@
 			}[br]
 		}[br] 
 		[br]
-		%lay=$new(tqlayout,%Hello)[br] 
+		%lay=$new(layout,%Hello)[br] 
 		%lay->$addwidget(%Btn,4,0)[br] 
 		%Hello->$setBackgroundColor("000000");[br] 
 		%Hello->$setmaximumwidth(800)[br] 
diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp
index 8f1afd74..cb9c3bba 100644
--- a/src/modules/objects/class_popupmenu.cpp
+++ b/src/modules/objects/class_popupmenu.cpp
@@ -89,7 +89,7 @@
 			{[br]
 				#Geometry of the widget and setting-up of popupmenu [br]
 				$$->$setGeometry(%X,%Y,100,100)[br]
-			    $$->%lay=$new(tqlayout,$$)[br]
+			    $$->%lay=$new(layout,$$)[br]
 				#Here we generate a cicle to create our labels inside the widget.[br]
 				%i=0[br]
 				while (%i<10)[br]
diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp
index 9ec6cc5a..1c45ed43 100644
--- a/src/modules/objects/class_process.cpp
+++ b/src/modules/objects/class_process.cpp
@@ -82,7 +82,7 @@
 		%tt=$new(test)[br]
 		%A=$new(widget)[br]
 		%A->$setGeometry(100,100,400,300)[br]
-		%layoutA=$new(tqlayout,%A)[br]
+		%layoutA=$new(layout,%A)[br]
 		%Ainput=$new(lineedit,%A)[br]
 		#%Aoutput=$new(textedit,%A)// coming soon in the new texteditor class[br]
 		%Aoutput=$new(label,%A)[br]
diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp
index fc221880..3b768217 100644
--- a/src/modules/objects/class_tabwidget.cpp
+++ b/src/modules/objects/class_tabwidget.cpp
@@ -94,7 +94,7 @@
 			%secondtab=$new(widget,%Tabwidget)
 			
 			# Now we'll create the item to put in to tab's pages.
-			%layoutfirsttab=$new(tqlayout,%firsttab)
+			%layoutfirsttab=$new(layout,%firsttab)
 			%labelbt=$new(label,%firsttab)
 			%labelbt->$settext(Botton Tab)
 			%labeltt=$new(label,%firsttab)
@@ -104,7 +104,7 @@
 			%buttontt=$new(button,%firsttab)
 			%buttontt->$settext("To &Top")
 			
-			# Now we'll give a tqlayout to all items.
+			# Now we'll give a layout to all items.
 			# This also allows to use privateimpl without making buttons global variables
 			%layoutfirsttab->$addwidget(%labelbt,0,0)
 			%layoutfirsttab->$addwidget(%labeltt,0,1)
@@ -125,7 +125,7 @@
 			}
 			
 			# We do the same work  with the second tab's page.
-			%layoutsecondtab=$new(tqlayout,%secondtab)
+			%layoutsecondtab=$new(layout,%secondtab)
 			%labelwp=$new(label,%secondtab)
 			%labelwp->$settext("Enjoy the new Class provided by")
 			%layoutsecondtab->$addwidget(%labelwp,0,0)
diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp
index bfc8014c..0019f000 100644
--- a/src/modules/objects/class_vbox.cpp
+++ b/src/modules/objects/class_vbox.cpp
@@ -44,7 +44,7 @@
 		!fn: $setSpacing(<spacing:int>)
 		Sets the default spacing of the widgets in pixels
 		!fn: $setMargin(<margin:int>)
-		Sets the dimension of the tqlayout margin : the distance from the border to the outermost child widget edges.
+		Sets the dimension of the layout margin : the distance from the border to the outermost child widget edges.
 		!fn: $setStretchFactor(<widget:hobject>,<stretch:uint>)
 		Sets the stretch factor of widget to stretch.
 */
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index 83d56081..644999a5 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -167,19 +167,19 @@ const int widgettypes_cod[] = {
 		!fn: $setMinimumWidth(<value>)
 		Sets the minimum width of this widget to <value>.
 		The user will not be able to resize the widget to a smaller
-		value. This value is also used by the [class:tqlayout]tqlayout class[/class].
+		value. This value is also used by the [class:layout]layout class[/class].
 		!fn: $setMinimumHeight(<value>)
 		Sets the minimum height of this widget to <value>.
 		The user will not be able to resize the widget to a smaller
-		value. This value is also used by the [class:tqlayout]tqlayout class[/class].
+		value. This value is also used by the [class:layout]layout class[/class].
 		!fn: $setMaximumWidth(<value>)
 		Sets the maximum width of this widget to <value>.
 		The user will not be able to resize the widget to a bigger
-		value. This value is also used by the [class:tqlayout]tqlayout class[/class].
+		value. This value is also used by the [class:layout]layout class[/class].
 		!fn: $setMaximumHeight(<value>)
 		Sets the maximum height of this widget to <value>.
 		The user will not be able to resize the widget to a bigger
-		value. This value is also used by the [class:tqlayout]tqlayout class[/class].
+		value. This value is also used by the [class:layout]layout class[/class].
 		!fn: $move(<x_or_array>[,<y>])
 		Moves this widget to the coordinate <x> and <y> relative to its
 		parent widget (or the desktop if this widget is a toplevel one).
@@ -1616,7 +1616,7 @@ bool KviKvsObject_widget::function_addWidgetToWrappedLayout(KviKvsObjectFunction
 		c->warning(__tr2qs("Widget parameter is not a valid object"));
 		return true;
 	}
-	TQLayout *lay=widget()->tqlayout();
+	TQLayout *lay=widget()->layout();
 	if (!lay)
 	{
 		c->warning(__tr2qs("No Layout associated to the widget "));
diff --git a/src/modules/objects/class_workspace.cpp b/src/modules/objects/class_workspace.cpp
index 48092775..4f178024 100644
--- a/src/modules/objects/class_workspace.cpp
+++ b/src/modules/objects/class_workspace.cpp
@@ -110,7 +110,7 @@
 			constructor[br]
 			{[br]
 			       $$->$setGeometry(%X,%Y,100,100)[br]
-			       $$->%lay=$new(tqlayout,$$)[br]
+			       $$->%lay=$new(layout,$$)[br]
 			       %i=0[br]
 			       while (%i<10)[br]
 				{[br]
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 4f1dedff..7eab5800 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -70,7 +70,7 @@ KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(TQWidget *parent,cons
 	l->setWordWrap(true);
 #endif
 	l->setAlignment(TQt::AlignTop);
-	tqlayout()->addWidget(l,0,0);
+	layout()->addWidget(l,0,0);
 }
 
 KviGeneralOptionsFrontWidget::~KviGeneralOptionsFrontWidget()
diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp
index 43cc13e9..770db332 100644
--- a/src/modules/options/optw_antispam.cpp
+++ b/src/modules/options/optw_antispam.cpp
@@ -47,7 +47,7 @@ KviAntispamOptionsWidget::KviAntispamOptionsWidget(TQWidget * parent)
 
 	reenableStuff(true);
 
-	tqlayout()->setRowStretch(2,1);
+	layout()->setRowStretch(2,1);
 }
 
 KviAntispamOptionsWidget::~KviAntispamOptionsWidget()
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index 57b67a48..e403daec 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -311,7 +311,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(TQWidget * pare
 
 
 	createLayout(3,1);
-	tqlayout()->setMargin(10);
+	layout()->setMargin(10);
 
 	KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Basic Properties","options"));
 	KviTalHBox * hb = new KviTalHBox(gbox);
@@ -492,7 +492,7 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * parent
 : KviOptionsWidget(parent)
 {
 	createLayout(4,1);
-	tqlayout()->setMargin(10);
+	layout()->setMargin(10);
 	
 	m_pLocalAvatar = new KviPixmap(KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar));
 
@@ -540,7 +540,7 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * parent
 
 	connect(m_pChooseAvatarButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseAvatar()));
 
-	tqlayout()->setRowStretch(1,2);
+	layout()->setRowStretch(1,2);
 }
 
 KviIdentityAvatarOptionsWidget::~KviIdentityAvatarOptionsWidget()
@@ -678,7 +678,7 @@ KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(TQWidget * pa
     
 
 	createLayout(2,1);
-	tqlayout()->setMargin(10);
+	layout()->setMargin(10);
 
 	KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("User Mode","options"));
 	m_pISelector = addBoolSelector(gbox,__tr2qs_ctx("Invisible (+i)","options"),&m_bI);
diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp
index c1ad6e84..1153365a 100644
--- a/src/modules/options/optw_input.cpp
+++ b/src/modules/options/optw_input.cpp
@@ -92,7 +92,7 @@ KviInputLookOptionsWidget::KviInputLookOptionsWidget(TQWidget * parent)
 	}
 
 
-	tqlayout()->setRowStretch(7,1);
+	layout()->setRowStretch(7,1);
 }
 
 KviInputLookOptionsWidget::~KviInputLookOptionsWidget()
diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp
index 1e2c998f..e5d0cd53 100644
--- a/src/modules/options/optw_interfacelookglobal.cpp
+++ b/src/modules/options/optw_interfacelookglobal.cpp
@@ -104,13 +104,13 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget *
 
 	m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,6,1,6,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground,
 				KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && !KVI_OPTION_BOOL(KviOption_boolObtainGlobalBackgroundFromKde));
-	tqlayout()->setRowStretch(6,1);
+	layout()->setRowStretch(6,1);
 	connect(m_pObtainBackgroundFromKdeBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool)));
 
 #else //!COMPILE_KDE_SUPPORT
 	m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,4,1,4,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground,
 				KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
-	tqlayout()->setRowStretch(4,1);
+	layout()->setRowStretch(4,1);
 #endif //!COMPILE_KDE_SUPPORT
 	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool)));
 	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableUpdateKdeBackgroundBoolSelector(bool)));
@@ -177,7 +177,7 @@ KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(TQWidget * parent)
 	addColorSelector(0,0,0,0,__tr2qs_ctx("Background","options"),KviOption_colorMdiBackground);
 	addPixmapSelector(0,1,0,1,__tr2qs_ctx("Background Image","options"),KviOption_pixmapMdiBackground);
 
-	tqlayout()->setRowStretch(1,1);
+	layout()->setRowStretch(1,1);
 }
 
 KviThemeMdiAreaOptionsWidget::~KviThemeMdiAreaOptionsWidget()
@@ -204,7 +204,7 @@ KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(TQWidge
 
 	addPixmapSelector(0,8,0,8,__tr2qs_ctx("Background Image","options"),KviOption_pixmapIrcToolBarAppletBackground);
 
-	tqlayout()->setRowStretch(8,1);
+	layout()->setRowStretch(8,1);
 }
 
 KviThemeToolBarAppletsOptionsWidget::~KviThemeToolBarAppletsOptionsWidget()
diff --git a/src/modules/options/optw_ircview.cpp b/src/modules/options/optw_ircview.cpp
index 4bb80f59..52f7cecb 100644
--- a/src/modules/options/optw_ircview.cpp
+++ b/src/modules/options/optw_ircview.cpp
@@ -98,7 +98,7 @@ KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(TQWidget * parent)
 			m_pVerticalAlign->setCurrentItem(0);
 	}
 	
-	tqlayout()->setRowStretch(2,1);
+	layout()->setRowStretch(2,1);
 }
 
 KviIrcViewLookOptionsWidget::~KviIrcViewLookOptionsWidget()
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index b93081e9..c4fb6943 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -77,72 +77,72 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(TQWidget * parent)
 
 	connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentItemChanged(KviTalListViewItem *)));
 
-	tqlayout()->addMultiCellWidget(m_pListView,0,0,0,2);
+	layout()->addMultiCellWidget(m_pListView,0,0,0,2);
 
 	TQLabel * l = new TQLabel(__tr2qs_ctx("Description:","options"),this);
-	tqlayout()->addWidget(l,1,0);
+	layout()->addWidget(l,1,0);
 	m_pDescription = new TQLineEdit(this);
-	tqlayout()->addMultiCellWidget(m_pDescription,1,1,1,2);
+	layout()->addMultiCellWidget(m_pDescription,1,1,1,2);
 
 	l = new TQLabel(__tr2qs_ctx("MIME type:","options"),this);
-	tqlayout()->addWidget(l,2,0);
+	layout()->addWidget(l,2,0);
 	m_pIanaType = new TQLineEdit(this);
-	tqlayout()->addMultiCellWidget(m_pIanaType,2,2,1,2);
+	layout()->addMultiCellWidget(m_pIanaType,2,2,1,2);
 
 	l = new TQLabel(__tr2qs_ctx("File pattern:","options"),this);
-	tqlayout()->addWidget(l,3,0);
+	layout()->addWidget(l,3,0);
 	m_pFileMask = new TQLineEdit(this);
-	tqlayout()->addMultiCellWidget(m_pFileMask,3,3,1,2);
+	layout()->addMultiCellWidget(m_pFileMask,3,3,1,2);
 
 	l = new TQLabel(__tr2qs_ctx("Magic bytes:","options"),this);
-	tqlayout()->addWidget(l,4,0);
+	layout()->addWidget(l,4,0);
 	m_pMagicBytes = new TQLineEdit(this);
-	tqlayout()->addMultiCellWidget(m_pMagicBytes,4,4,1,2);
+	layout()->addMultiCellWidget(m_pMagicBytes,4,4,1,2);
 
 	l = new TQLabel(__tr2qs_ctx("Save path:","options"),this);
-	tqlayout()->addWidget(l,5,0);
+	layout()->addWidget(l,5,0);
 	m_pSavePath = new TQLineEdit(this);
-	tqlayout()->addMultiCellWidget(m_pSavePath,5,5,1,2);
+	layout()->addMultiCellWidget(m_pSavePath,5,5,1,2);
 
 	l = new TQLabel(__tr2qs_ctx("Local open command:","options"),this);
-	tqlayout()->addWidget(l,6,0);
+	layout()->addWidget(l,6,0);
 	m_pCommandline = new TQLineEdit(this);
-	tqlayout()->addMultiCellWidget(m_pCommandline,6,6,1,2);
+	layout()->addMultiCellWidget(m_pCommandline,6,6,1,2);
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(m_pCommandline,__tr2qs_ctx("<center>This field contains the command to execute to open a local file.<br>" \
 		"<tt>$0</tt> is used in place of the filename</center>","options"));
 #endif
 
 	l = new TQLabel(__tr2qs_ctx("Remote open command:","options"),this);
-	tqlayout()->addWidget(l,7,0);
+	layout()->addWidget(l,7,0);
 	m_pRemoteExecCommandline = new TQLineEdit(this);
-	tqlayout()->addMultiCellWidget(m_pRemoteExecCommandline,7,7,1,2);
+	layout()->addMultiCellWidget(m_pRemoteExecCommandline,7,7,1,2);
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(m_pRemoteExecCommandline,__tr2qs_ctx("<center>This field contains the command to execute when automatically opening a received file.<br>" \
 		"<tt>$0</tt> is used in place of the filename</center>","options"));
 #endif
 
 	l = new TQLabel(__tr2qs_ctx("Icon","options"),this);
-	tqlayout()->addWidget(l,8,0);
+	layout()->addWidget(l,8,0);
 	m_pIcon = new TQLineEdit(this);
-	tqlayout()->addMultiCellWidget(m_pIcon,8,8,1,2);
+	layout()->addMultiCellWidget(m_pIcon,8,8,1,2);
 
 	TQFrame * f = new TQFrame(this);
 	f->setFrameStyle(TQFrame::Sunken | TQFrame::HLine);
-	tqlayout()->addMultiCellWidget(f,9,9,0,2);
+	layout()->addMultiCellWidget(f,9,9,0,2);
 
 	TQPushButton * b = new TQPushButton(__tr2qs_ctx("&New","options"),this);
 	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(newMediaType()));
-	tqlayout()->addWidget(b,10,1);
+	layout()->addWidget(b,10,1);
 
 	m_pDelete = new TQPushButton(__tr2qs_ctx("Re&move","options"),this);
 	connect(m_pDelete,TQT_SIGNAL(clicked()),this,TQT_SLOT(delMediaType()));
-	tqlayout()->addWidget(m_pDelete,10,2);
+	layout()->addWidget(m_pDelete,10,2);
 	
 
-	tqlayout()->setColStretch(1,1);
-	tqlayout()->setColStretch(2,1);
-	tqlayout()->setRowStretch(0,1);
+	layout()->setColStretch(1,1);
+	layout()->setColStretch(2,1);
+	layout()->setRowStretch(0,1);
 
 	m_pLastItem = 0;
 
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index 568499a9..0a8e70b2 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -186,7 +186,7 @@ KviStandardColorsOptionsWidget::KviStandardColorsOptionsWidget(TQWidget * parent
 
 	addRowSpacer(0,4,3,4);
 	
-	tqlayout()->setRowStretch(4,1);
+	layout()->setRowStretch(4,1);
 }
 
 KviStandardColorsOptionsWidget::~KviStandardColorsOptionsWidget()
@@ -464,8 +464,8 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * parent)
 		it = new KviMessageListViewItem(m_pListView,i);
 	}
 
-	tqlayout()->setRowStretch(0,1);
-	tqlayout()->setColStretch(0,1);
+	layout()->setRowStretch(0,1);
+	layout()->setColStretch(0,1);
 
 	connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(itemChanged(KviTalListViewItem *)));
 	connect(m_pForeListBox,TQT_SIGNAL(selectionChanged(KviTalListBoxItem *)),this,TQT_SLOT(colorChanged(KviTalListBoxItem *)));
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index 19a7683d..612627f9 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -236,7 +236,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * parent)
 {
 	createLayout(3,3);
 	
-	TQGridLayout * gl = tqlayout();
+	TQGridLayout * gl = layout();
 
 	KviNickServRuleSet * rs = g_pNickServRuleSet;
 	bool bNickServEnabled = rs ? (rs->isEnabled() && !rs->isEmpty()) : false;
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index f5db3256..aa9cedac 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -104,7 +104,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent)
 
 
 	KviTalGroupBox * gbox = addGroupBox(0,2,1,2,2,Qt::Horizontal,__tr2qs_ctx("Configuration","options"),this);
-	//TQGridLayout * gl = new TQGridLayout(gbox->tqlayout());
+	//TQGridLayout * gl = new TQGridLayout(gbox->layout());
 	//gl->setMargin(2);
 	//gl->setSpacing(4);
 
@@ -147,8 +147,8 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent)
 
 	fillProxyList();
 
-	tqlayout()->setRowStretch(0,1);
-	tqlayout()->setColStretch(0,1);
+	layout()->setRowStretch(0,1);
+	layout()->setColStretch(0,1);
 
 	m_pContextPopup = new KviTalPopupMenu(this);
 
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 2c26ac52..3706f10c 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -1192,10 +1192,10 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
 
 	fillServerList();
 
-	tqlayout()->setRowStretch(0,1);
-	//tqlayout()->setColStretch(1,5);
-	//tqlayout()->setColStretch(2,2);
-	tqlayout()->setColStretch(0,1);
+	layout()->setRowStretch(0,1);
+	//layout()->setColStretch(1,5);
+	//layout()->setColStretch(2,2);
+	layout()->setColStretch(0,1);
 	setMinimumWidth(320);
 }
 
diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_taskbar.cpp
index 201766cd..0c85ea7e 100644
--- a/src/modules/options/optw_taskbar.cpp
+++ b/src/modules/options/optw_taskbar.cpp
@@ -161,7 +161,7 @@ KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(TQW
 			m_pVerticalAlign->setCurrentItem(0);
 	}
 
-	tqlayout()->setRowStretch(1,1);
+	layout()->setRowStretch(1,1);
 }
 
 
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
index 7f861823..bbd2290f 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/optw_texticons.cpp
@@ -160,14 +160,14 @@ KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(TQWidget * parent)
 		++it;
 	}
 
-	tqlayout()->addMultiCellWidget(m_pTable,0,0,0,1);
+	layout()->addMultiCellWidget(m_pTable,0,0,0,1);
 
 	m_pAdd = new TQPushButton(__tr2qs_ctx("Add","options"),this);
-	tqlayout()->addWidget(m_pAdd,1,0);
+	layout()->addWidget(m_pAdd,1,0);
 	connect(m_pAdd,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked()));
 
 	m_pDel = new TQPushButton(__tr2qs_ctx("Delete","options"),this);
-	tqlayout()->addWidget(m_pDel,1,1);
+	layout()->addWidget(m_pDel,1,1);
 	connect(m_pDel,TQT_SIGNAL(clicked()),this,TQT_SLOT(delClicked()));
 
 	m_pDel->setEnabled(false);
diff --git a/src/modules/options/optw_topiclabel.cpp b/src/modules/options/optw_topiclabel.cpp
index ec076dac..904eeaee 100644
--- a/src/modules/options/optw_topiclabel.cpp
+++ b/src/modules/options/optw_topiclabel.cpp
@@ -33,7 +33,7 @@ KviTopicLabelLookOptionsWidget::KviTopicLabelLookOptionsWidget(TQWidget *p):KviO
 	addColorSelector(0, 2, 0, 2, __tr2qs_ctx("Background color","options"), KviOption_colorLabelBackground);
 	addPixmapSelector(0, 3, 0, 3, __tr2qs_ctx("Background image","options"), KviOption_pixmapLabelBackground);
 	
-	tqlayout()->setRowStretch(3, 1);
+	layout()->setRowStretch(3, 1);
 }
 
 KviTopicLabelLookOptionsWidget::~KviTopicLabelLookOptionsWidget()
diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp
index 9785cf22..595db91e 100644
--- a/src/modules/options/optw_userlist.cpp
+++ b/src/modules/options/optw_userlist.cpp
@@ -178,8 +178,8 @@ KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(T
 
 
 
-	//tqlayout()->setColStretch(0,1);
-	tqlayout()->setRowStretch(1,1);
+	//layout()->setColStretch(0,1);
+	layout()->setRowStretch(1,1);
 }
 
 KviUserListLookBackgroundOptionsWidget::~KviUserListLookBackgroundOptionsWidget()
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index 9fb7f612..115cf4be 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -460,25 +460,25 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 	TQGroupBox * gb = new TQGroupBox(__tr2qs("Ignore features"),vb);
 	connect(m_pIgnoreEnabled,TQT_SIGNAL(toggled(bool)),gb,TQT_SLOT(setEnabled(bool)));
 	
-	TQVBoxLayout * tqlayout = new TQVBoxLayout(gb,20,3);
+	TQVBoxLayout * layout = new TQVBoxLayout(gb,20,3);
 	
 	m_pIgnoreQuery = new KviStyledCheckBox(__tr2qs("Ignore query-messages"),gb);
-	tqlayout->addWidget(m_pIgnoreQuery);
+	layout->addWidget(m_pIgnoreQuery);
 
 	m_pIgnoreChannel = new KviStyledCheckBox(__tr2qs("Ignore channel-messages"),gb);
-	tqlayout->addWidget(m_pIgnoreChannel);
+	layout->addWidget(m_pIgnoreChannel);
 
 	m_pIgnoreNotice = new KviStyledCheckBox(__tr2qs("Ignore notice-messages"),gb);
-	tqlayout->addWidget(m_pIgnoreNotice);
+	layout->addWidget(m_pIgnoreNotice);
 
 	m_pIgnoreCtcp = new KviStyledCheckBox(__tr2qs("Ignore ctcp-messages"),gb);
-	tqlayout->addWidget(m_pIgnoreCtcp);
+	layout->addWidget(m_pIgnoreCtcp);
 
 	m_pIgnoreInvite = new KviStyledCheckBox(__tr2qs("Ignore invites"),gb);
-	tqlayout->addWidget(m_pIgnoreInvite);
+	layout->addWidget(m_pIgnoreInvite);
 
 	m_pIgnoreDcc = new KviStyledCheckBox(__tr2qs("Ignore DCCs"),gb);
-	tqlayout->addWidget(m_pIgnoreDcc);
+	layout->addWidget(m_pIgnoreDcc);
 
 	TQWidget *w = new TQWidget(vb);
 	w->setSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored);
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index 11e320db..d4e59cba 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
@@ -592,10 +592,10 @@ void KviSharedFilesWindow::copyLocalFileToClipboard()
 	if(!t)return;
 	TQString tmp = t->localFileName();
 	if(tmp.isEmpty())return;
-	TQApplication::tqclipboard()->setSelectionMode(false);
-	TQApplication::tqclipboard()->setText(tmp);
-	TQApplication::tqclipboard()->setSelectionMode(true);
-	TQApplication::tqclipboard()->setText(tmp);
+	TQApplication::clipboard()->setSelectionMode(false);
+	TQApplication::clipboard()->setText(tmp);
+	TQApplication::clipboard()->setSelectionMode(true);
+	TQApplication::clipboard()->setText(tmp);
 }
 
 void KviSharedFilesWindow::openLocalFileFolder()
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index de2236c1..b7ea2e7c 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -102,7 +102,7 @@ static bool str_kvs_fnc_fromclipboard(KviKvsModuleFunctionCall * c)
 	TQString szString;
 	KVSM_PARAMETERS_BEGIN(c)
 	KVSM_PARAMETERS_END(c)
-	TQClipboard *cb = TQApplication::tqclipboard();
+	TQClipboard *cb = TQApplication::clipboard();
         szString = cb->text(TQClipboard::Clipboard);
 	c->returnValue()->setString(szString);
 	return true;
@@ -132,7 +132,7 @@ static bool str_kvs_cmd_toClipboard(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("value",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue)
 	KVSM_PARAMETERS_END(c)
-	TQClipboard *cb = TQApplication::tqclipboard();
+	TQClipboard *cb = TQApplication::clipboard();
 	cb->setText(szValue, TQClipboard::Clipboard );
 	return true;
 }
@@ -1360,17 +1360,17 @@ static bool str_kvs_fnc_word(KviKvsModuleFunctionCall * c)
 	int len = szString.length();
 	while (idx<len)
 	{
-		TQChar szTmp = szString[idx].tqunicode();
+		TQChar szTmp = szString[idx].unicode();
 		while (szTmp.isSpace())
 		{
 			idx++;
-			 szTmp = szString[idx].tqunicode();
+			 szTmp = szString[idx].unicode();
 		}
 		begin = idx;
 		while (idx<len && !szTmp.isSpace())
 		{
 			idx++;
-			szTmp = szString[idx].tqunicode();
+			szTmp = szString[idx].unicode();
 		}
 		if (iOccurence == (kvs_int_t)cnt)
 		{
@@ -1433,18 +1433,18 @@ static bool str_kvs_fnc_token(KviKvsModuleFunctionCall * c)
 	int len = szString.length();
 	while (idx<len)
 	{
-		TQChar szTmp = szString[idx].tqunicode();
+		TQChar szTmp = szString[idx].unicode();
 //		while (szTmp==sep)
 		while (sep.contains(szTmp))
 		{
 			idx++;
-			 szTmp = szString[idx].tqunicode();
+			 szTmp = szString[idx].unicode();
 		}
 		begin = idx;
 		while (idx<len && !sep.contains(szTmp))
 		{
 			idx++;
-			szTmp = szString[idx].tqunicode();
+			szTmp = szString[idx].unicode();
 		}
 		if (n == cnt)
 		{
@@ -1489,13 +1489,13 @@ static bool str_kvs_fnc_charsum(KviKvsModuleFunctionCall * c)
 	{
 		while(idx < len)
 		{
-			sum += szString[idx].lower().tqunicode();
+			sum += szString[idx].lower().unicode();
 			idx++;
 		}
 	} else {
 		while(idx < len)
 		{
-			sum += szString[idx].tqunicode();
+			sum += szString[idx].unicode();
 			idx++;
 		}
 	}
@@ -1963,7 +1963,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
 	if(fmt)
 	{
 		TQChar * buffer = (TQChar *)kvi_malloc(sizeof(TQChar) * allocsize);
-		//TQChar * p = (TQChar *)s.tqunicode();
+		//TQChar * p = (TQChar *)s.unicode();
 	
 		//9999999999999999999999999999999\0
 		char numberBuffer[1024];
@@ -1993,12 +1993,12 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
 	
 		pVar = vArgs.first();
 
-		for(; fmt->tqunicode() ; ++fmt)
+		for(; fmt->unicode() ; ++fmt)
 		{
 			if(reallen == allocsize)INCREMENT_MEM
 	
 			//copy up to a '?'
-			if(fmt->tqunicode() != '?')
+			if(fmt->unicode() != '?')
 			{
 				*p++ = *fmt;
 				reallen++;
@@ -2006,7 +2006,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
 			}
 	
 			++fmt; //skip this '?'
-			switch(fmt->tqunicode())
+			switch(fmt->unicode())
 			{
 				case 's':
 				{
@@ -2015,7 +2015,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
 					if(sz.isEmpty())continue;
 					int len = sz.length();
 					if((allocsize - reallen) < len)INCREMENT_MEM_BY(len)
-					const TQChar * ch = sz.tqunicode();
+					const TQChar * ch = sz.unicode();
 					while(len--)*p++ = *ch++;
 					reallen += sz.length();
 					pVar = vArgs.next();
@@ -2149,7 +2149,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
 				}
 				case '?':
 				{
-					if(fmt->tqunicode())
+					if(fmt->unicode())
 					{
 						if(reallen == allocsize)INCREMENT_MEM
 						*p++ = *fmt;
@@ -2171,15 +2171,15 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
 	
 					int idx = 2;
 					
-					while((fmt->tqunicode() >= '0') && (fmt->tqunicode() <= '9') && (idx < 6))
+					while((fmt->unicode() >= '0') && (fmt->unicode() <= '9') && (idx < 6))
 					{
 						uPrecision *= 10;
-						fmtbuffer[idx] = fmt->tqunicode();
+						fmtbuffer[idx] = fmt->unicode();
 						uPrecision += fmtbuffer[idx] - '0';
 						fmt++;
 						idx++;
 					}
-					fmtbuffer[idx] = fmt->tqunicode();
+					fmtbuffer[idx] = fmt->unicode();
 					fmtbuffer[idx+1] = 0;
 	
 					if(pVar)
@@ -2193,7 +2193,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
 						c->warning(__tr2qs("Missing argument for a floating point escape sequence, 0.0 assumed"));
 						argRValue = 0;
 					}
-					switch(fmt->tqunicode())
+					switch(fmt->unicode())
 					{
 						case 'e':
 						case 'E':
@@ -2212,7 +2212,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
 							fmt = save;
 							*p++ = '?';  //write it
 							reallen++;
-							if(fmt->tqunicode())
+							if(fmt->unicode())
 							{
 								if(reallen == allocsize)INCREMENT_MEM
 								*p++ = *fmt;
@@ -2228,7 +2228,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
 				{
 					*p++ = '?';  //write it
 					reallen++;
-					if(fmt->tqunicode())
+					if(fmt->unicode())
 					{
 						if(reallen == allocsize)INCREMENT_MEM
 						*p++ = *fmt;
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index df684023..879a2ae6 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -240,7 +240,7 @@ static bool system_kvs_fnc_getenv(KviKvsModuleFunctionCall *c)
 
 static bool system_kvs_fnc_clipboard(KviKvsModuleFunctionCall *c)
 {
-	c->returnValue()->setString(g_pApp->tqclipboard()->text(TQClipboard::Clipboard));
+	c->returnValue()->setString(g_pApp->clipboard()->text(TQClipboard::Clipboard));
 	return true;
 }
 
@@ -275,7 +275,7 @@ static bool system_kvs_cmd_setClipboard(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("data",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue)
 	KVSM_PARAMETERS_END(c)
-	g_pApp->tqclipboard()->setText(szValue,TQClipboard::Clipboard);
+	g_pApp->clipboard()->setText(szValue,TQClipboard::Clipboard);
 	return true;
 }
 
@@ -307,7 +307,7 @@ static bool system_kvs_cmd_setSelection(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("data",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue)
 	KVSM_PARAMETERS_END(c)
-	g_pApp->tqclipboard()->setText(szValue,TQClipboard::Selection);
+	g_pApp->clipboard()->setText(szValue,TQClipboard::Selection);
 	return true;
 }
 
@@ -337,7 +337,7 @@ static bool system_kvs_cmd_setSelection(KviKvsModuleCommandCall * c)
 
 static bool system_kvs_fnc_selection(KviKvsModuleFunctionCall *c)
 {
-	c->returnValue()->setString(g_pApp->tqclipboard()->text(TQClipboard::Selection));
+	c->returnValue()->setString(g_pApp->clipboard()->text(TQClipboard::Selection));
 	return true;
 }