More renaming and cleanup

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

9 files changed, 46 insertions, 46 deletions

diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp
index 200338068..dafae2115 100644
--- a/src/modules/theme/libkvitheme.cpp
+++ b/src/modules/theme/libkvitheme.cpp
@@ -25,21 +25,21 @@
 #include "managementdialog.h"
 #include "themefunctions.h"
 
-#include "kvi_msgbox.h"
-#include "kvi_module.h"
+#include "KviMessageBox.h"
+#include "KviModule.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 "KviFileUtils.h"
-#include "kvi_filedialog.h"
-#include "kvi_theme.h"
+#include "KviFileDialog.h"
+#include "KviTheme.h"
 
 #include <QFileInfo>
 #include <QMessageBox>
@@ -99,7 +99,7 @@ static bool theme_kvs_cmd_apply(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("package_name",KVS_PT_STRING,0,szThemePackFile)
 	KVSM_PARAMETERS_END(c)
 	QString szDir;
-	g_pApp->getLocalKvircDirectory(szDir,KviApp::Themes);
+	g_pApp->getLocalKvircDirectory(szDir,KviApplication::Themes);
 	szDir += KVI_PATH_SEPARATOR_CHAR;
 	szDir += szThemePackFile;
 	KviThemeInfo * themeInfo = new KviThemeInfo();
@@ -150,7 +150,7 @@ static bool theme_kvs_fnc_info(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("package_name",KVS_PT_STRING,0,szThemePackFile)
 	KVSM_PARAMETERS_END(c)
 	QString szDir;
-	g_pApp->getLocalKvircDirectory(szDir,KviApp::Themes);
+	g_pApp->getLocalKvircDirectory(szDir,KviApplication::Themes);
 	szDir += KVI_PATH_SEPARATOR_CHAR;
 	szDir += szThemePackFile;
 	KviThemeInfo * themeInfo = new KviThemeInfo();
@@ -188,7 +188,7 @@ static bool theme_kvs_fnc_info(KviKvsModuleFunctionCall * c)
 static bool theme_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 {
 	QString szDir;
-	g_pApp->getLocalKvircDirectory(szDir,KviApp::Themes);
+	g_pApp->getLocalKvircDirectory(szDir,KviApplication::Themes);
 	QDir d(szDir);
 	QStringList sl = d.entryList(QDir::Dirs);
 	QStringList szThemes;
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index 4d92276d6..3a76d82f4 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -27,20 +27,20 @@
 #include "savethemedialog.h"
 #include "themefunctions.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviConfigurationFile.h"
 #include "KviFileUtils.h"
-#include "kvi_app.h"
-#include "kvi_frame.h"
-#include "kvi_iconmanager.h"
-#include "kvi_internalcmd.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
+#include "KviIconManager.h"
+#include "KviInternalCommand.h"
 #include "KviPackageFile.h"
 #include "kvi_fileextensions.h"
-#include "kvi_filedialog.h"
-#include "kvi_dynamictooltip.h"
-#include "kvi_iconmanager.h"
-#include "kvi_msgbox.h"
+#include "KviFileDialog.h"
+#include "KviDynamicToolTip.h"
+#include "KviIconManager.h"
+#include "KviMessageBox.h"
 #include "KviTalPopupMenu.h"
 #include "KviTalListWidget.h"
 
@@ -392,9 +392,9 @@ void KviThemeManagementDialog::fillThemeBox()
 	m_pListWidget->clear();
 
 	QString szDir;
-	g_pApp->getGlobalKvircDirectory(szDir,KviApp::Themes);
+	g_pApp->getGlobalKvircDirectory(szDir,KviApplication::Themes);
 	fillThemeBox(szDir);
-	g_pApp->getLocalKvircDirectory(szDir,KviApp::Themes);
+	g_pApp->getLocalKvircDirectory(szDir,KviApplication::Themes);
 	fillThemeBox(szDir);
 
 	enableDisableButtons();
diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h
index 0b69960c0..be5995c3c 100644
--- a/src/modules/theme/managementdialog.h
+++ b/src/modules/theme/managementdialog.h
@@ -24,9 +24,9 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 #include "KviPointerList.h"
-#include "kvi_theme.h"
+#include "KviTheme.h"
 #include "KviTalPopupMenu.h"
 #include "KviTalWizard.h"
 #include "KviTalListWidget.h"
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
index 4a4c83440..bfaec19ca 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/packthemedialog.cpp
@@ -26,18 +26,18 @@
 #include "packthemedialog.h"
 #include "themefunctions.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviConfigurationFile.h"
 #include "KviFileUtils.h"
-#include "kvi_app.h"
-#include "kvi_frame.h"
-#include "kvi_iconmanager.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
+#include "KviIconManager.h"
 #include "KviPackageFile.h"
 #include "kvi_fileextensions.h"
-#include "kvi_filedialog.h"
-//#include "kvi_msgbox.h"
-#include "kvi_selectors.h"
+#include "KviFileDialog.h"
+//#include "KviMessageBox.h"
+#include "KviSelectors.h"
 #include "KviMiscUtils.h"
 #include "kvi_sourcesdate.h"
 
diff --git a/src/modules/theme/packthemedialog.h b/src/modules/theme/packthemedialog.h
index ecbeb4c0a..d99862dfe 100644
--- a/src/modules/theme/packthemedialog.h
+++ b/src/modules/theme/packthemedialog.h
@@ -27,7 +27,7 @@
 
 #include "kvi_settings.h"
 #include "KviPointerList.h"
-#include "kvi_theme.h"
+#include "KviTheme.h"
 
 #include <QWizard>
 #include <QWizardPage>
diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp
index 578e19b6d..072eceb38 100644
--- a/src/modules/theme/savethemedialog.cpp
+++ b/src/modules/theme/savethemedialog.cpp
@@ -25,18 +25,18 @@
 #include "savethemedialog.h"
 #include "themefunctions.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviConfigurationFile.h"
 #include "KviFileUtils.h"
-#include "kvi_app.h"
-#include "kvi_frame.h"
-#include "kvi_iconmanager.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
+#include "KviIconManager.h"
 #include "KviPackageFile.h"
 #include "kvi_fileextensions.h"
-#include "kvi_filedialog.h"
-#include "kvi_msgbox.h"
-#include "kvi_selectors.h"
+#include "KviFileDialog.h"
+#include "KviMessageBox.h"
+#include "KviSelectors.h"
 #include "KviMiscUtils.h"
 #include "kvi_sourcesdate.h"
 
@@ -264,7 +264,7 @@ bool KviSaveThemeDialog::saveTheme()
 	sto.setSubdirectory(szSubdir);
 
 	QString szAbsDir;
-	g_pApp->getLocalKvircDirectory(szAbsDir,KviApp::Themes,sto.subdirectory(),true);
+	g_pApp->getLocalKvircDirectory(szAbsDir,KviApplication::Themes,sto.subdirectory(),true);
 	if(!KviFileUtils::makeDir(szAbsDir))
 	{
 		QMessageBox::critical(this,__tr2qs_ctx("Save Current Theme - KVIrc","theme"),__tr2qs_ctx("Unable to create theme directory.","theme"),
diff --git a/src/modules/theme/savethemedialog.h b/src/modules/theme/savethemedialog.h
index 9d2140727..0eceffe9a 100644
--- a/src/modules/theme/savethemedialog.h
+++ b/src/modules/theme/savethemedialog.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviPointerList.h"
-#include "kvi_theme.h"
+#include "KviTheme.h"
 #include "KviTalWizard.h"
 
 #include <QDialog>
diff --git a/src/modules/theme/themefunctions.cpp b/src/modules/theme/themefunctions.cpp
index b14d5b5c8..677c31e8c 100644
--- a/src/modules/theme/themefunctions.cpp
+++ b/src/modules/theme/themefunctions.cpp
@@ -26,14 +26,14 @@
 
 #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 "KviMiscUtils.h"
 #include "kvi_sourcesdate.h"
-#include "kvi_theme.h"
-#include "kvi_frame.h"
+#include "KviTheme.h"
+#include "KviMainWindow.h"
 
 
 //#include <qmime.h>
@@ -291,7 +291,7 @@ namespace KviThemeFunctions
 		if(bInstall)
 		{
 			QString szUnpackPath;
-			g_pApp->getLocalKvircDirectory(szUnpackPath,KviApp::Themes);
+			g_pApp->getLocalKvircDirectory(szUnpackPath,KviApplication::Themes);
 			if(!r.unpack(szThemePackageFileName,szUnpackPath))
 			{
 				QString szErr2 = r.lastError();
diff --git a/src/modules/theme/themefunctions.h b/src/modules/theme/themefunctions.h
index 0aabab805..639e66107 100644
--- a/src/modules/theme/themefunctions.h
+++ b/src/modules/theme/themefunctions.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_htmldialog.h"
+#include "KviHtmlDialog.h"
 
 #include <QWidget>
 #include <QPixmap>