Fixed replace in classeditor

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4892 17fca916-40b9-46aa-a4ea-0a15b648b75c

3 files changed, 13 insertions, 10 deletions

diff --git a/src/modules/classeditor/classeditor.cpp b/src/modules/classeditor/classeditor.cpp
index 72cc53ce8..b625afb75 100644
--- a/src/modules/classeditor/classeditor.cpp
+++ b/src/modules/classeditor/classeditor.cpp
@@ -170,6 +170,7 @@ KviClassEditor::KviClassEditor(QWidget * par)
 	hbox->setSpacing(0);
 	hbox->setMargin(0);
 	m_pClassNameLabel = new QLabel(__tr2qs_ctx("No item selected","editor"),hbox);
+	m_pClassNameLabel->setWordWrap(true);
 	m_pClassNameRenameButton = new QPushButton(__tr2qs_ctx("Rename","editor"),hbox);
 	m_pClassNameRenameButton->setEnabled(false);
 	connect(m_pClassNameRenameButton,SIGNAL(clicked()),this,SLOT(renameItem()));
@@ -197,9 +198,8 @@ KviClassEditor::KviClassEditor(QWidget * par)
 	m_pEditor = KviScriptEditor::createInstance(box);
 	m_pEditor->setFocus();
 
-	/*  connect(m_pEditor,SIGNAL(find(const QString &)),this,SLOT(slotFindWord(const QString &)));
+	connect(m_pEditor,SIGNAL(find(const QString &)),this,SLOT(slotFindWord(const QString &)));
 	connect(m_pEditor,SIGNAL(replaceAll(const QString &,const QString &)),this,SLOT(slotReplaceAll(const QString &,const QString &)));
-	*/
 	m_pContextPopup = new KviTalPopupMenu(this);
 
 	oneTimeSetup();
@@ -685,6 +685,8 @@ void KviClassEditor::renameNamespace(KviClassEditorTreeWidgetItem *pOldNamespace
 		activateItem(pOldNamespaceItem);
 		pOldNamespaceItem->setExpanded(true);
 	}
+	//searchReplace(szOldNameSpaceName+"::",true,szNewNameSpaceName+"::");
+
 }
 void KviClassEditor::saveLastEditedItem()
 {
@@ -898,6 +900,7 @@ void KviClassEditor::searchReplace(const QString &szSearch,bool bReplace,const Q
 				pItem->child(j)->setBackground(0, QColor(255,0,0,128));
 				if (bReplace){
 					QString &buffer=(QString &)((KviClassEditorTreeWidgetItem *)pItem->child(j))->buffer();
+					pItem->setClassNotBuilt(true);
 					buffer.replace(szSearch,szReplace,Qt::CaseInsensitive);
 				}
 				if (!bOpened)
@@ -959,17 +962,19 @@ void KviClassEditor::slotCollapseItems()
 		}
 	}
 }
-/*
+
 void KviClassEditor::slotReplaceAll(const QString &szFind,const QString &szReplace)
 {
 	m_pEditor->setFindText(szReplace);
-
+	searchReplace(szFind,true,szReplace);
+    /*
 	for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
 		recursiveSearchReplace(szFind,(KviClassEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i),true,szReplace);
 	}
+	*/
 }
-*/
+
 void KviClassEditor::getExportClassBuffer(QString &buffer,KviClassEditorTreeWidgetItem * it)
 {
 	QString szBuf = it->buffer();
diff --git a/src/modules/classeditor/classeditor.h b/src/modules/classeditor/classeditor.h
index 2b5c838ba..4fd3618ac 100644
--- a/src/modules/classeditor/classeditor.h
+++ b/src/modules/classeditor/classeditor.h
@@ -157,10 +157,9 @@ protected slots:
 	void recursiveCollapseItems(KviClassEditorTreeWidgetItem * it);
 
 	void removeSelectedItems();
-/*
-	void slotFind();
-
 	void slotReplaceAll(const QString &before,const QString &after);
+
+/*
 	void classRefresh(const QString &szName);
 */
 
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index de782add6..05cb47137 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -463,7 +463,6 @@ bool KviScriptEditorWidget::contextSensitiveHelp() const
 	int iPara, iIndex;
 	getCursorPosition(&iPara,&iIndex);
 	szBuffer = text(iPara);
-
 	getWordOnCursor(szBuffer,iIndex);
 	*/
 
@@ -1042,7 +1041,7 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog(QWidget * pParent, co
 
 	m_pCheckReplaceAll = new QCheckBox(this);
 	m_pCheckReplaceAll->setObjectName("replaceAll");
-	m_pCheckReplaceAll->setText(__tr2qs_ctx("&Replace in all Aliases","editor"));
+	m_pCheckReplaceAll->setText(__tr2qs_ctx("&Replace in all editor's items","editor"));
 	pLayout->addWidget(m_pCheckReplaceAll,2,0);
 
 	QPushButton * pCancelButton = new QPushButton(this);