3 files changed, 17 insertions, 17 deletions
diff --git a/src/modules/editor/libkvieditor.cpp b/src/modules/editor/libkvieditor.cpp
index 35b1459fb..099600c66 100644
--- a/src/modules/editor/libkvieditor.cpp
+++ b/src/modules/editor/libkvieditor.cpp
@@ -24,8 +24,8 @@
 
 #include "scripteditor.h"
 
-#include "kvi_module.h"
-#include "kvi_window.h"
+#include "KviModule.h"
+#include "KviWindow.h"
 
 
 KviModule * g_pEditorModulePointer = 0;
@@ -45,7 +45,7 @@ static bool editor_module_init(KviModule * m)
 static bool editor_module_cleanup(KviModule *)
 {
 	/*
-	 * This causes 2 crashes: one in KviApp destructor (closing windows needs
+	 * This causes 2 crashes: one in KviApplication destructor (closing windows needs
 	 * g_pFrame, that is deleted before this unloading routine) and the second in
 	 * the codetester window (it deletes us in its denstructor, and we tries to back-delete it)
 	 * So it's commented out by now..
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index 6a81bbda2..f38f9d33c 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -29,17 +29,17 @@
 #include "KviFileUtils.h"
 #include "kvi_fileextensions.h"
 #include "KviLocale.h"
-#include "kvi_filedialog.h"
+#include "KviFileDialog.h"
 #include "KviQString.h"
 #include "KviConfigurationFile.h"
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviPointerList.h"
-#include "kvi_app.h"
-#include "kvi_console.h"
-#include "kvi_window.h"
-#include "kvi_iconmanager.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_modulemanager.h"
+#include "KviApplication.h"
+#include "KviConsoleWindow.h"
+#include "KviWindow.h"
+#include "KviIconManager.h"
+#include "KviKvsKernel.h"
+#include "KviModuleManager.h"
 #include "KviConfigurationFile.h"
 #include "KviTalVBox.h"
 #include "KviTalHBox.h"
@@ -100,7 +100,7 @@ KviScriptEditorWidget::KviScriptEditorWidget(QWidget * pParent)
 	iModulesCount=0;
 	iIndex=0;
 	QString szPath;
-	g_pApp->getLocalKvircDirectory(szPath,KviApp::ConfigPlugins,tmp);
+	g_pApp->getLocalKvircDirectory(szPath,KviApplication::ConfigPlugins,tmp);
 
 	if(!KviFileUtils::fileExists(szPath))
 	{
@@ -147,7 +147,7 @@ void KviScriptEditorWidget::asyncCompleterCreation()
 		m_pListCompletition = new QStringList();
 		QString szPath;
 
-		g_pApp->getGlobalKvircDirectory(szPath,KviApp::Modules);
+		g_pApp->getGlobalKvircDirectory(szPath,KviApplication::Modules);
 
 		QDir d(szPath);
 
@@ -188,7 +188,7 @@ void KviScriptEditorWidget::asyncCompleterCreation()
 		m_pStartTimer = 0;
 		QString szTmp("kvscompleter.idx");
 		QString szPath;
-		g_pApp->getLocalKvircDirectory(szPath,KviApp::ConfigPlugins,szTmp);
+		g_pApp->getLocalKvircDirectory(szPath,KviApplication::ConfigPlugins,szTmp);
 		KviKvsKernel::instance()->getAllFunctionsCommandsCore(m_pListCompletition);
 		QString szBuffer = m_pListCompletition->join(",");
 		QFile f(szPath);
@@ -209,7 +209,7 @@ void KviScriptEditorWidget::loadCompleterFromFile()
 	QStringList szListFunctionsCommand;
 	QString szTmp("kvscompleter.idx");
 	QString szPath;
-	g_pApp->getLocalKvircDirectory(szPath,KviApp::ConfigPlugins,szTmp);
+	g_pApp->getLocalKvircDirectory(szPath,KviApplication::ConfigPlugins,szTmp);
 	QString szBuffer;
 	QFile f(szPath);
 	f.open(QIODevice::ReadOnly);
diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h
index 1398b6469..b8611c944 100644
--- a/src/modules/editor/scripteditor.h
+++ b/src/modules/editor/scripteditor.h
@@ -25,9 +25,9 @@
 //
 //=============================================================================
 
-#include "kvi_scripteditor.h"
+#include "KviScriptEditor.h"
 #include "KviPointerList.h"
-#include "kvi_selectors.h"
+#include "KviSelectors.h"
 #include "KviTalPopupMenu.h"
 
 #include <QCompleter>