More renaming and cleanup

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

3 files changed, 19 insertions, 19 deletions

diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp
index 19df1bc3f..5f8160f71 100644
--- a/src/modules/setup/libkvisetup.cpp
+++ b/src/modules/setup/libkvisetup.cpp
@@ -24,14 +24,14 @@
 
 #include "setupwizard.h"
 
-#include "kvi_module.h"
-#include "kvi_options.h"
+#include "KviModule.h"
+#include "KviOptions.h"
 #include "kvi_defaults.h"
-#include "kvi_app.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_window.h"
-#include "kvi_theme.h"
+#include "KviApplication.h"
+#include "KviKvsScript.h"
+#include "KviKvsVariantList.h"
+#include "KviWindow.h"
+#include "KviTheme.h"
 #include "KviIrcServerDataBase.h"
 
 #include <QString>
@@ -51,7 +51,7 @@ QString szMircIni;
 
 
 
-// this is called by KviApp when no local kvirc directory has been found
+// this is called by KviApplication when no local kvirc directory has been found
 // we have nothing to rely on yet... (settings have not been loaded yet)
 KVIMODULEEXPORTFUNC bool setup_begin()
 {
@@ -91,11 +91,11 @@ KVIMODULEEXPORTFUNC void setup_finish()
 		switch(g_iThemeToApply)
 		{
 			case THEME_APPLY_HIRES:
-				g_pApp->getGlobalKvircDirectory(szDir,KviApp::Themes,"YellowIRC-1.0.0");
+				g_pApp->getGlobalKvircDirectory(szDir,KviApplication::Themes,"YellowIRC-1.0.0");
 				KviTheme::load(szDir,out);
 			break;
 			case THEME_APPLY_LORES:
-				g_pApp->getGlobalKvircDirectory(szDir,KviApp::Themes,"MinimalDark-1.0.0");
+				g_pApp->getGlobalKvircDirectory(szDir,KviApplication::Themes,"MinimalDark-1.0.0");
 				KviTheme::load(szDir,out);
 			break;
 			// default: no theme
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index df291feee..6938718b2 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -26,15 +26,15 @@ bool g_bFoundMirc;
 
 #include "setupwizard.h"
 
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
 #include "KviFileUtils.h"
 #include "kvi_defaults.h"
-#include "kvi_msgbox.h"
+#include "KviMessageBox.h"
 #include "KviTalFileDialog.h"
 #include "KviQString.h"
 #include "KviEnvironment.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviConfigurationFile.h"
 #include "KviTalHBox.h"
 
@@ -142,7 +142,7 @@ KviSetupWizard::KviSetupWizard()
 	QString szLabelText;
 
 	QString szImagePath;
-	g_pApp->getGlobalKvircDirectory(szImagePath,KviApp::Pics,"kvi_setup_label.png");
+	g_pApp->getGlobalKvircDirectory(szImagePath,KviApplication::Pics,"kvi_setup_label.png");
 
 	m_pLabelPixmap = new QPixmap(szImagePath);
 	if(m_pLabelPixmap->isNull())
@@ -193,7 +193,7 @@ KviSetupWizard::KviSetupWizard()
 	ed->setWordWrapMode(QTextOption::NoWrap);
 	QString szLicense;
 	QString szLicensePath;
-	g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"COPYING");
+	g_pApp->getGlobalKvircDirectory(szLicensePath,KviApplication::License,"COPYING");
 	if(!KviFileUtils::loadFile(szLicensePath,szLicense))
 	{
 		szLicense = __tr("Oops... can't find the license file.\n" \
@@ -436,7 +436,7 @@ KviSetupWizard::KviSetupWizard()
 	m_pThemeButtonGroup->setLayout(pThemeGrid);
 
 	QString szThemeImagePath;
-	g_pApp->getGlobalKvircDirectory(szThemeImagePath,KviApp::Pics,"kvi_setup_theme_hires.png");
+	g_pApp->getGlobalKvircDirectory(szThemeImagePath,KviApplication::Pics,"kvi_setup_theme_hires.png");
 
 	QPixmap* pHiResPixmap = new QPixmap(szThemeImagePath);
 	if(pHiResPixmap->isNull())
@@ -456,7 +456,7 @@ KviSetupWizard::KviSetupWizard()
 	m_pThemeHiRes = new QRadioButton(__tr2qs("&Fancy Theme"),m_pThemeButtonGroup);
 	pThemeGrid->addWidget(m_pThemeHiRes, 2,1);
 
-	g_pApp->getGlobalKvircDirectory(szThemeImagePath,KviApp::Pics,"kvi_setup_theme_lowres.png");
+	g_pApp->getGlobalKvircDirectory(szThemeImagePath,KviApplication::Pics,"kvi_setup_theme_lowres.png");
 	QPixmap* pLowResPixmap = new QPixmap(szThemeImagePath);
 	if(pLowResPixmap->isNull())
 	{
@@ -559,7 +559,7 @@ KviSetupWizard::KviSetupWizard()
 	// Preconfigured values
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	QString szTmp;
-	g_pApp->getGlobalKvircDirectory(szTmp,KviApp::Config,"preinstalled.kvc");
+	g_pApp->getGlobalKvircDirectory(szTmp,KviApplication::Config,"preinstalled.kvc");
 	if(KviFileUtils::fileExists(szTmp))
 	{
 		KviConfigurationFile cfg(szTmp,KviConfigurationFile::Read);
diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/setupwizard.h
index f7085cfc4..6ecc56939 100644
--- a/src/modules/setup/setupwizard.h
+++ b/src/modules/setup/setupwizard.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviCString.h"
-#include "kvi_selectors.h"
+#include "KviSelectors.h"
 #include "KviTalWizard.h"
 #include "KviTalVBox.h"
 #include "KviTalHBox.h"