5 files changed, 24 insertions, 24 deletions
diff --git a/src/modules/addon/addonfunctions.cpp b/src/modules/addon/addonfunctions.cpp
index d8406fa24..e1d10d40e 100644
--- a/src/modules/addon/addonfunctions.cpp
+++ b/src/modules/addon/addonfunctions.cpp
@@ -26,15 +26,15 @@
 
 #include "KviPackageFile.h"
 #include "KviLocale.h"
-#include "kvi_msgbox.h"
-#include "kvi_app.h"
-#include "kvi_htmldialog.h"
-#include "kvi_iconmanager.h"
+#include "KviMessageBox.h"
+#include "KviApplication.h"
+#include "KviHtmlDialog.h"
+#include "KviIconManager.h"
 #include "KviFileUtils.h"
 #include "KviMiscUtils.h"
 #include "kvi_sourcesdate.h"
-#include "kvi_frame.h"
-#include "kvi_kvs_script.h"
+#include "KviMainWindow.h"
+#include "KviKvsScript.h"
 
 #include <QDir>
 
@@ -207,7 +207,7 @@ namespace KviAddonFunctions
 		QString szTmpPath, szUnpackPath;
 		QString szRandomDir = createRandomDir();
 
-		g_pApp->getLocalKvircDirectory(szTmpPath,KviApp::Tmp);
+		g_pApp->getLocalKvircDirectory(szTmpPath,KviApplication::Tmp);
 		KviQString::ensureLastCharIs(szTmpPath,QChar(KVI_PATH_SEPARATOR_CHAR));
 		szUnpackPath = szTmpPath + szRandomDir;
 		QDir szTmpDir(szUnpackPath);
diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp
index c9edaa3a1..31e2d5599 100644
--- a/src/modules/addon/libkviaddon.cpp
+++ b/src/modules/addon/libkviaddon.cpp
@@ -25,21 +25,21 @@
 #include "managementdialog.h"
 #include "addonfunctions.h"
 
-#include "kvi_module.h"
-#include "kvi_kvs_scriptaddonmanager.h"
+#include "KviModule.h"
+#include "KviKvsScriptAddonManager.h"
 #include "KviLocale.h"
 #include "KviQString.h"
 #include "KviParameterList.h"
 #include "KviCommandFormatter.h"
 #include "KviError.h"
 #include "kvi_out.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviMircCntrl.h"
 #include "KviConfigurationFile.h"
 #include "kvi_sourcesdate.h"
 #include "KviMiscUtils.h"
 #include "KviFileUtils.h"
-#include "kvi_filedialog.h"
+#include "KviFileDialog.h"
 
 #include <QFileInfo>
 
@@ -730,7 +730,7 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c)
 
 	// create target path
 	QString szTargetPath;
-	g_pApp->getLocalKvircDirectory(szTargetPath,KviApp::None,szTarget);
+	g_pApp->getLocalKvircDirectory(szTargetPath,KviApplication::None,szTarget);
 
 	KviFileUtils::makeDir(szTargetPath);
 
@@ -744,7 +744,7 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c)
 		}
 
 		QString szEntry = QString("%1%2%3").arg(szTarget).arg(QString(KVI_PATH_SEPARATOR_CHAR)).arg(inf.fileName());
-		g_pApp->getLocalKvircDirectory(szTargetPath,KviApp::None,szEntry);
+		g_pApp->getLocalKvircDirectory(szTargetPath,KviApplication::None,szEntry);
 
 		if(!bQuiet)
 			c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Installing file '%1' into '%2'","addon").arg(*it).arg(szTargetPath));
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index 107d115c3..846c5e112 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -26,16 +26,16 @@
 #include "packaddondialog.h"
 #include "addonfunctions.h"
 
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
-#include "kvi_frame.h"
-#include "kvi_iconmanager.h"
-#include "kvi_kvs_scriptaddonmanager.h"
-#include "kvi_window.h"
-#include "kvi_filedialog.h"
+#include "KviMainWindow.h"
+#include "KviIconManager.h"
+#include "KviKvsScriptAddonManager.h"
+#include "KviWindow.h"
+#include "KviFileDialog.h"
 #include "KviFileUtils.h"
 #include "kvi_fileextensions.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsScript.h"
 #include "kvi_sourcesdate.h"
 #include "KviTalListWidget.h"
 #include "KviTalToolTip.h"
diff --git a/src/modules/addon/packaddondialog.cpp b/src/modules/addon/packaddondialog.cpp
index bb86c9029..45dabc6cb 100644
--- a/src/modules/addon/packaddondialog.cpp
+++ b/src/modules/addon/packaddondialog.cpp
@@ -27,12 +27,12 @@
 
 #include "KviLocale.h"
 #include "KviFileUtils.h"
-#include "kvi_app.h"
-#include "kvi_iconmanager.h"
+#include "KviApplication.h"
+#include "KviIconManager.h"
 #include "KviPackageFile.h"
 #include "kvi_fileextensions.h"
 #include "kvi_sourcesdate.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 
 #include <QTextEdit>
 #include <QLineEdit>
diff --git a/src/modules/addon/packaddondialog.h b/src/modules/addon/packaddondialog.h
index da2ebef3b..bf5dbf1ba 100644
--- a/src/modules/addon/packaddondialog.h
+++ b/src/modules/addon/packaddondialog.h
@@ -35,7 +35,7 @@
 
 #include "kvi_settings.h"
 #include "KviPointerList.h"
-#include "kvi_selectors.h"
+#include "KviSelectors.h"
 
 #include <QWizard>
 #include <QWizardPage>