2 files changed, 19 insertions, 19 deletions

diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index cc9ca7c2..498da234 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -102,7 +102,7 @@ void KviCompletionBox::updateContents(TQString buffer)
 	TQString szModule;
 	TQChar* pCur = (TQChar *)buffer.ucs2();
 	
-	int pos=buffer.tqfind('.');
+	int pos=buffer.find('.');
 	
 	if(pos>0)
 	{
@@ -479,8 +479,8 @@ void KviScriptEditorWidget::getWordOnCursor(TQString &buffer,int index) const
 {
 	TQRegExp re("[ \t=,\\(\\)\"}{\\[\\]\r\n+-*><;@!]");
 	//debug("BUFFER IS %s",buffer.utf8().data());
-	int start = buffer.tqfindRev(re,index);
-	int end = buffer.tqfind(re,index);
+	int start = buffer.findRev(re,index);
+	int end = buffer.find(re,index);
 
 	TQString tmp;
 	if(start!=end)
@@ -528,11 +528,11 @@ void KviScriptEditorWidget::getWordBeforeCursor(TQString &buffer,int index,bool
 {
 	TQString tmp = buffer.left(index);
 	buffer=tmp;
-	int idx = buffer.tqfindRev(' ');
-	int idx1 = buffer.tqfindRev("=");
-	int idx2 = buffer.tqfindRev(','); 
-	int idx3 = buffer.tqfindRev('(');
-	int idx4 = buffer.tqfindRev('"');
+	int idx = buffer.findRev(' ');
+	int idx1 = buffer.findRev("=");
+	int idx2 = buffer.findRev(','); 
+	int idx3 = buffer.findRev('(');
+	int idx4 = buffer.findRev('"');
 	if(idx1 > idx) idx= idx1;	
 	if(idx2 > idx)idx = idx2;
 	if(idx3 > idx)idx = idx3;
@@ -812,7 +812,7 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
 		int index=0;
 		while (i)
 		{
-			index=text.tqfind(szFind,index,false);
+			index=text.find(szFind,index,false);
 			if (index != -1)
 			{
 				setFormat(index,szFind.length(),g_clrFind);
@@ -876,7 +876,7 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(TQWidget * par)
 	g->setColStretch(1,1);
 	g->setColStretch(2,10);
 	g->addWidget(m_pFindLineedit,1,2);
-	TQLabel *lab= new TQLabel("tqfind",this);
+	TQLabel *lab= new TQLabel("find",this);
 	lab->setText(tr("Find"));
 
 	g->addWidget(lab,1,1);
@@ -926,7 +926,7 @@ bool KviScriptEditorImplementation::isModified()
 
 void KviScriptEditorImplementation::slotFind()
 {
-	emit tqfind(m_pFindLineedit->text());
+	emit find(m_pFindLineedit->text());
 
 }
 void KviScriptEditorImplementation::slotNextFind(const TQString &text)
@@ -1177,10 +1177,10 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* tqparent,
 	tqlayout->addWidget( findNext, 2, 3 );
 	findNext->setEnabled(false);
 
-	tqreplace = new TQPushButton(this, "tqreplace" );	
-	tqreplace->setText(tr("&Replace(WIP)"));
-	tqlayout->addWidget( tqreplace, 3, 3 );
-	tqreplace->setEnabled(false);
+	replace = new TQPushButton(this, "replace" );	
+	replace->setText(tr("&Replace(WIP)"));
+	tqlayout->addWidget( replace, 3, 3 );
+	replace->setEnabled(false);
 
 #ifndef COMPILE_USE_QT4
     clearWState( WState_Polished );
@@ -1209,7 +1209,7 @@ void KviScriptEditorReplaceDialog::slotReplace()
 {
 	TQString txt=((KviScriptEditorWidget *)m_pParent)->text();
 	if (checkReplaceAll->isChecked()) emit replaceAll(m_pFindlineedit->text(),m_pReplacelineedit->text());
-	txt.tqreplace(m_pFindlineedit->text(),m_pReplacelineedit->text(),false);
+	txt.replace(m_pFindlineedit->text(),m_pReplacelineedit->text(),false);
 	((KviScriptEditorWidget *)m_pParent)->setText(txt);
 	((KviScriptEditorWidget *)m_pParent)->setModified(true);
 	m_pFindlineedit->setText("");
diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h
index f37c7ab2..91635726 100644
--- a/src/modules/editor/scripteditor.h
+++ b/src/modules/editor/scripteditor.h
@@ -65,7 +65,7 @@ public:
 	virtual ~KviScriptEditorWidget();
 public:
 	void updateOptions();
-	void tqfind1();
+	void find1();
 	TQString m_szFind;
 	KviCompletionBox *completelistbox;
 	void completition(bool bCanComplete = 1);
@@ -165,7 +165,7 @@ protected slots:
 	void slotInitFind();
 	void slotNextFind(const TQString &);
 signals:
-	void tqfind( const TQString &);
+	void find( const TQString &);
 	void replaceAll( const TQString &, const TQString &);
 	void initFind();
 	void nextFind(const TQString &);
@@ -184,7 +184,7 @@ protected:
 	TQLabel *findlabel;
 	TQLabel *replacelabel;
 	TQPushButton *replacebutton;
-	TQPushButton *tqreplace;
+	TQPushButton *replace;
 	TQPushButton *findNext;
 
 //	TQPushButton *cancelbutton;