Apply clang-format

1 files changed, 261 insertions, 248 deletions

diff --git a/src/modules/editor/ScriptEditorImplementation.cpp b/src/modules/editor/ScriptEditorImplementation.cpp
index 8a7859a4a..afc49e8d9 100644
--- a/src/modules/editor/ScriptEditorImplementation.cpp
+++ b/src/modules/editor/ScriptEditorImplementation.cpp
@@ -60,43 +60,42 @@
 #include <QPainter>
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-	#include <windows.h>
+#include <windows.h>
 #endif //COMPILE_ON_WINDOWS || COMPILE_ON_MINGW
 
-extern KVIRC_API KviModuleManager                    * g_pModuleManager;
+extern KVIRC_API KviModuleManager * g_pModuleManager;
 extern KviPointerList<ScriptEditorImplementation> * g_pScriptEditorWindowList;
-extern KviModule                                     * g_pEditorModulePointer;
+extern KviModule * g_pEditorModulePointer;
 
-static QColor g_clrBackground(0,0,0);
-static QColor g_clrNormalText(100,255,0);
-static QColor g_clrBracket(255,0,0);
-static QColor g_clrComment(0,120,0);
-static QColor g_clrFunction(255,255,0);
-static QColor g_clrKeyword(120,120,150);
-static QColor g_clrVariable(200,200,200);
-static QColor g_clrPunctuation(180,180,0);
-static QColor g_clrFind(255,0,0);
+static QColor g_clrBackground(0, 0, 0);
+static QColor g_clrNormalText(100, 255, 0);
+static QColor g_clrBracket(255, 0, 0);
+static QColor g_clrComment(0, 120, 0);
+static QColor g_clrFunction(255, 255, 0);
+static QColor g_clrKeyword(120, 120, 150);
+static QColor g_clrVariable(200, 200, 200);
+static QColor g_clrPunctuation(180, 180, 0);
+static QColor g_clrFind(255, 0, 0);
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-	#define KVI_SCRIPTEDITOR_DEFAULT_FONT "Courier New"
-	#define KVI_SCRIPTEDITOR_DEFAULT_FONT_SIZE 8
+#define KVI_SCRIPTEDITOR_DEFAULT_FONT "Courier New"
+#define KVI_SCRIPTEDITOR_DEFAULT_FONT_SIZE 8
 #elif defined(COMPILE_ON_MAC)
-	#define KVI_SCRIPTEDITOR_DEFAULT_FONT "Monaco"
-	#define KVI_SCRIPTEDITOR_DEFAULT_FONT_SIZE 10
+#define KVI_SCRIPTEDITOR_DEFAULT_FONT "Monaco"
+#define KVI_SCRIPTEDITOR_DEFAULT_FONT_SIZE 10
 #else
-	#define KVI_SCRIPTEDITOR_DEFAULT_FONT "Monospace"
-	#define KVI_SCRIPTEDITOR_DEFAULT_FONT_SIZE 8
+#define KVI_SCRIPTEDITOR_DEFAULT_FONT "Monospace"
+#define KVI_SCRIPTEDITOR_DEFAULT_FONT_SIZE 8
 #endif
-static QFont g_fntNormal(KVI_SCRIPTEDITOR_DEFAULT_FONT,KVI_SCRIPTEDITOR_DEFAULT_FONT_SIZE);
-
-static bool bSemaphore=false;
-static bool bCompleterReady=false;
+static QFont g_fntNormal(KVI_SCRIPTEDITOR_DEFAULT_FONT, KVI_SCRIPTEDITOR_DEFAULT_FONT_SIZE);
 
+static bool bSemaphore = false;
+static bool bCompleterReady = false;
 
 ScriptEditorWidget::ScriptEditorWidget(QWidget * pParent)
-: QTextEdit(pParent)
+    : QTextEdit(pParent)
 {
-	m_pSyntaxHighlighter=0;
+	m_pSyntaxHighlighter = 0;
 	setTabStopWidth(48);
 	setAcceptRichText(false);
 	setWordWrapMode(QTextOption::NoWrap);
@@ -107,27 +106,31 @@ ScriptEditorWidget::ScriptEditorWidget(QWidget * pParent)
 	m_pCompleter = 0;
 	QStringList szListFunctionsCommands;
 	QString tmp("kvscompleter.idx");
-	iModulesCount=0;
-	iIndex=0;
+	iModulesCount = 0;
+	iIndex = 0;
 	QString szPath;
-	g_pApp->getLocalKvircDirectory(szPath,KviApplication::ConfigPlugins,tmp);
+	g_pApp->getLocalKvircDirectory(szPath, KviApplication::ConfigPlugins, tmp);
 
 	if(!KviFileUtils::fileExists(szPath))
 	{
-		if (!bSemaphore){
-			bSemaphore=true;
+		if(!bSemaphore)
+		{
+			bSemaphore = true;
 			m_pStartTimer = new QTimer();
 			m_pStartTimer->setInterval(1000);
-			connect(m_pStartTimer,SIGNAL(timeout()),this,SLOT(asyncCompleterCreation()));
+			connect(m_pStartTimer, SIGNAL(timeout()), this, SLOT(asyncCompleterCreation()));
 			m_pStartTimer->start(500);
 		}
-		else{
+		else
+		{
 			m_pStartTimer = new QTimer();
 			m_pStartTimer->setInterval(2000);
-			connect(m_pStartTimer,SIGNAL(timeout()),this,SLOT(checkReadyCompleter()));
+			connect(m_pStartTimer, SIGNAL(timeout()), this, SLOT(checkReadyCompleter()));
 			m_pStartTimer->start(1000);
 		}
-	} else loadCompleterFromFile();
+	}
+	else
+		loadCompleterFromFile();
 }
 
 ScriptEditorWidget::~ScriptEditorWidget()
@@ -143,7 +146,7 @@ void ScriptEditorWidget::checkReadyCompleter()
 	{
 		m_pStartTimer->stop();
 		delete m_pStartTimer;
-		m_pStartTimer=0;
+		m_pStartTimer = 0;
 		loadCompleterFromFile();
 	}
 }
@@ -157,7 +160,7 @@ void ScriptEditorWidget::asyncCompleterCreation()
 		m_pListCompletition = new QStringList();
 		QString szPath;
 
-		g_pApp->getGlobalKvircDirectory(szPath,KviApplication::Modules);
+		g_pApp->getGlobalKvircDirectory(szPath, KviApplication::Modules);
 
 		QDir d(szPath);
 
@@ -175,20 +178,20 @@ void ScriptEditorWidget::asyncCompleterCreation()
 	iIndex++;
 
 #if defined(COMPILE_ON_WINDOWS)
-	szModuleName=szModuleName.replace("kvi","");
-	szModuleName=szModuleName.replace(".dll","");
+	szModuleName = szModuleName.replace("kvi", "");
+	szModuleName = szModuleName.replace(".dll", "");
 #elif defined(COMPILE_ON_MINGW)
-	szModuleName=szModuleName.replace("libkvi","");
-	szModuleName=szModuleName.replace(".dll","");
+	szModuleName = szModuleName.replace("libkvi", "");
+	szModuleName = szModuleName.replace(".dll", "");
 #else
-	szModuleName=szModuleName.replace("libkvi","");
-	szModuleName=szModuleName.replace(".so","");
+	szModuleName = szModuleName.replace("libkvi", "");
+	szModuleName = szModuleName.replace(".so", "");
 #endif
 
 	KviModule * pModule = g_pModuleManager->getModule(szModuleName);
 	if(pModule)
 	{
-		pModule->getAllFunctionsCommandsModule(m_pListCompletition,szModuleName);
+		pModule->getAllFunctionsCommandsModule(m_pListCompletition, szModuleName);
 	}
 
 	if(iIndex == iModulesCount)
@@ -198,7 +201,7 @@ void ScriptEditorWidget::asyncCompleterCreation()
 		m_pStartTimer = 0;
 		QString szTmp("kvscompleter.idx");
 		QString szPath;
-		g_pApp->getLocalKvircDirectory(szPath,KviApplication::ConfigPlugins,szTmp);
+		g_pApp->getLocalKvircDirectory(szPath, KviApplication::ConfigPlugins, szTmp);
 		KviKvsKernel::instance()->getAllFunctionsCommandsCore(m_pListCompletition);
 		QString szBuffer = m_pListCompletition->join(",");
 		QFile f(szPath);
@@ -208,7 +211,7 @@ void ScriptEditorWidget::asyncCompleterCreation()
 		createCompleter(*m_pListCompletition);
 		iIndex = 0;
 		iModulesCount = 0;
-		bCompleterReady=true;
+		bCompleterReady = true;
 		delete m_pListCompletition;
 		delete m_pListModulesNames;
 	}
@@ -219,7 +222,7 @@ void ScriptEditorWidget::loadCompleterFromFile()
 	QStringList szListFunctionsCommand;
 	QString szTmp("kvscompleter.idx");
 	QString szPath;
-	g_pApp->getLocalKvircDirectory(szPath,KviApplication::ConfigPlugins,szTmp);
+	g_pApp->getLocalKvircDirectory(szPath, KviApplication::ConfigPlugins, szTmp);
 	QString szBuffer;
 	QFile f(szPath);
 	f.open(QIODevice::ReadOnly);
@@ -238,7 +241,7 @@ void ScriptEditorWidget::createCompleter(QStringList & list)
 	m_pCompleter->setModelSorting(QCompleter::CaseSensitivelySortedModel);
 	m_pCompleter->setCompletionMode(QCompleter::PopupCompletion);
 	m_pCompleter->setCaseSensitivity(Qt::CaseInsensitive);
-	QObject::connect(m_pCompleter, SIGNAL(activated(const QString &)),this, SLOT(insertCompletion(const QString &)));
+	QObject::connect(m_pCompleter, SIGNAL(activated(const QString &)), this, SLOT(insertCompletion(const QString &)));
 }
 
 void ScriptEditorWidget::insertCompletion(const QString & szCompletion)
@@ -250,7 +253,7 @@ void ScriptEditorWidget::insertCompletion(const QString & szCompletion)
 	tc.movePosition(QTextCursor::EndOfWord);
 
 	QString szTmp = szCompletion.right(iExtra);
-	if(szCompletion.left(1)=="$")
+	if(szCompletion.left(1) == "$")
 		szTmp.append("(");
 	else
 		szTmp.append(" ");
@@ -262,26 +265,28 @@ void ScriptEditorWidget::insertCompletion(const QString & szCompletion)
 void ScriptEditorWidget::contextMenuEvent(QContextMenuEvent * e)
 {
 	QMenu * pMenu = createStandardContextMenu();
-	pMenu->addAction(__tr2qs_ctx("Context Sensitive Help","editor"),this,SLOT(slotHelp()),Qt::CTRL+Qt::Key_H);
-	pMenu->addAction(__tr2qs_ctx("&Replace","editor"),this,SLOT(slotReplace()),Qt::CTRL+Qt::Key_R);
+	pMenu->addAction(__tr2qs_ctx("Context Sensitive Help", "editor"), this, SLOT(slotHelp()), Qt::CTRL + Qt::Key_H);
+	pMenu->addAction(__tr2qs_ctx("&Replace", "editor"), this, SLOT(slotReplace()), Qt::CTRL + Qt::Key_R);
 	pMenu->exec(e->globalPos());
 	delete pMenu;
 }
 
 void ScriptEditorWidget::slotFind()
 {
-	m_szFind = ((ScriptEditorImplementation*)m_pParent)->findLineEdit()->text();
+	m_szFind = ((ScriptEditorImplementation *)m_pParent)->findLineEdit()->text();
 	setText(toPlainText());
 }
 
 void ScriptEditorWidget::slotReplace()
 {
-	ScriptEditorReplaceDialog * pDialog = new ScriptEditorReplaceDialog(this,__tr2qs_ctx("Find & Replace","editor"));
-	connect(pDialog,SIGNAL(replaceAll(const QString &,const QString &)),m_pParent,SLOT(slotReplaceAll(const QString &,const QString &)));
-	connect(pDialog,SIGNAL(initFind()),m_pParent,SLOT(slotInitFind()));
-	connect(pDialog,SIGNAL(nextFind(const QString &)),m_pParent,SLOT(slotNextFind(const QString &)));
+	ScriptEditorReplaceDialog * pDialog = new ScriptEditorReplaceDialog(this, __tr2qs_ctx("Find & Replace", "editor"));
+	connect(pDialog, SIGNAL(replaceAll(const QString &, const QString &)), m_pParent, SLOT(slotReplaceAll(const QString &, const QString &)));
+	connect(pDialog, SIGNAL(initFind()), m_pParent, SLOT(slotInitFind()));
+	connect(pDialog, SIGNAL(nextFind(const QString &)), m_pParent, SLOT(slotNextFind(const QString &)));
 
-	if(pDialog->exec()){};
+	if(pDialog->exec())
+	{
+	};
 }
 
 void ScriptEditorWidget::slotHelp()
@@ -292,35 +297,38 @@ void ScriptEditorWidget::enableSyntaxHighlighter()
 {
 	// we currently delete and re-create the m_pSyntaxHighlighter
 	// as a trick to ensure proper re-highlightning to occur
-	if (!m_pSyntaxHighlighter)
-	    m_pSyntaxHighlighter = new ScriptEditorSyntaxHighlighter(this);
+	if(!m_pSyntaxHighlighter)
+		m_pSyntaxHighlighter = new ScriptEditorSyntaxHighlighter(this);
 }
 void ScriptEditorWidget::disableSyntaxHighlighter()
 {
-	if (m_pSyntaxHighlighter) delete m_pSyntaxHighlighter;
+	if(m_pSyntaxHighlighter)
+		delete m_pSyntaxHighlighter;
 	m_pSyntaxHighlighter = 0;
 }
 
 void ScriptEditorWidget::updateOptions()
 {
 	QPalette p = palette();
-	p.setColor(QPalette::Base,g_clrBackground);
-	p.setColor(QPalette::Text,g_clrNormalText);
+	p.setColor(QPalette::Base, g_clrBackground);
+	p.setColor(QPalette::Text, g_clrNormalText);
 	setPalette(p);
 	setFont(g_fntNormal);
 	setTextColor(g_clrNormalText);
 	disableSyntaxHighlighter();
 	enableSyntaxHighlighter();
 
-	p = ((ScriptEditorImplementation*)m_pParent)->findLineEdit()->palette();
-	p.setColor(foregroundRole(),g_clrFind);
-	((ScriptEditorImplementation*)m_pParent)->findLineEdit()->setPalette(p);
+	p = ((ScriptEditorImplementation *)m_pParent)->findLineEdit()->palette();
+	p.setColor(foregroundRole(), g_clrFind);
+	((ScriptEditorImplementation *)m_pParent)->findLineEdit()->setPalette(p);
 
 	//set cursor custom width
-	if (KVI_OPTION_BOOL(KviOption_boolEnableCustomCursorWidth))
+	if(KVI_OPTION_BOOL(KviOption_boolEnableCustomCursorWidth))
 	{
 		setCursorWidth(KVI_OPTION_UINT(KviOption_uintCustomCursorWidth));
-	} else {
+	}
+	else
+	{
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 		int iCursorWidth = 1;
 		SystemParametersInfo(SPI_GETCARETWIDTH, 0, &iCursorWidth, 0);
@@ -366,33 +374,33 @@ void ScriptEditorWidget::keyPressEvent(QKeyEvent * e)
 			case Qt::Key_Enter:
 			case Qt::Key_Return:
 			case Qt::Key_PageUp:
-				 e->ignore(); // allow the parent to process it
-				 return;
-			break;
+				e->ignore(); // allow the parent to process it
+				return;
+				break;
 		}
 	}
-// Adapted from QT4 QCompleter example
+	// Adapted from QT4 QCompleter example
 	bool isShortcut = ((e->modifiers() & Qt::ControlModifier) && e->key() == Qt::Key_E); // CTRL+E
-	if (!m_pCompleter || !isShortcut) // don't process the shortcut when we have a completer
+	if(!m_pCompleter || !isShortcut)                                                     // don't process the shortcut when we have a completer
 		QTextEdit::keyPressEvent(e);
 	const bool ctrlOrShift = e->modifiers() & (Qt::ControlModifier | Qt::ShiftModifier);
-	if (!m_pCompleter || (ctrlOrShift && e->text().isEmpty()))
+	if(!m_pCompleter || (ctrlOrShift && e->text().isEmpty()))
 		return;
 	static QString eow("~!@#$%^&*()_+{}|:\"<>?,/;'[]\\-="); // end of word
 	bool hasModifier = (e->modifiers() != Qt::NoModifier) && !ctrlOrShift;
 	QString completionPrefix = textUnderCursor();
-	if (!isShortcut && (hasModifier || e->text().isEmpty()|| completionPrefix.length() < 3 || eow.contains(e->text().right(1))))
+	if(!isShortcut && (hasModifier || e->text().isEmpty() || completionPrefix.length() < 3 || eow.contains(e->text().right(1))))
 	{
 		m_pCompleter->popup()->hide();
 		return;
 	}
-	if (completionPrefix != m_pCompleter->completionPrefix())
+	if(completionPrefix != m_pCompleter->completionPrefix())
 	{
 		m_pCompleter->setCompletionPrefix(completionPrefix);
 		m_pCompleter->popup()->setCurrentIndex(m_pCompleter->completionModel()->index(0, 0));
 	}
 	QRect cr = cursorRect();
-	cr.setWidth(m_pCompleter->popup()->sizeHintForColumn(0)+ m_pCompleter->popup()->verticalScrollBar()->sizeHint().width());
+	cr.setWidth(m_pCompleter->popup()->sizeHintForColumn(0) + m_pCompleter->popup()->verticalScrollBar()->sizeHint().width());
 	m_pCompleter->complete(cr);
 }
 
@@ -403,32 +411,35 @@ QString ScriptEditorWidget::textUnderCursor() const
 	if(tc.atBlockStart())
 		return QString();
 	tc.clearSelection();
-	tc.movePosition(QTextCursor::StartOfWord,QTextCursor::KeepAnchor);
+	tc.movePosition(QTextCursor::StartOfWord, QTextCursor::KeepAnchor);
 	if(tc.atBlockStart())
 	{
 		szWord.append(tc.selectedText());
-		tc.movePosition(QTextCursor::EndOfWord,QTextCursor::KeepAnchor);
+		tc.movePosition(QTextCursor::EndOfWord, QTextCursor::KeepAnchor);
 		szWord.append(tc.selectedText());
-		if(tc.atBlockEnd()){
+		if(tc.atBlockEnd())
+		{
 			return szWord;
 		}
-		tc.movePosition(QTextCursor::NextCharacter,QTextCursor::KeepAnchor);
+		tc.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor);
 		szWord.append(tc.selectedText());
-		if(szWord.right(1)!=".")
+		if(szWord.right(1) != ".")
 			szWord.chop(1);
 		return szWord;
 	}
 
-	tc.movePosition(QTextCursor::PreviousCharacter,QTextCursor::KeepAnchor);
-	szWord=tc.selectedText();
-	if(szWord.left(1)==".")
+	tc.movePosition(QTextCursor::PreviousCharacter, QTextCursor::KeepAnchor);
+	szWord = tc.selectedText();
+	if(szWord.left(1) == ".")
 	{
 		tc.movePosition(QTextCursor::StartOfWord);
 		tc.movePosition(QTextCursor::PreviousCharacter);
 		tc.movePosition(QTextCursor::PreviousWord);
-		tc.movePosition(QTextCursor::EndOfWord,QTextCursor::KeepAnchor,1);
+		tc.movePosition(QTextCursor::EndOfWord, QTextCursor::KeepAnchor, 1);
 		szWord.prepend(tc.selectedText());
-	} else szWord.remove(0,1);
+	}
+	else
+		szWord.remove(0, 1);
 	return szWord;
 }
 /*
@@ -494,7 +505,7 @@ bool ScriptEditorWidget::contextSensitiveHelp() const
 	*/
 
 	QRect r = cursorRect();
-	QTextCursor cur = cursorForPosition(QPoint(r.x(),r.y()));
+	QTextCursor cur = cursorForPosition(QPoint(r.x(), r.y()));
 	cur.select(QTextCursor::WordUnderCursor);
 	QString szText = cur.selectedText();
 	QString szTmp = szText;
@@ -534,39 +545,39 @@ bool ScriptEditorWidget::contextSensitiveHelp() const
 }
 
 ScriptEditorWidgetColorOptions::ScriptEditorWidgetColorOptions(QWidget * pParent)
-: QDialog(pParent)
+    : QDialog(pParent)
 {
 	m_pSelectorInterfaceList = new KviPointerList<KviSelectorInterface>;
 	m_pSelectorInterfaceList->setAutoDelete(false);
-	setWindowTitle(__tr2qs_ctx("Editor Configuration - KVIrc","editor"));
+	setWindowTitle(__tr2qs_ctx("Editor Configuration - KVIrc", "editor"));
 	QGridLayout * g = new QGridLayout(this);
 	KviTalVBox * box = new KviTalVBox(this);
-	g->addWidget(box,0,0);
+	g->addWidget(box, 0, 0);
 	box->setMargin(0);
 	box->setSpacing(0);
-	KviFontSelector * f = new KviFontSelector(box,__tr2qs_ctx("Font:","editor"),&g_fntNormal,true);
+	KviFontSelector * f = new KviFontSelector(box, __tr2qs_ctx("Font:", "editor"), &g_fntNormal, true);
 	m_pSelectorInterfaceList->append(f);
-	KviTalGroupBox * gbox = new KviTalGroupBox(Qt::Horizontal,__tr2qs_ctx("Colors","editor"),box);
+	KviTalGroupBox * gbox = new KviTalGroupBox(Qt::Horizontal, __tr2qs_ctx("Colors", "editor"), box);
 	gbox->setInsideSpacing(0);
 
-	addColorSelector(gbox,__tr2qs_ctx("Background:","editor"),&g_clrBackground,true);
-	addColorSelector(gbox,__tr2qs_ctx("Normal text:","editor"),&g_clrNormalText,true);
-	addColorSelector(gbox,__tr2qs_ctx("Brackets:","editor"),&g_clrBracket,true);
-	addColorSelector(gbox,__tr2qs_ctx("Comments:","editor"),&g_clrComment,true);
-	addColorSelector(gbox,__tr2qs_ctx("Functions:","editor"),&g_clrFunction,true);
-	addColorSelector(gbox,__tr2qs_ctx("Keywords:","editor"),&g_clrKeyword,true);
-	addColorSelector(gbox,__tr2qs_ctx("Variables:","editor"),&g_clrVariable,true);
-	addColorSelector(gbox,__tr2qs_ctx("Punctuation:","editor"),&g_clrPunctuation,true);
-	addColorSelector(gbox,__tr2qs_ctx("Find:","editor"),&g_clrFind,true);
+	addColorSelector(gbox, __tr2qs_ctx("Background:", "editor"), &g_clrBackground, true);
+	addColorSelector(gbox, __tr2qs_ctx("Normal text:", "editor"), &g_clrNormalText, true);
+	addColorSelector(gbox, __tr2qs_ctx("Brackets:", "editor"), &g_clrBracket, true);
+	addColorSelector(gbox, __tr2qs_ctx("Comments:", "editor"), &g_clrComment, true);
+	addColorSelector(gbox, __tr2qs_ctx("Functions:", "editor"), &g_clrFunction, true);
+	addColorSelector(gbox, __tr2qs_ctx("Keywords:", "editor"), &g_clrKeyword, true);
+	addColorSelector(gbox, __tr2qs_ctx("Variables:", "editor"), &g_clrVariable, true);
+	addColorSelector(gbox, __tr2qs_ctx("Punctuation:", "editor"), &g_clrPunctuation, true);
+	addColorSelector(gbox, __tr2qs_ctx("Find:", "editor"), &g_clrFind, true);
 
 	KviTalHBox * hbox = new KviTalHBox(box);
 
-	QPushButton * b = new QPushButton(__tr2qs_ctx("OK","editor"),hbox);
+	QPushButton * b = new QPushButton(__tr2qs_ctx("OK", "editor"), hbox);
 	b->setDefault(true);
-	connect(b,SIGNAL(clicked()),this,SLOT(okClicked()));
+	connect(b, SIGNAL(clicked()), this, SLOT(okClicked()));
 
-	b = new QPushButton(__tr2qs_ctx("Cancel","editor"),hbox);
-	connect(b,SIGNAL(clicked()),this,SLOT(reject()));
+	b = new QPushButton(__tr2qs_ctx("Cancel", "editor"), hbox);
+	connect(b, SIGNAL(clicked()), this, SLOT(reject()));
 }
 
 ScriptEditorWidgetColorOptions::~ScriptEditorWidgetColorOptions()
@@ -574,25 +585,24 @@ ScriptEditorWidgetColorOptions::~ScriptEditorWidgetColorOptions()
 	delete m_pSelectorInterfaceList;
 }
 
-KviColorSelector * ScriptEditorWidgetColorOptions::addColorSelector(QWidget * pParent,const QString & txt,QColor * pOption,bool bEnabled)
+KviColorSelector * ScriptEditorWidgetColorOptions::addColorSelector(QWidget * pParent, const QString & txt, QColor * pOption, bool bEnabled)
 {
-	KviColorSelector * s = new KviColorSelector(pParent,txt,pOption,bEnabled);
+	KviColorSelector * s = new KviColorSelector(pParent, txt, pOption, bEnabled);
 	m_pSelectorInterfaceList->append(s);
-		return s;
+	return s;
 }
 
 void ScriptEditorWidgetColorOptions::okClicked()
 {
-	for(KviSelectorInterface * i = m_pSelectorInterfaceList->first();i;i = m_pSelectorInterfaceList->next())
+	for(KviSelectorInterface * i = m_pSelectorInterfaceList->first(); i; i = m_pSelectorInterfaceList->next())
 	{
 		i->commit();
 	}
 	accept();
 }
 
-
 ScriptEditorSyntaxHighlighter::ScriptEditorSyntaxHighlighter(ScriptEditorWidget * pWidget)
-: QSyntaxHighlighter(pWidget),m_pTextEdit(pWidget)
+    : QSyntaxHighlighter(pWidget), m_pTextEdit(pWidget)
 {
 	// code adpated from QT4 example
 
@@ -603,25 +613,24 @@ ScriptEditorSyntaxHighlighter::ScriptEditorSyntaxHighlighter(ScriptEditorWidget
 
 	KviScriptHighlightingRule rule;
 
-	rule.pattern=QRegExp("([=()[\\]!\"?<>;:.,+-])+");
-	rule.format=punctuationFormat;
+	rule.pattern = QRegExp("([=()[\\]!\"?<>;:.,+-])+");
+	rule.format = punctuationFormat;
 	highlightingRules.append(rule);
 
-	rule.pattern=QRegExp("[{};](|[a-zA-Z]|[a-zA-Z]+[a-zA-Z0-9_\\.:]*)");
-	rule.format=keywordFormat;
+	rule.pattern = QRegExp("[{};](|[a-zA-Z]|[a-zA-Z]+[a-zA-Z0-9_\\.:]*)");
+	rule.format = keywordFormat;
 	highlightingRules.append(rule);
 
-
-	rule.pattern=QRegExp("[$](|[a-zA-Z0-9]+[a-zA-Z0-9_\\.:]*)");
-	rule.format=functionFormat;
+	rule.pattern = QRegExp("[$](|[a-zA-Z0-9]+[a-zA-Z0-9_\\.:]*)");
+	rule.format = functionFormat;
 	highlightingRules.append(rule);
 
-	rule.pattern=QRegExp("[%](|[a-zA-Z]|[a-zA-Z]+[a-zA-Z0-9_\\.]*)");
-	rule.format=variableFormat;
+	rule.pattern = QRegExp("[%](|[a-zA-Z]|[a-zA-Z]+[a-zA-Z0-9_\\.]*)");
+	rule.format = variableFormat;
 	highlightingRules.append(rule);
 
-	rule.pattern=QRegExp("([{}])+");
-	rule.format=bracketFormat;
+	rule.pattern = QRegExp("([{}])+");
+	rule.format = bracketFormat;
 	highlightingRules.append(rule);
 }
 
@@ -640,16 +649,18 @@ void ScriptEditorSyntaxHighlighter::updateSyntaxtTextFormat()
 	findFormat.setForeground(g_clrFind);
 }
 
-#define SKIP_SPACES \
-	while(iIndexStart < szText.size()) \
-	{ \
-		if(szText.at(iIndexStart).unicode()=='\t' || szText.at(iIndexStart).unicode()==' ') \
-		{ \
-			iIndexStart++; \
-		} else { \
-			break; \
-		} \
-	} \
+#define SKIP_SPACES                                                                             \
+	while(iIndexStart < szText.size())                                                          \
+	{                                                                                           \
+		if(szText.at(iIndexStart).unicode() == '\t' || szText.at(iIndexStart).unicode() == ' ') \
+		{                                                                                       \
+			iIndexStart++;                                                                      \
+		}                                                                                       \
+		else                                                                                    \
+		{                                                                                       \
+			break;                                                                              \
+		}                                                                                       \
+	}
 
 void ScriptEditorSyntaxHighlighter::highlightBlock(const QString & szText)
 {
@@ -659,7 +670,7 @@ void ScriptEditorSyntaxHighlighter::highlightBlock(const QString & szText)
 		return;
 	}
 
-	int iIndexStart=0;
+	int iIndexStart = 0;
 	setCurrentBlockState(0);
 
 	if(previousBlockState() == 1)
@@ -670,73 +681,74 @@ void ScriptEditorSyntaxHighlighter::highlightBlock(const QString & szText)
 		{
 			// not found: comment until the end of the block
 			setCurrentBlockState(1);
-			setFormat(iIndexStart,szText.length(),commentFormat);
+			setFormat(iIndexStart, szText.length(), commentFormat);
 			return;
 		}
 		// skip 2 chars
-		iCommentEnd+=2;
+		iCommentEnd += 2;
 		// end of comment found
-		setFormat(iIndexStart,iCommentEnd - iIndexStart,commentFormat);
+		setFormat(iIndexStart, iCommentEnd - iIndexStart, commentFormat);
 		iIndexStart = iCommentEnd;
 	}
 
 	SKIP_SPACES
 
-	if (iIndexStart == szText.size())
+	if(iIndexStart == szText.size())
 		return;
 
 	// check 'commands' and comments
-	int iCommandStart=iIndexStart;
-	if (szText.at(iIndexStart).unicode()!='$' && szText.at(iIndexStart).unicode()!='{' && szText.at(iIndexStart).unicode()!='}' && szText.at(iIndexStart).unicode()!='%')
+	int iCommandStart = iIndexStart;
+	if(szText.at(iIndexStart).unicode() != '$' && szText.at(iIndexStart).unicode() != '{' && szText.at(iIndexStart).unicode() != '}' && szText.at(iIndexStart).unicode() != '%')
 	{
 		switch(szText.at(iIndexStart).unicode())
 		{
 			case '#':
 				// single line comment, bash style
-				while(iIndexStart<szText.size() && szText.at(iIndexStart).unicode() != '\n')
+				while(iIndexStart < szText.size() && szText.at(iIndexStart).unicode() != '\n')
 					iIndexStart++;
-				setFormat(iCommandStart,iIndexStart-iCommandStart,commentFormat);
+				setFormat(iCommandStart, iIndexStart - iCommandStart, commentFormat);
 				break;
 			case '/':
-				if((iIndexStart+1)<szText.size())
+				if((iIndexStart + 1) < szText.size())
 				{
-					if(szText.at(iIndexStart+1).unicode()=='/')
+					if(szText.at(iIndexStart + 1).unicode() == '/')
 					{
 						// single line comment, c++ style
 						iIndexStart++;
-						while(iIndexStart<szText.size() && szText.at(iIndexStart).unicode() != '\n')
+						while(iIndexStart < szText.size() && szText.at(iIndexStart).unicode() != '\n')
 							iIndexStart++;
-						setFormat(iCommandStart,iIndexStart-iCommandStart,commentFormat);
+						setFormat(iCommandStart, iIndexStart - iCommandStart, commentFormat);
 						break;
 					}
 
-					if(szText.at(iIndexStart+1).unicode()=='*')
+					if(szText.at(iIndexStart + 1).unicode() == '*')
 					{
 						// multi line comment, c style
 						iIndexStart++;
 						setCurrentBlockState(1);
-						while(iIndexStart<szText.size())
+						while(iIndexStart < szText.size())
 						{
-							if((iIndexStart+1)<szText.size())
+							if((iIndexStart + 1) < szText.size())
 							{
-								if(szText.at(iIndexStart).unicode() == '*' &&
-									szText.at(iIndexStart+1).unicode() == '/')
+								if(szText.at(iIndexStart).unicode() == '*' && szText.at(iIndexStart + 1).unicode() == '/')
 								{
-									iIndexStart+=2;
+									iIndexStart += 2;
 									setCurrentBlockState(0);
 									break;
 								}
 							}
 							iIndexStart++;
 						}
-						setFormat(iCommandStart,iIndexStart-iCommandStart,commentFormat);
+						setFormat(iCommandStart, iIndexStart - iCommandStart, commentFormat);
 
 						SKIP_SPACES
 
-						if(currentBlockState()==0)
+						if(currentBlockState() == 0)
+						{
+							iCommandStart = iIndexStart;
+						}
+						else
 						{
-							iCommandStart=iIndexStart;
-						} else {
 							break;
 						}
 						// else fallback to command (a command can start at the end of a /* comment */)
@@ -745,25 +757,25 @@ void ScriptEditorSyntaxHighlighter::highlightBlock(const QString & szText)
 				}
 			default:
 				//command
-				while(iIndexStart<szText.size() && (szText.at(iIndexStart).isLetterOrNumber() || (szText.at(iIndexStart).unicode() == '.') || (szText.at(iIndexStart).unicode() == '_') || (szText.at(iIndexStart).unicode()== ':') ))
+				while(iIndexStart < szText.size() && (szText.at(iIndexStart).isLetterOrNumber() || (szText.at(iIndexStart).unicode() == '.') || (szText.at(iIndexStart).unicode() == '_') || (szText.at(iIndexStart).unicode() == ':')))
 				{
 					iIndexStart++;
 				}
-				setFormat(iCommandStart,iIndexStart-iCommandStart,keywordFormat);
+				setFormat(iCommandStart, iIndexStart - iCommandStart, keywordFormat);
 				break;
 		}
 	}
 
 	// code from QT4 example
-	int index=0;
-	foreach (KviScriptHighlightingRule rule, highlightingRules)
+	int index = 0;
+	foreach(KviScriptHighlightingRule rule, highlightingRules)
 	{
 		QRegExp expression(rule.pattern);
-		QString sz=expression.pattern();
+		QString sz = expression.pattern();
 
-		index = szText.indexOf(expression,iIndexStart);
+		index = szText.indexOf(expression, iIndexStart);
 
-		while (index >= 0)
+		while(index >= 0)
 		{
 			int length = expression.matchedLength();
 			setFormat(index, length, rule.format);
@@ -774,29 +786,29 @@ void ScriptEditorSyntaxHighlighter::highlightBlock(const QString & szText)
 	// 'found matches' highlighting
 	ScriptEditorWidget * pEditor = ((ScriptEditorWidget *)textEdit());
 	QString szFind = pEditor->m_szFind;
-	if (!szFind.isEmpty())
+	if(!szFind.isEmpty())
 	{
-		index = szText.indexOf(szFind,0,Qt::CaseInsensitive);
-		int length=szFind.length();
-		while (index >= 0)
+		index = szText.indexOf(szFind, 0, Qt::CaseInsensitive);
+		int length = szFind.length();
+		while(index >= 0)
 		{
 			setFormat(index, length, findFormat);
-			index = szText.indexOf(szFind,index + length,Qt::CaseInsensitive);
+			index = szText.indexOf(szFind, index + length, Qt::CaseInsensitive);
 		}
 	}
 }
 
-
 ScriptEditorImplementation::ScriptEditorImplementation(QWidget * par)
-:KviScriptEditor(par)
+    : KviScriptEditor(par)
 {
-	m_pOptionsDialog=0;
-	if(g_pScriptEditorWindowList->isEmpty())loadOptions();
+	m_pOptionsDialog = 0;
+	if(g_pScriptEditorWindowList->isEmpty())
+		loadOptions();
 	g_pScriptEditorWindowList->append(this);
 	m_lastCursorPos = 0;
 	QGridLayout * g = new QGridLayout(this);
 
-	m_pFindLineEdit = new QLineEdit(" ",this);
+	m_pFindLineEdit = new QLineEdit(" ", this);
 	m_pFindLineEdit->setText("");
 
 	QPalette p = m_pFindLineEdit->palette();
@@ -805,8 +817,8 @@ ScriptEditorImplementation::ScriptEditorImplementation(QWidget * par)
 
 	m_pEditor = new ScriptEditorWidget(this);
 
-	g->addWidget(m_pEditor, 0, 0, 1,4);
-	g->setRowStretch(0,1);
+	g->addWidget(m_pEditor, 0, 0, 1, 4);
+	g->setRowStretch(0, 1);
 
 	QToolButton * b = new QToolButton(this);
 	b->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Options)));
@@ -815,34 +827,34 @@ ScriptEditorImplementation::ScriptEditorImplementation(QWidget * par)
 	b->setMinimumWidth(24);
 	b->setText(__tr2qs_ctx("Options", "editor"));
 	b->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-	g->addWidget(b,1,0);
+	g->addWidget(b, 1, 0);
 
 	QMenu * pop = new QMenu(b);
-	pop->addAction(__tr2qs_ctx("&Open...","editor"),this,SLOT(loadFromFile()));
-	pop->addAction(__tr2qs_ctx("&Save As...","editor"),this,SLOT(saveToFile()));
+	pop->addAction(__tr2qs_ctx("&Open...", "editor"), this, SLOT(loadFromFile()));
+	pop->addAction(__tr2qs_ctx("&Save As...", "editor"), this, SLOT(saveToFile()));
 	pop->addSeparator();
-	pop->addAction(__tr2qs_ctx("&Configure Editor...","editor"),this,SLOT(configureColors()));
+	pop->addAction(__tr2qs_ctx("&Configure Editor...", "editor"), this, SLOT(configureColors()));
 	b->setMenu(pop);
 	b->setPopupMode(QToolButton::InstantPopup);
 
-	g->setColumnStretch(1,1);
-	g->setColumnStretch(2,10);
-	g->addWidget(m_pFindLineEdit,1,2);
+	g->setColumnStretch(1, 1);
+	g->setColumnStretch(2, 10);
+	g->addWidget(m_pFindLineEdit, 1, 2);
 
 	QLabel * pLab = new QLabel(this);
-	pLab->setText(__tr2qs_ctx("Find:","editor"));
+	pLab->setText(__tr2qs_ctx("Find:", "editor"));
 	pLab->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-	g->addWidget(pLab,1,1);
+	g->addWidget(pLab, 1, 1);
 
-	m_pRowColLabel = new QLabel(QString(__tr2qs_ctx("Row: %1 Col: %2","editor")).arg(0).arg(0),this);
+	m_pRowColLabel = new QLabel(QString(__tr2qs_ctx("Row: %1 Col: %2", "editor")).arg(0).arg(0), this);
 	m_pRowColLabel->setFrameStyle(QFrame::Sunken | QFrame::Panel);
 	m_pRowColLabel->setMinimumWidth(80);
-	g->addWidget(m_pRowColLabel,1,3);
+	g->addWidget(m_pRowColLabel, 1, 3);
 
-	connect(m_pFindLineEdit,SIGNAL(returnPressed()),m_pEditor,SLOT(slotFind()));
-	connect(m_pFindLineEdit,SIGNAL(returnPressed()),this,SLOT(slotFind()));
-	connect(m_pEditor,SIGNAL(cursorPositionChanged()),this,SLOT(updateRowColLabel()));
-	connect(m_pEditor,SIGNAL(selectionChanged()),this,SLOT(updateRowColLabel()));
+	connect(m_pFindLineEdit, SIGNAL(returnPressed()), m_pEditor, SLOT(slotFind()));
+	connect(m_pFindLineEdit, SIGNAL(returnPressed()), this, SLOT(slotFind()));
+	connect(m_pEditor, SIGNAL(cursorPositionChanged()), this, SLOT(updateRowColLabel()));
+	connect(m_pEditor, SIGNAL(selectionChanged()), this, SLOT(updateRowColLabel()));
 	m_lastCursorPos = 0;
 }
 
@@ -851,7 +863,7 @@ ScriptEditorImplementation::~ScriptEditorImplementation()
 	if(m_pOptionsDialog)
 	{
 		m_pOptionsDialog->deleteLater();
-		m_pOptionsDialog=0;
+		m_pOptionsDialog = 0;
 	}
 	g_pScriptEditorWindowList->removeRef(this);
 	if(g_pScriptEditorWindowList->isEmpty())
@@ -863,17 +875,17 @@ void ScriptEditorImplementation::loadOptions()
 	QString szTmp;
 	g_pEditorModulePointer->getDefaultConfigFileName(szTmp);
 
-	KviConfigurationFile cfg(szTmp,KviConfigurationFile::Read);
-	g_clrBackground = cfg.readColorEntry("Background",QColor(0,0,0));
-	g_clrNormalText = cfg.readColorEntry("NormalText",QColor(100,255,0));
-	g_clrBracket = cfg.readColorEntry("Bracket",QColor(255,0,0));
-	g_clrComment = cfg.readColorEntry("Comment",QColor(0,120,0));
-	g_clrFunction = cfg.readColorEntry("Function",QColor(255,255,0));
-	g_clrKeyword = cfg.readColorEntry("Keyword",QColor(120,120,150));
-	g_clrVariable = cfg.readColorEntry("Variable",QColor(200,200,200));
-	g_clrPunctuation = cfg.readColorEntry("Punctuation",QColor(180,180,0));
-	g_clrFind = cfg.readColorEntry("Find",QColor(255,0,0));
-	g_fntNormal = cfg.readFontEntry("Font",QFont(KVI_SCRIPTEDITOR_DEFAULT_FONT,KVI_SCRIPTEDITOR_DEFAULT_FONT_SIZE));
+	KviConfigurationFile cfg(szTmp, KviConfigurationFile::Read);
+	g_clrBackground = cfg.readColorEntry("Background", QColor(0, 0, 0));
+	g_clrNormalText = cfg.readColorEntry("NormalText", QColor(100, 255, 0));
+	g_clrBracket = cfg.readColorEntry("Bracket", QColor(255, 0, 0));
+	g_clrComment = cfg.readColorEntry("Comment", QColor(0, 120, 0));
+	g_clrFunction = cfg.readColorEntry("Function", QColor(255, 255, 0));
+	g_clrKeyword = cfg.readColorEntry("Keyword", QColor(120, 120, 150));
+	g_clrVariable = cfg.readColorEntry("Variable", QColor(200, 200, 200));
+	g_clrPunctuation = cfg.readColorEntry("Punctuation", QColor(180, 180, 0));
+	g_clrFind = cfg.readColorEntry("Find", QColor(255, 0, 0));
+	g_fntNormal = cfg.readFontEntry("Font", QFont(KVI_SCRIPTEDITOR_DEFAULT_FONT, KVI_SCRIPTEDITOR_DEFAULT_FONT_SIZE));
 }
 
 bool ScriptEditorImplementation::isModified()
@@ -891,7 +903,7 @@ void ScriptEditorImplementation::slotFind()
 
 void ScriptEditorImplementation::slotNextFind(const QString &) //szText
 {
-//	emit nextFind(const QString & szText);
+	//	emit nextFind(const QString & szText);
 }
 
 void ScriptEditorImplementation::slotInitFind()
@@ -901,7 +913,7 @@ void ScriptEditorImplementation::slotInitFind()
 
 void ScriptEditorImplementation::slotReplaceAll(const QString & szToReplace, const QString & szReplaceWith)
 {
-	emit replaceAll(szToReplace,szReplaceWith);
+	emit replaceAll(szToReplace, szReplaceWith);
 }
 
 void ScriptEditorImplementation::saveOptions()
@@ -909,17 +921,17 @@ void ScriptEditorImplementation::saveOptions()
 	QString szTmp;
 	g_pEditorModulePointer->getDefaultConfigFileName(szTmp);
 
-	KviConfigurationFile cfg(szTmp,KviConfigurationFile::Write);
-	cfg.writeEntry("Background",g_clrBackground);
-	cfg.writeEntry("NormalText",g_clrNormalText);
-	cfg.writeEntry("Bracket",g_clrBracket);
-	cfg.writeEntry("Comment",g_clrComment);
-	cfg.writeEntry("Function",g_clrFunction);
-	cfg.writeEntry("Keyword",g_clrKeyword);
-	cfg.writeEntry("Variable",g_clrVariable);
-	cfg.writeEntry("Punctuation",g_clrPunctuation);
-	cfg.writeEntry("Find",g_clrFind);
-	cfg.writeEntry("Font",g_fntNormal);
+	KviConfigurationFile cfg(szTmp, KviConfigurationFile::Write);
+	cfg.writeEntry("Background", g_clrBackground);
+	cfg.writeEntry("NormalText", g_clrNormalText);
+	cfg.writeEntry("Bracket", g_clrBracket);
+	cfg.writeEntry("Comment", g_clrComment);
+	cfg.writeEntry("Function", g_clrFunction);
+	cfg.writeEntry("Keyword", g_clrKeyword);
+	cfg.writeEntry("Variable", g_clrVariable);
+	cfg.writeEntry("Punctuation", g_clrPunctuation);
+	cfg.writeEntry("Find", g_clrFind);
+	cfg.writeEntry("Font", g_fntNormal);
 }
 
 void ScriptEditorImplementation::setFocus()
@@ -943,20 +955,20 @@ void ScriptEditorImplementation::saveToFile()
 {
 	QString szFileName;
 	if(KviFileDialog::askForSaveFileName(szFileName,
-		__tr2qs_ctx("Choose a Filename - KVIrc","editor"),
-		QString::null,
-		QString::null,false,true,true,this))
+	       __tr2qs_ctx("Choose a Filename - KVIrc", "editor"),
+	       QString::null,
+	       QString::null, false, true, true, this))
 	{
 		QString szBuffer = m_pEditor->toPlainText();
 
 		//if(tmp.isEmpty())tmp = "";
 		//KviCString buffer = tmp.toUtf8().data();
-		if(!KviFileUtils::writeFile(szFileName,szBuffer))
+		if(!KviFileUtils::writeFile(szFileName, szBuffer))
 		{
 			QString szTmp;
 			QMessageBox::warning(this,
-				__tr2qs_ctx("Writing to File Failed - KVIrc","editor"),
-				szTmp = QString(__tr2qs_ctx("Can't open file %1 for writing.","editor")).arg(szFileName));
+			    __tr2qs_ctx("Writing to File Failed - KVIrc", "editor"),
+			    szTmp = QString(__tr2qs_ctx("Can't open file %1 for writing.", "editor")).arg(szFileName));
 		}
 	}
 }
@@ -989,7 +1001,7 @@ void ScriptEditorImplementation::setText(const QString & szText)
 {
 	m_pEditor->enableSyntaxHighlighter();
 	m_pEditor->setPlainText(szText);
-	QTextCursor cur=m_pEditor->textCursor();
+	QTextCursor cur = m_pEditor->textCursor();
 	cur.movePosition(QTextCursor::End);
 	m_pEditor->setTextCursor(cur);
 	m_pEditor->document()->setModified(false);
@@ -1009,11 +1021,11 @@ void ScriptEditorImplementation::setFindText(const QString & szText)
 
 void ScriptEditorImplementation::updateRowColLabel()
 {
-	if(m_lastCursorPos==m_pEditor->textCursor().position())
+	if(m_lastCursorPos == m_pEditor->textCursor().position())
 		return;
 	int iRow = m_pEditor->textCursor().blockNumber();
 	int iCol = m_pEditor->textCursor().columnNumber();
-	QString szTmp = QString(__tr2qs_ctx("Row: %1 Col: %2","editor")).arg(iRow).arg(iCol);
+	QString szTmp = QString(__tr2qs_ctx("Row: %1 Col: %2", "editor")).arg(iRow).arg(iCol);
 	m_pRowColLabel->setText(szTmp);
 	m_lastCursorPos = m_pEditor->textCursor().position();
 }
@@ -1030,21 +1042,23 @@ void ScriptEditorImplementation::loadFromFile()
 {
 	QString szFileName;
 	if(KviFileDialog::askForOpenFileName(szFileName,
-		__tr2qs_ctx("Select a File - KVIrc","editor"),
-		QString::null,KVI_FILTER_SCRIPT,false,true,this))
+	       __tr2qs_ctx("Select a File - KVIrc", "editor"),
+	       QString::null, KVI_FILTER_SCRIPT, false, true, this))
 	{
 		QString szBuffer;
-		if(KviFileUtils::loadFile(szFileName,szBuffer))
+		if(KviFileUtils::loadFile(szFileName, szBuffer))
 		{
-                        m_pEditor->setPlainText(szBuffer);
+			m_pEditor->setPlainText(szBuffer);
 			setCursorPosition(0);
 			//m_pEditor->moveCursor(QTextEdit::MoveEnd,false);
 			//updateRowColLabel();
-		} else {
+		}
+		else
+		{
 			QString szTmp;
 			QMessageBox::warning(this,
-				__tr2qs_ctx("Opening File Failed - KVIrc","editor"),
-				szTmp = QString(__tr2qs_ctx("Can't open file %1 for reading.","editor")).arg(szFileName));
+			    __tr2qs_ctx("Opening File Failed - KVIrc", "editor"),
+			    szTmp = QString(__tr2qs_ctx("Can't open file %1 for reading.", "editor")).arg(szFileName));
 		}
 	}
 }
@@ -1054,7 +1068,7 @@ void ScriptEditorImplementation::configureColors()
 	if(!m_pOptionsDialog)
 	{
 		m_pOptionsDialog = new ScriptEditorWidgetColorOptions(this);
-		connect(m_pOptionsDialog,SIGNAL(finished(int)),this,SLOT(optionsDialogFinished(int)));
+		connect(m_pOptionsDialog, SIGNAL(finished(int)), this, SLOT(optionsDialogFinished(int)));
 	}
 	m_pOptionsDialog->show();
 }
@@ -1069,7 +1083,7 @@ void ScriptEditorImplementation::optionsDialogFinished(int iResult)
 }
 
 ScriptEditorReplaceDialog::ScriptEditorReplaceDialog(QWidget * pParent, const QString & szName)
-: QDialog(pParent)
+    : QDialog(pParent)
 {
 	setObjectName(szName);
 	setWindowTitle(__tr2qs("Find and Replace - KVIrc"));
@@ -1077,8 +1091,8 @@ ScriptEditorReplaceDialog::ScriptEditorReplaceDialog(QWidget * pParent, const QS
 	m_pParent = pParent;
 	emit initFind();
 	QPalette p = palette();
-	p.setColor(foregroundRole(),QColor( 0, 0, 0 ));
-	p.setColor(backgroundRole(),QColor( 236, 233, 216 ));
+	p.setColor(foregroundRole(), QColor(0, 0, 0));
+	p.setColor(backgroundRole(), QColor(236, 233, 216));
 	setPalette(p);
 
 	QGridLayout * pLayout = new QGridLayout(this);
@@ -1086,40 +1100,39 @@ ScriptEditorReplaceDialog::ScriptEditorReplaceDialog(QWidget * pParent, const QS
 
 	QLabel * m_pFindLabel = new QLabel(this);
 	m_pFindLabel->setObjectName("findlabel");
-	m_pFindLabel->setText(__tr2qs_ctx("Word to find:","editor"));
-	pLayout->addWidget(m_pFindLabel,0,0);
+	m_pFindLabel->setText(__tr2qs_ctx("Word to find:", "editor"));
+	pLayout->addWidget(m_pFindLabel, 0, 0);
 
 	m_pFindLineEdit = new QLineEdit(this);
 	m_pFindLineEdit->setObjectName("findlineedit");
-	pLayout->addWidget(m_pFindLineEdit,0,1);
+	pLayout->addWidget(m_pFindLineEdit, 0, 1);
 
 	QLabel * m_pReplaceLabel = new QLabel(this);
 	m_pReplaceLabel->setObjectName("replacelabel");
-	m_pReplaceLabel->setText(__tr2qs_ctx("Replace with:","editor"));
-	pLayout->addWidget(m_pReplaceLabel,1,0);
+	m_pReplaceLabel->setText(__tr2qs_ctx("Replace with:", "editor"));
+	pLayout->addWidget(m_pReplaceLabel, 1, 0);
 
 	m_pReplaceLineEdit = new QLineEdit(this);
 	m_pReplaceLineEdit->setObjectName("replacelineedit");
-	pLayout->addWidget(m_pReplaceLineEdit,1,1);
-
+	pLayout->addWidget(m_pReplaceLineEdit, 1, 1);
 
 	m_pFindLineEdit->setFocus();
 
 	m_pCheckReplaceAll = new QCheckBox(this);
 	m_pCheckReplaceAll->setObjectName("replaceAll");
-	m_pCheckReplaceAll->setText(__tr2qs_ctx("&Replace in all editor's items","editor"));
-	pLayout->addWidget(m_pCheckReplaceAll,2,0);
+	m_pCheckReplaceAll->setText(__tr2qs_ctx("&Replace in all editor's items", "editor"));
+	pLayout->addWidget(m_pCheckReplaceAll, 2, 0);
 
 	QPushButton * pCancelButton = new QPushButton(this);
 	pCancelButton->setObjectName("cancelButton");
-	pCancelButton->setText(__tr2qs_ctx("&Cancel","editor"));
-	pLayout->addWidget(pCancelButton,3,0);
+	pCancelButton->setText(__tr2qs_ctx("&Cancel", "editor"));
+	pLayout->addWidget(pCancelButton, 3, 0);
 
 	m_pReplaceButton = new QPushButton(this);
 	m_pReplaceButton->setObjectName("replacebutton");
-	m_pReplaceButton->setText(__tr2qs_ctx("&Replace","editor"));
+	m_pReplaceButton->setText(__tr2qs_ctx("&Replace", "editor"));
 	m_pReplaceButton->setEnabled(false);
-	pLayout->addWidget(m_pReplaceButton,3,1);
+	pLayout->addWidget(m_pReplaceButton, 3, 1);
 
 	setLayout(pLayout);
 
@@ -1145,14 +1158,14 @@ void ScriptEditorReplaceDialog::slotReplace()
 {
 	QString szText = ((ScriptEditorWidget *)m_pParent)->toPlainText();
 	if(m_pCheckReplaceAll->isChecked())
-		emit replaceAll(m_pFindLineEdit->text(),m_pReplaceLineEdit->text());
+		emit replaceAll(m_pFindLineEdit->text(), m_pReplaceLineEdit->text());
 
-	szText.replace(m_pFindLineEdit->text(),m_pReplaceLineEdit->text(),Qt::CaseInsensitive);
+	szText.replace(m_pFindLineEdit->text(), m_pReplaceLineEdit->text(), Qt::CaseInsensitive);
 	((ScriptEditorWidget *)m_pParent)->setText(szText);
 	((ScriptEditorWidget *)m_pParent)->document()->setModified(true);
 	m_pFindLineEdit->setText("");
 	m_pReplaceLineEdit->setText("");
-	setTabOrder(m_pFindLineEdit,m_pReplaceLineEdit);
+	setTabOrder(m_pFindLineEdit, m_pReplaceLineEdit);
 }
 
 void ScriptEditorReplaceDialog::slotNextFind()