Apply clang-format

4 files changed, 170 insertions, 148 deletions

diff --git a/src/modules/pythoncore/kvircmodule.cpp b/src/modules/pythoncore/kvircmodule.cpp
index ef291b16f..f35589143 100644
--- a/src/modules/pythoncore/kvircmodule.cpp
+++ b/src/modules/pythoncore/kvircmodule.cpp
@@ -43,15 +43,18 @@
 #if PY_MAJOR_VERSION >= 3
 #define KVI_PyMODINIT_RETVAL(module) module
 #else
-#define KVI_PyMODINIT_RETVAL(module) ; (void)(module)
-struct PyModuleDef {
+#define KVI_PyMODINIT_RETVAL(module) \
+	;                                \
+	(void)(module)
+struct PyModuleDef
+{
 	char m_base;
 	const char *m_name, *m_doc;
 	int m_size;
-	PyMethodDef *m_methods;
+	PyMethodDef * m_methods;
 };
 static const char PyModuleDef_HEAD_INIT = 0;
-static PyObject *PyModule_Create(const struct PyModuleDef *def)
+static PyObject * PyModule_Create(const struct PyModuleDef * def)
 {
 	return Py_InitModule3(def->m_name, def->m_methods, def->m_doc);
 }
@@ -66,7 +69,7 @@ extern QString g_lError;
 static PyObject * PyKVIrc_echo(PyObject * pSelf, PyObject * pArgs)
 {
 	Q_UNUSED(pSelf);
-	const char * pcText = nullptr, *pcWinId = nullptr;
+	const char *pcText = nullptr, *pcWinId = nullptr;
 	KviWindow * pWnd = nullptr;
 	int iColorSet = 0;
 
@@ -76,7 +79,7 @@ static PyObject * PyKVIrc_echo(PyObject * pSelf, PyObject * pArgs)
 		return 0; // Sorry, we're NOT thread safe
 	}
 
-	if(!PyArg_ParseTuple(pArgs,"s|is",&pcText,&iColorSet,&pcWinId))
+	if(!PyArg_ParseTuple(pArgs, "s|is", &pcText, &iColorSet, &pcWinId))
 		return 0;
 
 	if(pcText)
@@ -91,20 +94,20 @@ static PyObject * PyKVIrc_echo(PyObject * pSelf, PyObject * pArgs)
 			else if(g_pActiveWindow)
 				pWnd = g_pActiveWindow;
 			else
-				pWnd = (KviWindow *) g_pApp->activeConsole();
+				pWnd = (KviWindow *)g_pApp->activeConsole();
 		}
 
 		if(pWnd)
-			pWnd->outputNoFmt(iColorSet,QString::fromUtf8(pcText));
+			pWnd->outputNoFmt(iColorSet, QString::fromUtf8(pcText));
 	}
 
-	return Py_BuildValue("i",1);
+	return Py_BuildValue("i", 1);
 }
 
 static PyObject * PyKVIrc_say(PyObject * pSelf, PyObject * pArgs)
 {
 	Q_UNUSED(pSelf);
-	const char * pcText = nullptr, *pcWinId = nullptr;
+	const char *pcText = nullptr, *pcWinId = nullptr;
 	KviWindow * pWnd = nullptr;
 
 	if(QThread::currentThread() != g_pApp->thread())
@@ -113,7 +116,7 @@ static PyObject * PyKVIrc_say(PyObject * pSelf, PyObject * pArgs)
 		return 0; // Sorry, we're NOT thread safe
 	}
 
-	if(!PyArg_ParseTuple(pArgs,"s|s",&pcText,&pcWinId))
+	if(!PyArg_ParseTuple(pArgs, "s|s", &pcText, &pcWinId))
 		return 0;
 
 	if(pcText)
@@ -128,16 +131,16 @@ static PyObject * PyKVIrc_say(PyObject * pSelf, PyObject * pArgs)
 			else if(g_pActiveWindow)
 				pWnd = g_pActiveWindow;
 			else
-				pWnd = (KviWindow *) g_pApp->activeConsole();
+				pWnd = (KviWindow *)g_pApp->activeConsole();
 		}
 		if(pWnd)
 		{
 			QString szText = QString::fromUtf8(pcText);
-			KviUserInput::parse(szText,pWnd);
+			KviUserInput::parse(szText, pWnd);
 		}
 	}
 
-	return Py_BuildValue("i",1);
+	return Py_BuildValue("i", 1);
 }
 
 static PyObject * PyKVIrc_warning(PyObject * pSelf, PyObject * pArgs)
@@ -151,7 +154,7 @@ static PyObject * PyKVIrc_warning(PyObject * pSelf, PyObject * pArgs)
 		return 0; // Sorry, we're NOT thread safe
 	}
 
-	if(!PyArg_ParseTuple(pArgs,"s",&pcText))
+	if(!PyArg_ParseTuple(pArgs, "s", &pcText))
 		return 0;
 
 	if(pcText && !g_bExecuteQuiet)
@@ -160,7 +163,7 @@ static PyObject * PyKVIrc_warning(PyObject * pSelf, PyObject * pArgs)
 			g_pCurrentKvsContext->warning(pcText);
 	}
 
-	return Py_BuildValue("i",1);
+	return Py_BuildValue("i", 1);
 }
 
 static PyObject * PyKVIrc_getLocal(PyObject * pSelf, PyObject * pArgs)
@@ -175,7 +178,7 @@ static PyObject * PyKVIrc_getLocal(PyObject * pSelf, PyObject * pArgs)
 		return 0; // Sorry, we're NOT thread safe
 	}
 
-	if(!PyArg_ParseTuple(pArgs,"s",&szVarName))
+	if(!PyArg_ParseTuple(pArgs, "s", &szVarName))
 		return 0;
 
 	if(g_pCurrentKvsContext)
@@ -184,9 +187,11 @@ static PyObject * PyKVIrc_getLocal(PyObject * pSelf, PyObject * pArgs)
 		if(pVar)
 		{
 			pVar->asString(tmp);
-			return Py_BuildValue("s",tmp.toUtf8().data());
-		} else {
-			return Py_BuildValue("s","");
+			return Py_BuildValue("s", tmp.toUtf8().data());
+		}
+		else
+		{
+			return Py_BuildValue("s", "");
 		}
 	}
 	return 0;
@@ -195,7 +200,7 @@ static PyObject * PyKVIrc_getLocal(PyObject * pSelf, PyObject * pArgs)
 static PyObject * PyKVIrc_setLocal(PyObject * pSelf, PyObject * pArgs)
 {
 	Q_UNUSED(pSelf);
-	const char * szVarName = nullptr, *szVarValue = nullptr;
+	const char *szVarName = nullptr, *szVarValue = nullptr;
 	QString tmp;
 
 	if(QThread::currentThread() != g_pApp->thread())
@@ -204,7 +209,7 @@ static PyObject * PyKVIrc_setLocal(PyObject * pSelf, PyObject * pArgs)
 		return 0; // Sorry, we're NOT thread safe
 	}
 
-	if(!PyArg_ParseTuple(pArgs,"ss",&szVarName, &szVarValue))
+	if(!PyArg_ParseTuple(pArgs, "ss", &szVarName, &szVarValue))
 		return 0;
 
 	if(g_pCurrentKvsContext)
@@ -213,10 +218,12 @@ static PyObject * PyKVIrc_setLocal(PyObject * pSelf, PyObject * pArgs)
 		{
 			KviKvsVariant * pVar = g_pCurrentKvsContext->localVariables()->get(szVarName);
 			pVar->setString(szVarValue);
-		} else {
+		}
+		else
+		{
 			g_pCurrentKvsContext->localVariables()->unset(szVarName);
 		}
-		return Py_BuildValue("i",1);
+		return Py_BuildValue("i", 1);
 	}
 	return 0;
 }
@@ -233,7 +240,7 @@ static PyObject * PyKVIrc_getGlobal(PyObject * pSelf, PyObject * pArgs)
 		return 0; // Sorry, we're NOT thread safe
 	}
 
-	if(!PyArg_ParseTuple(pArgs,"s",&szVarName))
+	if(!PyArg_ParseTuple(pArgs, "s", &szVarName))
 		return 0;
 
 	if(g_pCurrentKvsContext)
@@ -242,9 +249,11 @@ static PyObject * PyKVIrc_getGlobal(PyObject * pSelf, PyObject * pArgs)
 		if(pVar)
 		{
 			pVar->asString(tmp);
-			return Py_BuildValue("s",tmp.toUtf8().data());
-		} else {
-			return Py_BuildValue("s","");
+			return Py_BuildValue("s", tmp.toUtf8().data());
+		}
+		else
+		{
+			return Py_BuildValue("s", "");
 		}
 	}
 	return 0;
@@ -253,7 +262,7 @@ static PyObject * PyKVIrc_getGlobal(PyObject * pSelf, PyObject * pArgs)
 static PyObject * PyKVIrc_setGlobal(PyObject * pSelf, PyObject * pArgs)
 {
 	Q_UNUSED(pSelf);
-	const char * szVarName = nullptr, *szVarValue = nullptr;
+	const char *szVarName = nullptr, *szVarValue = nullptr;
 	QString tmp;
 
 	if(QThread::currentThread() != g_pApp->thread())
@@ -262,7 +271,7 @@ static PyObject * PyKVIrc_setGlobal(PyObject * pSelf, PyObject * pArgs)
 		return 0; // Sorry, we're NOT thread safe
 	}
 
-	if(!PyArg_ParseTuple(pArgs,"ss",&szVarName, &szVarValue))
+	if(!PyArg_ParseTuple(pArgs, "ss", &szVarName, &szVarValue))
 		return 0;
 
 	if(g_pCurrentKvsContext)
@@ -271,10 +280,12 @@ static PyObject * PyKVIrc_setGlobal(PyObject * pSelf, PyObject * pArgs)
 		{
 			KviKvsVariant * pVar = g_pCurrentKvsContext->globalVariables()->get(szVarName);
 			pVar->setString(szVarValue);
-		} else {
+		}
+		else
+		{
 			g_pCurrentKvsContext->globalVariables()->unset(szVarName);
 		}
-		return Py_BuildValue("i",1);
+		return Py_BuildValue("i", 1);
 	}
 	return 0;
 }
@@ -292,7 +303,7 @@ static PyObject * PyKVIrc_eval(PyObject * pSelf, PyObject * pArgs)
 		return 0; // Sorry, we're NOT thread safe
 	}
 
-	if(!PyArg_ParseTuple(pArgs,"s",&pcCode))
+	if(!PyArg_ParseTuple(pArgs, "s", &pcCode))
 		return 0;
 
 	if(pcCode)
@@ -302,13 +313,13 @@ static PyObject * PyKVIrc_eval(PyObject * pSelf, PyObject * pArgs)
 		else if(g_pActiveWindow)
 			pWnd = g_pActiveWindow;
 		else
-			pWnd = (KviWindow *) g_pApp->activeConsole();
+			pWnd = (KviWindow *)g_pApp->activeConsole();
 
 		if(pWnd)
 		{
 			KviKvsVariant ret;
 			QString szRet;
-			if(KviKvsScript::run(QString::fromUtf8(pcCode),pWnd,0,&ret))
+			if(KviKvsScript::run(QString::fromUtf8(pcCode), pWnd, 0, &ret))
 			{
 				ret.asString(szRet);
 				pcRetVal = szRet.toUtf8().data();
@@ -316,7 +327,7 @@ static PyObject * PyKVIrc_eval(PyObject * pSelf, PyObject * pArgs)
 		}
 	}
 
-	return Py_BuildValue("s",pcRetVal);
+	return Py_BuildValue("s", pcRetVal);
 }
 
 static PyObject * PyKVIrc_internalWarning(PyObject * pSelf, PyObject * pArgs)
@@ -330,13 +341,13 @@ static PyObject * PyKVIrc_internalWarning(PyObject * pSelf, PyObject * pArgs)
 		return 0; // Sorry, we're NOT thread safe
 	}
 
-	if(!PyArg_ParseTuple(pArgs,"s",&pcText))
+	if(!PyArg_ParseTuple(pArgs, "s", &pcText))
 		return 0;
 
 	if(pcText && !g_bExecuteQuiet)
 		g_lWarningList.append(QString(pcText));
 
-	return Py_BuildValue("i",1);
+	return Py_BuildValue("i", 1);
 }
 
 static PyObject * PyKVIrc_error(PyObject * pSelf, PyObject * pArgs)
@@ -350,36 +361,36 @@ static PyObject * PyKVIrc_error(PyObject * pSelf, PyObject * pArgs)
 		return 0; // Sorry, we're NOT thread safe
 	}
 
-	if(!PyArg_ParseTuple(pArgs,"s",&pcText))
+	if(!PyArg_ParseTuple(pArgs, "s", &pcText))
 		return 0;
 
 	if(pcText)
 		g_lError.append(pcText);
 
-	return Py_BuildValue("i",1);
+	return Py_BuildValue("i", 1);
 }
 
 static PyMethodDef KVIrcMethods[] = {
 	{ "echo", PyKVIrc_echo, METH_VARARGS,
-		"Outputs text to a KVIrc window" },
+	    "Outputs text to a KVIrc window" },
 	{ "say", PyKVIrc_say, METH_VARARGS,
-		"Types text in a window" },
+	    "Types text in a window" },
 	{ "warning", PyKVIrc_warning, METH_VARARGS,
-		"Prints a warning message" },
+	    "Prints a warning message" },
 	{ "getLocal", PyKVIrc_getLocal, METH_VARARGS,
-		"Gets a local variable" },
+	    "Gets a local variable" },
 	{ "setLocal", PyKVIrc_setLocal, METH_VARARGS,
-		"Sets a local variable" },
+	    "Sets a local variable" },
 	{ "getGlobal", PyKVIrc_getGlobal, METH_VARARGS,
-		"Gets a global variable" },
+	    "Gets a global variable" },
 	{ "setGlobal", PyKVIrc_setGlobal, METH_VARARGS,
-		"Sets a global variable" },
+	    "Sets a global variable" },
 	{ "eval", PyKVIrc_eval, METH_VARARGS,
-		"Change the behaviour of a set of commands" },
+	    "Change the behaviour of a set of commands" },
 	{ "internalWarning", PyKVIrc_internalWarning, METH_VARARGS,
-		"" },
+	    "" },
 	{ "error", PyKVIrc_error, METH_VARARGS,
-		"" },
+	    "" },
 	{ nullptr, nullptr, 0, nullptr }
 };
 
@@ -405,18 +416,22 @@ PyMODINIT_FUNC python_init()
 		KVIrcMethods
 	};
 	PyObject * pModule = PyModule_Create(&def);
-	if(!pModule) {
+	if(!pModule)
+	{
 		KVI_ASSERT("Python: Unable to initialize KVIrc import module");
-	} else {
+	}
+	else
+	{
 		// Create a CObject containing the API pointer array's address
 		PyObject * pC_API_Object = PyCObject_FromVoidPtr(PyKVIrc_API, nullptr);
 		if(pC_API_Object)
-			PyModule_AddObject(pModule,"_C_API",pC_API_Object);
+			PyModule_AddObject(pModule, "_C_API", pC_API_Object);
 	}
 	return KVI_PyMODINIT_RETVAL(pModule);
 }
 
-static struct KviPythonModuleInitializer {
+static struct KviPythonModuleInitializer
+{
 	KviPythonModuleInitializer()
 	{
 		PyImport_AppendInittab("kvirc", python_init);
diff --git a/src/modules/pythoncore/kvircmodule.h b/src/modules/pythoncore/kvircmodule.h
index 4fffacee4..53376d577 100644
--- a/src/modules/pythoncore/kvircmodule.h
+++ b/src/modules/pythoncore/kvircmodule.h
@@ -54,53 +54,54 @@ PyMODINIT_FUNC python_init();
 #ifdef __cplusplus
 extern "C" {
 #endif
-	#ifndef KVIRC_MODULE
-		// This section is used in modules that use kvircmodule's API
-		static void ** PyKVIrc_API;
+#ifndef KVIRC_MODULE
+// This section is used in modules that use kvircmodule's API
+static void ** PyKVIrc_API;
 
-		#define PyKVIrc_echo \
-			(*(int (*)(const char * pcCmd)) PyKVIrc_API[0])
-		#define PyKVIrc_say \
-			(*(int (*)(const char * pcCmd)) PyKVIrc_API[1])
-		#define PyKVIrc_warning \
-			(*(int (*)(const char * pcCmd)) PyKVIrc_API[2])
-		#define PyKVIrc_getLocal \
-			(*(int (*)(const char * pcCmd)) PyKVIrc_API[3])
-		#define PyKVIrc_setLocal \
-			(*(int (*)(const char * pcCmd)) PyKVIrc_API[4])
-		#define PyKVIrc_getGlobal \
-			(*(int (*)(const char * pcCmd)) PyKVIrc_API[5])
-		#define PyKVIrc_setGlobal \
-			(*(int (*)(const char * pcCmd)) PyKVIrc_API[6])
-		#define PyKVIrc_eval \
-			(*(int (*)(const char * pcCmd)) PyKVIrc_API[7])
-		#define PyKVIrc_internalWarning \
-			(*(int (*)(const char * pcCmd)) PyKVIrc_API[8])
-		#define PyKVIrc_error \
-			(*(int (*)(const char * pcCmd)) PyKVIrc_API[9])
-		/**
+#define PyKVIrc_echo \
+	(*(int (*)(const char * pcCmd))PyKVIrc_API[0])
+#define PyKVIrc_say \
+	(*(int (*)(const char * pcCmd))PyKVIrc_API[1])
+#define PyKVIrc_warning \
+	(*(int (*)(const char * pcCmd))PyKVIrc_API[2])
+#define PyKVIrc_getLocal \
+	(*(int (*)(const char * pcCmd))PyKVIrc_API[3])
+#define PyKVIrc_setLocal \
+	(*(int (*)(const char * pcCmd))PyKVIrc_API[4])
+#define PyKVIrc_getGlobal \
+	(*(int (*)(const char * pcCmd))PyKVIrc_API[5])
+#define PyKVIrc_setGlobal \
+	(*(int (*)(const char * pcCmd))PyKVIrc_API[6])
+#define PyKVIrc_eval \
+	(*(int (*)(const char * pcCmd))PyKVIrc_API[7])
+#define PyKVIrc_internalWarning \
+	(*(int (*)(const char * pcCmd))PyKVIrc_API[8])
+#define PyKVIrc_error \
+	(*(int (*)(const char * pcCmd))PyKVIrc_API[9])
+/**
 		* \brief Returns 0 on success, -1 otherwise
 		*
 		* In case on unsuccess, it sets the exception
 		* \return int
 		*/
-		inline static int import_kvirc()
-		{
-			PyObject * pModule = PyImport_ImportModule("kvirc");
-			if(pModule)
-			{
-				PyObject * pC_API_Object = PyObject_GetAttrString(pModule,"_C_API");
+inline static int import_kvirc()
+{
+	PyObject * pModule = PyImport_ImportModule("kvirc");
+	if(pModule)
+	{
+		PyObject * pC_API_Object = PyObject_GetAttrString(pModule, "_C_API");
 
-				if(!pC_API_Object) return -1;
+		if(!pC_API_Object)
+			return -1;
 
-				if(PyCObject_Check(pC_API_Object))
-					PyKVIrc_API = (void **)PyCObject_AsVoidPtr(pC_API_Object);
+		if(PyCObject_Check(pC_API_Object))
+			PyKVIrc_API = (void **)PyCObject_AsVoidPtr(pC_API_Object);
 
-				Py_DECREF(pC_API_Object);
-			}
-			return 0;
-		}
-	#endif // KVIRC_MODULE
+		Py_DECREF(pC_API_Object);
+	}
+	return 0;
+}
+#endif // KVIRC_MODULE
 
 #ifdef __cplusplus
 }
diff --git a/src/modules/pythoncore/libkvipythoncore.cpp b/src/modules/pythoncore/libkvipythoncore.cpp
index 80c10325c..812e414b6 100644
--- a/src/modules/pythoncore/libkvipythoncore.cpp
+++ b/src/modules/pythoncore/libkvipythoncore.cpp
@@ -43,79 +43,85 @@ QString g_lError;
 
 static PyThreadState * mainThreadState = nullptr;
 
-struct KviPythonLock {
-	KviPythonLock(PyThreadState * ts) {
+struct KviPythonLock
+{
+	KviPythonLock(PyThreadState * ts)
+	{
 		PyEval_RestoreThread(ts);
 	}
-	~KviPythonLock() {
+	~KviPythonLock()
+	{
 		PyEval_SaveThread();
 	}
 };
 
-struct KviPythonInterpreterDeleter {
+struct KviPythonInterpreterDeleter
+{
 	void operator()(PyThreadState * ts) const
 	{
-		KviPythonLock lock{ts};
+		KviPythonLock lock{ ts };
 		Py_EndInterpreter(ts);
 		PyThreadState_Swap(mainThreadState);
 	}
 };
 
-struct KviPythonInterpreter {
+struct KviPythonInterpreter
+{
 	KviPythonInterpreter();
-	bool execute(QString, QStringList&, QString&, QString&, QStringList&);
+	bool execute(QString, QStringList &, QString &, QString &, QStringList &);
 	std::unique_ptr<PyThreadState, KviPythonInterpreterDeleter> m_uptrThreadState;
 };
 
-struct KviCaseInsensitiveQStringHash {
-	std::size_t operator()(const QString& s) const
+struct KviCaseInsensitiveQStringHash
+{
+	std::size_t operator()(const QString & s) const
 	{
 		return static_cast<std::size_t>(qHash(s.toLower()));
 	}
 };
 
-struct KviCaseInsensitiveQStringEqual {
-	bool operator()(const QString& s, const QString& t) const
+struct KviCaseInsensitiveQStringEqual
+{
+	bool operator()(const QString & s, const QString & t) const
 	{
 		return (s.toLower() == t.toLower());
 	}
 };
 
-static std::unordered_map<QString,KviPythonInterpreter,KviCaseInsensitiveQStringHash,KviCaseInsensitiveQStringEqual> g_Interpreters;
+static std::unordered_map<QString, KviPythonInterpreter, KviCaseInsensitiveQStringHash, KviCaseInsensitiveQStringEqual> g_Interpreters;
 
 KviPythonInterpreter::KviPythonInterpreter()
 {
-	KviPythonLock lock{mainThreadState};
+	KviPythonLock lock{ mainThreadState };
 	m_uptrThreadState.reset(Py_NewInterpreter());
 
 	// hook in the kvirc error handling routines
 	QString szPreCode = QString(
-		"import kvirc\n"
-		"import sys\n"
-		"class kvirc_stderr_grabber:\n\tdef write(self,s):\n\t\tkvirc.error(s)\n"
-		"sys.stderr=kvirc_stderr_grabber()\n"
-	);
+	    "import kvirc\n"
+	    "import sys\n"
+	    "class kvirc_stderr_grabber:\n\tdef write(self,s):\n\t\tkvirc.error(s)\n"
+	    "sys.stderr=kvirc_stderr_grabber()\n");
 
 	PyRun_SimpleString(szPreCode.toUtf8().data());
 }
 
-bool KviPythonInterpreter::execute(QString szCode, QStringList& lArgs,
-	QString& szRetVal, QString& szError, QStringList&)
+bool KviPythonInterpreter::execute(QString szCode, QStringList & lArgs,
+    QString & szRetVal, QString & szError, QStringList &)
 {
 	if(!m_uptrThreadState)
 	{
-		szError = __tr2qs_ctx("Internal error: Python interpreter not initialized","python");
+		szError = __tr2qs_ctx("Internal error: Python interpreter not initialized", "python");
 		return false;
 	}
 
 	g_lError.clear();
 
-	KviPythonLock lock{m_uptrThreadState.get()};
+	KviPythonLock lock{ m_uptrThreadState.get() };
 
 	QString szVarCode = "aArgs = [";
 
 	bool bFirst = true;
-	foreach(QString szArg,lArgs)
+	foreach(QString szArg, lArgs)
 	{
 		if(!bFirst)
 			szVarCode += ",";
@@ -142,7 +148,7 @@ bool KviPythonInterpreter::execute(QString szCode, QStringList& lArgs,
 	return !retVal;
 }
 
-static void pythoncore_destroy_interpreter(const QString& szContextName)
+static void pythoncore_destroy_interpreter(const QString & szContextName)
 {
 	const auto i = g_Interpreters.find(szContextName);
 
@@ -152,7 +158,7 @@ static void pythoncore_destroy_interpreter(const QString& szContextName)
 
 #endif // COMPILE_PYTHON_SUPPORT
 
-template<typename T>
+template <typename T>
 T * castFromModParam(void * p)
 {
 	T * ex = static_cast<T *>(p);
@@ -163,31 +169,33 @@ T * castFromModParam(void * p)
 	return ex;
 }
 
-static bool pythoncore_module_ctrl(KviModule *,const char * cmd,void * param)
+static bool pythoncore_module_ctrl(KviModule *, const char * cmd, void * param)
 {
 #ifdef COMPILE_PYTHON_SUPPORT
-	if(!strcmp(cmd,KVI_PYTHONCORECTRLCOMMAND_EXECUTE))
+	if(!strcmp(cmd, KVI_PYTHONCORECTRLCOMMAND_EXECUTE))
 	{
 		auto * pex = castFromModParam<KviPythonCoreCtrlCommand_execute>(param);
 
 		if(!pex)
 			return false;
 
-		auto& ex = *pex;
+		auto & ex = *pex;
 
 		g_pCurrentKvsContext = ex.pKvsContext;
 		g_bExecuteQuiet = ex.bQuiet;
 		if(ex.szContext.isEmpty())
 		{
 			KviPythonInterpreter m;
-			ex.bExitOk = m.execute(ex.szCode,ex.lArgs,ex.szRetVal,ex.szError,ex.lWarnings);
-		} else {
-			KviPythonInterpreter& m = g_Interpreters[ex.szContext];
-			ex.bExitOk = m.execute(ex.szCode,ex.lArgs,ex.szRetVal,ex.szError,ex.lWarnings);
+			ex.bExitOk = m.execute(ex.szCode, ex.lArgs, ex.szRetVal, ex.szError, ex.lWarnings);
+		}
+		else
+		{
+			KviPythonInterpreter & m = g_Interpreters[ex.szContext];
+			ex.bExitOk = m.execute(ex.szCode, ex.lArgs, ex.szRetVal, ex.szError, ex.lWarnings);
 		}
 		return true;
 	}
-	if(!strcmp(cmd,KVI_PYTHONCORECTRLCOMMAND_DESTROY))
+	if(!strcmp(cmd, KVI_PYTHONCORECTRLCOMMAND_DESTROY))
 	{
 		auto * pde = castFromModParam<KviPythonCoreCtrlCommand_destroy>(param);
 
@@ -236,15 +244,14 @@ static bool pythoncore_module_can_unload(KviModule *)
 }
 
 KVIRC_MODULE(
-	"PythonCore",                                           // module name
-	"4.0.0",                                                // module version
-	"Copyright (C) 2008 Elvio Basello (hellvis69 at netsons dot org)\n"
-	"Copyright (C) 2009 Fabio Bas (ctrlaltca at libero dot it)\n"
-	"Copyright (C) 2016 Matt Ullman (staticfox at staticfox dot net)",
-	"Python Scripting Engine Core",
-	pythoncore_module_init,
-	pythoncore_module_can_unload,
-	pythoncore_module_ctrl,
-	pythoncore_module_cleanup,
-	"python"
-)
+    "PythonCore", // module name
+    "4.0.0",      // module version
+    "Copyright (C) 2008 Elvio Basello (hellvis69 at netsons dot org)\n"
+    "Copyright (C) 2009 Fabio Bas (ctrlaltca at libero dot it)\n"
+    "Copyright (C) 2016 Matt Ullman (staticfox at staticfox dot net)",
+    "Python Scripting Engine Core",
+    pythoncore_module_init,
+    pythoncore_module_can_unload,
+    pythoncore_module_ctrl,
+    pythoncore_module_cleanup,
+    "python")
diff --git a/src/modules/pythoncore/pythoncoreinterface.h b/src/modules/pythoncore/pythoncoreinterface.h
index f3aa03a18..bd594c0c8 100644
--- a/src/modules/pythoncore/pythoncoreinterface.h
+++ b/src/modules/pythoncore/pythoncoreinterface.h
@@ -31,21 +31,20 @@
 
 #include <QStringList>
 
-
 #define KVI_PYTHONCORECTRLCOMMAND_EXECUTE "execute"
 
 typedef struct _KviPythonCoreCtrlCommand_execute
 {
-	unsigned int           uSize;
+	unsigned int uSize;
 	KviKvsRunTimeContext * pKvsContext;
-	QString                szContext;
-	QString                szCode;
-	bool                   bExitOk;
-	QString                szRetVal;
-	QString                szError;
-	QStringList            lWarnings;
-	QStringList            lArgs;
-	bool                   bQuiet;
+	QString szContext;
+	QString szCode;
+	bool bExitOk;
+	QString szRetVal;
+	QString szError;
+	QStringList lWarnings;
+	QStringList lArgs;
+	bool bQuiet;
 } KviPythonCoreCtrlCommand_execute;
 
 #define KVI_PYTHONCORECTRLCOMMAND_DESTROY "destroy"
@@ -53,7 +52,7 @@ typedef struct _KviPythonCoreCtrlCommand_execute
 typedef struct _KviPythonCoreCtrlCommand_destroy
 {
 	unsigned int uSize;
-	QString      szContext;
+	QString szContext;
 } KviPythonCoreCtrlCommand_destroy;
 
 #endif // !_PYTHONCOREINTERFACE_H_