The big rename for modules. Still some details remaining.

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

10 files changed, 124 insertions, 124 deletions

diff --git a/src/modules/theme/CMakeLists.txt b/src/modules/theme/CMakeLists.txt
index 2e810769b..600ec61cf 100644
--- a/src/modules/theme/CMakeLists.txt
+++ b/src/modules/theme/CMakeLists.txt
@@ -2,16 +2,16 @@
 
 SET(kvitheme_MOC_HDRS
 	managementdialog.h
-	packthemedialog.h
-	savethemedialog.h
+	PackThemeDialog.h
+	SaveThemeDialog.h
 )
 
 SET(kvitheme_SRCS
 	libkvitheme.cpp
 	managementdialog.cpp
-	packthemedialog.cpp
-	savethemedialog.cpp
-	themefunctions.cpp
+	PackThemeDialog.cpp
+	SaveThemeDialog.cpp
+	ThemeFunctions.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/PackThemeDialog.cpp
index ba44c006c..c3560ec78 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/PackThemeDialog.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : packthemedialog.cpp
+//   File : PackThemeDialog.cpp
 //   Creation date : Wed 03 Jan 2007 01:11:44 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -23,8 +23,8 @@
 //
 //=============================================================================
 
-#include "packthemedialog.h"
-#include "themefunctions.h"
+#include "PackThemeDialog.h"
+#include "ThemeFunctions.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -58,7 +58,7 @@
 
 
 
-KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent, KviPointerList<KviThemeInfo> * pThemeInfoList)
+PackThemeDialog::PackThemeDialog(QWidget * pParent, KviPointerList<KviThemeInfo> * pThemeInfoList)
 : QWizard(pParent)
 {
 	setWindowTitle(__tr2qs_ctx("Export Theme - KVIrc","theme"));
@@ -115,26 +115,26 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent, KviPointerList<KviThem
 	addPage(pPage);
 
 	// Theme data
-	m_pPackThemeDataWidget = new KviPackThemeDataWidget(this);
+	m_pPackThemeDataWidget = new PackThemeDataWidget(this);
 	addPage(m_pPackThemeDataWidget);
 
 	// Packager information
-	m_pPackThemeInfoWidget = new KviPackThemeInfoWidget(this);
+	m_pPackThemeInfoWidget = new PackThemeInfoWidget(this);
 	addPage(m_pPackThemeInfoWidget);
 	
 	// Screenshot/logo/icon
-	m_pPackThemeImageWidget = new KviPackThemeImageWidget(this);
+	m_pPackThemeImageWidget = new PackThemeImageWidget(this);
 	addPage(m_pPackThemeImageWidget);
 	
 	// Save file name
-	m_pPackThemeSaveWidget = new KviPackThemeSaveWidget(this);
+	m_pPackThemeSaveWidget = new PackThemeSaveWidget(this);
 	addPage(m_pPackThemeSaveWidget);
 
 	//last thing to do before starting
 	m_pPackThemeDataWidget->parseThemes(m_pThemeInfoList);
 }
 
-KviPackThemeDataWidget::KviPackThemeDataWidget(KviPackThemeDialog * pParent)
+PackThemeDataWidget::PackThemeDataWidget(PackThemeDialog * pParent)
 : QWizardPage(pParent)
 {
 	setObjectName("theme_package_data_page");
@@ -142,7 +142,7 @@ KviPackThemeDataWidget::KviPackThemeDataWidget(KviPackThemeDialog * pParent)
 	setSubTitle(__tr2qs_ctx("This is the information list for the themes you're packaging. If it looks OK press \"Next\" to continue, otherwise press \"Cancel\" and rewiew your themes first.","theme"));
 }
 
-void KviPackThemeDataWidget::parseThemes(KviPointerList<KviThemeInfo> * pThemeInfoList)
+void PackThemeDataWidget::parseThemes(KviPointerList<KviThemeInfo> * pThemeInfoList)
 {
 	QString szPackageName;
 	QString szPackageAuthor;
@@ -209,7 +209,7 @@ void KviPackThemeDataWidget::parseThemes(KviPointerList<KviThemeInfo> * pThemeIn
 				szScreenshotPath = pThemeInfo->smallScreenshotPath();
 		}
 
-		KviThemeFunctions::getThemeHtmlDescription(
+		ThemeFunctions::getThemeHtmlDescription(
 			szThemeDescription,
 			pThemeInfo->name(),
 			pThemeInfo->version(),
@@ -245,11 +245,11 @@ void KviPackThemeDataWidget::parseThemes(KviPointerList<KviThemeInfo> * pThemeIn
 	setField("packageAuthor",szPackageAuthor);
 }
 
-KviPackThemeDataWidget::~KviPackThemeDataWidget()
+PackThemeDataWidget::~PackThemeDataWidget()
 {
 }
 
-KviPackThemeInfoWidget::KviPackThemeInfoWidget(KviPackThemeDialog * pParent)
+PackThemeInfoWidget::PackThemeInfoWidget(PackThemeDialog * pParent)
 : QWizardPage(pParent)
 {
 	setObjectName("theme_package_info_page");
@@ -305,7 +305,7 @@ KviPackThemeInfoWidget::KviPackThemeInfoWidget(KviPackThemeDialog * pParent)
 	registerField("packageAuthor*",m_pPackageAuthorEdit);
 
 }
-void KviPackThemeInfoWidget::initializePage()
+void PackThemeInfoWidget::initializePage()
 {
 	QString szPackageName = field("packageName").toString();
 	QString szPackageVersion = field("packageVersion").toString();
@@ -317,11 +317,11 @@ void KviPackThemeInfoWidget::initializePage()
 	m_pPackageAuthorEdit->setText(szPackageAuthor);
 }
 
-KviPackThemeInfoWidget::~KviPackThemeInfoWidget()
+PackThemeInfoWidget::~PackThemeInfoWidget()
 {
 }
 
-KviPackThemeImageWidget::KviPackThemeImageWidget(KviPackThemeDialog * pParent)
+PackThemeImageWidget::PackThemeImageWidget(PackThemeDialog * pParent)
 : QWizardPage(pParent)
 {
 	setObjectName("theme_package_image_page");
@@ -345,11 +345,11 @@ KviPackThemeImageWidget::KviPackThemeImageWidget(KviPackThemeDialog * pParent)
 	//m_pImageSelectionPage = pPage;
 }
 
-KviPackThemeImageWidget::~KviPackThemeImageWidget()
+PackThemeImageWidget::~PackThemeImageWidget()
 {
 }
 
-void KviPackThemeImageWidget::imageSelectionChanged(const QString & szImagePath)
+void PackThemeImageWidget::imageSelectionChanged(const QString & szImagePath)
 {
 	QImage pix(szImagePath);
 	if(!pix.isNull())
@@ -373,7 +373,7 @@ void KviPackThemeImageWidget::imageSelectionChanged(const QString & szImagePath)
 	m_pImageLabel->setPixmap(QPixmap());
 }
 
-KviPackThemeSaveWidget::KviPackThemeSaveWidget(KviPackThemeDialog * pParent)
+PackThemeSaveWidget::PackThemeSaveWidget(PackThemeDialog * pParent)
 : QWizardPage(pParent)
 {
 	setObjectName("theme_package_save_page");
@@ -396,11 +396,11 @@ KviPackThemeSaveWidget::KviPackThemeSaveWidget(KviPackThemeDialog * pParent)
 	registerField("packageSavePath*",m_pSavePathSelector);
 }
 
-KviPackThemeSaveWidget::~KviPackThemeSaveWidget()
+PackThemeSaveWidget::~PackThemeSaveWidget()
 {
 }
 
-void KviPackThemeSaveWidget::initializePage()
+void PackThemeSaveWidget::initializePage()
 {
 	m_szPackagePath = field("packageSavePath").toString();
 }
@@ -413,17 +413,17 @@ void KviPackThemeSaveWidget::initializePage()
 }
 #endif
 
-KviPackThemeDialog::~KviPackThemeDialog()
+PackThemeDialog::~PackThemeDialog()
 {
 }
 
-void KviPackThemeDialog::accept()
+void PackThemeDialog::accept()
 {
 	if(!packTheme()) return;
 	QWizard::accept();
 }
 
-bool KviPackThemeDialog::packTheme()
+bool PackThemeDialog::packTheme()
 {
 	//m_pImageSelector->commit();
 	//m_pPathSelector->commit();
diff --git a/src/modules/theme/packthemedialog.h b/src/modules/theme/PackThemeDialog.h
index d99862dfe..920bed2a1 100644
--- a/src/modules/theme/packthemedialog.h
+++ b/src/modules/theme/PackThemeDialog.h
@@ -2,7 +2,7 @@
 #define _PACKTHEMEDIALOG_H_
 //=============================================================================
 //
-//   File : packthemedialog.h
+//   File : PackThemeDialog.h
 //   Creation date : Wed 03 Jan 2007 01:11:44 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -37,22 +37,22 @@ class QLabel;
 class QTextEdit;
 class KviFileSelector;
 
-class KviPackThemeDataWidget;
-class KviPackThemeInfoWidget;
-class KviPackThemeImageWidget;
-class KviPackThemeSaveWidget;
+class PackThemeDataWidget;
+class PackThemeInfoWidget;
+class PackThemeImageWidget;
+class PackThemeSaveWidget;
 
-class KviPackThemeDialog : public QWizard
+class PackThemeDialog : public QWizard
 {
 	Q_OBJECT
 public:
-	KviPackThemeDialog(QWidget * pParent, KviPointerList<KviThemeInfo> * pThemeInfoList);
-	~KviPackThemeDialog();
+	PackThemeDialog(QWidget * pParent, KviPointerList<KviThemeInfo> * pThemeInfoList);
+	~PackThemeDialog();
 protected:
-	KviPackThemeDataWidget       * m_pPackThemeDataWidget;
-	KviPackThemeInfoWidget       * m_pPackThemeInfoWidget;
-	KviPackThemeImageWidget      * m_pPackThemeImageWidget;
-	KviPackThemeSaveWidget       * m_pPackThemeSaveWidget;
+	PackThemeDataWidget       * m_pPackThemeDataWidget;
+	PackThemeInfoWidget       * m_pPackThemeInfoWidget;
+	PackThemeImageWidget      * m_pPackThemeImageWidget;
+	PackThemeSaveWidget       * m_pPackThemeSaveWidget;
 	KviPointerList<KviThemeInfo> * m_pThemeInfoList;
 	
 	QString                        m_szAuthor;
@@ -69,22 +69,22 @@ protected:
 	bool packTheme();
 };
 
-class KviPackThemeDataWidget : public QWizardPage
+class PackThemeDataWidget : public QWizardPage
 {
 	Q_OBJECT
 public:
-	KviPackThemeDataWidget(KviPackThemeDialog * pParent);
-	~KviPackThemeDataWidget();
+	PackThemeDataWidget(PackThemeDialog * pParent);
+	~PackThemeDataWidget();
 public:
 	void parseThemes(KviPointerList<KviThemeInfo> * pThemeInfoList);
 };
 
-class KviPackThemeInfoWidget : public QWizardPage
+class PackThemeInfoWidget : public QWizardPage
 {
 	Q_OBJECT
 public:
-	KviPackThemeInfoWidget(KviPackThemeDialog * pParent);
-	~KviPackThemeInfoWidget();
+	PackThemeInfoWidget(PackThemeDialog * pParent);
+	~PackThemeInfoWidget();
 public:
 	QLineEdit * m_pPackageNameEdit;
 	QTextEdit * m_pPackageDescriptionEdit;
@@ -94,12 +94,12 @@ protected:
 	virtual void initializePage();
 };
 
-class KviPackThemeImageWidget : public QWizardPage
+class PackThemeImageWidget : public QWizardPage
 {
 	Q_OBJECT
 public:
-	KviPackThemeImageWidget(KviPackThemeDialog * pParent);
-	~KviPackThemeImageWidget();
+	PackThemeImageWidget(PackThemeDialog * pParent);
+	~PackThemeImageWidget();
 protected:
 	KviFileSelector * m_pImageSelector;
 	QLabel          * m_pImageLabel;
@@ -108,12 +108,12 @@ protected slots:
 	void imageSelectionChanged(const QString & szImagePath);
 };
 
-class KviPackThemeSaveWidget : public QWizardPage
+class PackThemeSaveWidget : public QWizardPage
 {
 	Q_OBJECT
 public:
-	KviPackThemeSaveWidget(KviPackThemeDialog * pParent);
-	~KviPackThemeSaveWidget();
+	PackThemeSaveWidget(PackThemeDialog * pParent);
+	~PackThemeSaveWidget();
 protected:
 	KviFileSelector * m_pSavePathSelector;
 	QString           m_szPackagePath;
diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/SaveThemeDialog.cpp
index 4e65b550c..388f7b163 100644
--- a/src/modules/theme/savethemedialog.cpp
+++ b/src/modules/theme/SaveThemeDialog.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : savethemedialog.cpp
+//   File : SaveThemeDialog.cpp
 //   Creation date : Wed 03 Jan 2007 03:01:34 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "savethemedialog.h"
-#include "themefunctions.h"
+#include "SaveThemeDialog.h"
+#include "ThemeFunctions.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -58,7 +58,7 @@
 
 
 
-KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent)
+SaveThemeDialog::SaveThemeDialog(QWidget * pParent)
 : KviTalWizard(pParent)
 {
 	setWindowTitle(__tr2qs_ctx("Save Current Theme - KVIrc","theme"));
@@ -177,11 +177,11 @@ KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent)
 	setFinishEnabled(pPage,true);
 }
 
-KviSaveThemeDialog::~KviSaveThemeDialog()
+SaveThemeDialog::~SaveThemeDialog()
 {
 }
 
-void KviSaveThemeDialog::imageSelectionChanged(const QString &szImagePath)
+void SaveThemeDialog::imageSelectionChanged(const QString &szImagePath)
 {
 	QImage pix(szImagePath);
 	if(!pix.isNull())
@@ -202,17 +202,17 @@ void KviSaveThemeDialog::imageSelectionChanged(const QString &szImagePath)
 	m_pImageLabel->setPixmap(QPixmap());
 }
 
-void KviSaveThemeDialog::accept()
+void SaveThemeDialog::accept()
 {
 	if(!saveTheme())return;
 	KviTalWizard::accept();
 }
 
-void KviSaveThemeDialog::makeScreenshot()
+void SaveThemeDialog::makeScreenshot()
 {
 	QString szFileName;
 	g_pApp->getTmpFileName(szFileName,"screenshot.png");
-	if(!KviThemeFunctions::makeKVIrcScreenshot(szFileName))
+	if(!ThemeFunctions::makeKVIrcScreenshot(szFileName))
 	{
 		QMessageBox::critical(this,__tr2qs_ctx("Acquire Screenshot - KVIrc","theme"),__tr2qs_ctx("Failed to make screenshot","theme"),
 			QMessageBox::Ok,QMessageBox::NoButton,QMessageBox::NoButton);
@@ -222,7 +222,7 @@ void KviSaveThemeDialog::makeScreenshot()
 	imageSelectionChanged(szFileName);
 }
 
-bool KviSaveThemeDialog::saveTheme()
+bool SaveThemeDialog::saveTheme()
 {
 	m_pImageSelector->commit();
 
diff --git a/src/modules/theme/savethemedialog.h b/src/modules/theme/SaveThemeDialog.h
index 0eceffe9a..f28347be7 100644
--- a/src/modules/theme/savethemedialog.h
+++ b/src/modules/theme/SaveThemeDialog.h
@@ -2,7 +2,7 @@
 #define _SAVETHEMEDIALOG_H_
 //=============================================================================
 //
-//   File : savethemedialog.h
+//   File : SaveThemeDialog.h
 //   Creation date : Wed 03 Jan 2007 03:01:34 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -38,12 +38,12 @@ class QTextEdit;
 class KviFileSelector;
 
 
-class KviSaveThemeDialog : public KviTalWizard
+class SaveThemeDialog : public KviTalWizard
 {
 	Q_OBJECT
 public:
-	KviSaveThemeDialog(QWidget * pParent);
-	virtual ~KviSaveThemeDialog();
+	SaveThemeDialog(QWidget * pParent);
+	virtual ~SaveThemeDialog();
 protected:
 	QString           m_szScreenshotPath;
 	KviFileSelector * m_pImageSelector;
diff --git a/src/modules/theme/themefunctions.cpp b/src/modules/theme/ThemeFunctions.cpp
index ba7150b88..f1062cb94 100644
--- a/src/modules/theme/themefunctions.cpp
+++ b/src/modules/theme/ThemeFunctions.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : themefunctions.cpp
+//   File : ThemeFunctions.cpp
 //   Creation date : Wed 03 Jan 2007 03:14:07 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "themefunctions.h"
+#include "ThemeFunctions.h"
 
 #include "KviPackageReader.h"
 #include "KviLocale.h"
@@ -39,7 +39,7 @@
 //#include <qmime.h>
 
 
-namespace KviThemeFunctions
+namespace ThemeFunctions
 {
 
 	static bool notAValidThemePackage(QString &szError)
diff --git a/src/modules/theme/themefunctions.h b/src/modules/theme/ThemeFunctions.h
index 639e66107..08cf1b4b9 100644
--- a/src/modules/theme/themefunctions.h
+++ b/src/modules/theme/ThemeFunctions.h
@@ -2,7 +2,7 @@
 #define _THEMEFUNCTIONS_H_
 //=============================================================================
 //
-//   File : themefunctions.h
+//   File : ThemeFunctions.h
 //   Creation date : Wed 03 Jan 2007 03:14:07 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -31,7 +31,7 @@
 #include <QWidget>
 #include <QPixmap>
 
-namespace KviThemeFunctions
+namespace ThemeFunctions
 {
 	bool installThemePackage(const QString &szThemePackageFileName,QString &szError,QWidget * pDialogParent = 0);
 	void getThemeHtmlDescription(
diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp
index f21979048..d17b3fe7f 100644
--- a/src/modules/theme/libkvitheme.cpp
+++ b/src/modules/theme/libkvitheme.cpp
@@ -23,7 +23,7 @@
 //=============================================================================
 
 #include "managementdialog.h"
-#include "themefunctions.h"
+#include "ThemeFunctions.h"
 
 #include "KviMessageBox.h"
 #include "KviModule.h"
@@ -70,7 +70,7 @@ static bool theme_kvs_cmd_install(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_END(c)
 
 	QString szError;
-	if(!KviThemeFunctions::installThemePackage(szThemePackFile,szError))
+	if(!ThemeFunctions::installThemePackage(szThemePackFile,szError))
 	{
 		c->error(__tr2qs_ctx("Error installing theme package: %Q","theme"),&szError);
 		return false;
@@ -245,7 +245,7 @@ static bool theme_kvs_cmd_screenshot(KviKvsModuleCommandCall * c)
 		szFileName+=".png";
 
 	QString szError;
-	if(!KviThemeFunctions::makeKVIrcScreenshot(szFileName))
+	if(!ThemeFunctions::makeKVIrcScreenshot(szFileName))
 	{
 		c->error(__tr2qs_ctx("Error making screenshot","theme")); // FIXME: a nicer error ?
 		return false;
@@ -273,7 +273,7 @@ static bool theme_kvs_cmd_screenshot(KviKvsModuleCommandCall * c)
 static bool theme_kvs_cmd_dialog(KviKvsModuleCommandCall *c)
 {
 
-	KviThemeManagementDialog::display(c->hasSwitch('t',"toplevel"));
+	ThemeManagementDialog::display(c->hasSwitch('t',"toplevel"));
 	return true;
 }
 
@@ -297,7 +297,7 @@ static bool theme_module_init(KviModule *m)
 
 static bool theme_module_cleanup(KviModule *m)
 {
-	KviThemeManagementDialog::cleanup();
+	ThemeManagementDialog::cleanup();
 
 	QString szBuf;
 	m->getDefaultConfigFileName(szBuf);
@@ -309,7 +309,7 @@ static bool theme_module_cleanup(KviModule *m)
 
 static bool theme_module_can_unload(KviModule *)
 {
-	return (!KviThemeManagementDialog::instance());
+	return (!ThemeManagementDialog::instance());
 }
 
 
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index 6e9032bd9..5595cd19e 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -23,9 +23,9 @@
 //=============================================================================
 
 #include "managementdialog.h"
-#include "packthemedialog.h"
-#include "savethemedialog.h"
-#include "themefunctions.h"
+#include "PackThemeDialog.h"
+#include "SaveThemeDialog.h"
+#include "ThemeFunctions.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -67,7 +67,7 @@
 extern QRect g_rectManagementDialogGeometry;
 
 
-KviThemeListWidgetItem::KviThemeListWidgetItem(KviTalListWidget * box,KviThemeInfo * inf)
+ThemeListWidgetItem::ThemeListWidgetItem(KviTalListWidget * box,KviThemeInfo * inf)
 : KviTalListWidgetItem(box)
 {
 	m_pThemeInfo = inf;
@@ -97,16 +97,16 @@ KviThemeListWidgetItem::KviThemeListWidgetItem(KviTalListWidget * box,KviThemeIn
 	setText(t);
 }
 
-KviThemeListWidgetItem::~KviThemeListWidgetItem()
+ThemeListWidgetItem::~ThemeListWidgetItem()
 {
 	delete m_pThemeInfo;
 
 }
 
-KviThemeManagementDialog * KviThemeManagementDialog::m_pInstance = 0;
+ThemeManagementDialog * ThemeManagementDialog::m_pInstance = 0;
 
 
-KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent)
+ThemeManagementDialog::ThemeManagementDialog(QWidget * parent)
 : QWidget(parent)
 {
 	m_pItemDelegate=0;
@@ -211,20 +211,20 @@ KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent)
 		g_rectManagementDialogGeometry.y());
 }
 
-KviThemeManagementDialog::~KviThemeManagementDialog()
+ThemeManagementDialog::~ThemeManagementDialog()
 {
 	if (m_pItemDelegate) delete m_pItemDelegate;
 	g_rectManagementDialogGeometry = QRect(pos().x(),pos().y(),size().width(),size().height());
 	m_pInstance = 0;
 }
 
-void KviThemeManagementDialog::closeClicked()
+void ThemeManagementDialog::closeClicked()
 {
 	delete this;
 	m_pInstance = 0;
 }
 
-void KviThemeManagementDialog::display(bool bTopLevel)
+void ThemeManagementDialog::display(bool bTopLevel)
 {
 	if(m_pInstance)
 	{
@@ -243,9 +243,9 @@ void KviThemeManagementDialog::display(bool bTopLevel)
 	} else {
 		if(bTopLevel)
 		{
-			m_pInstance = new KviThemeManagementDialog(0);
+			m_pInstance = new ThemeManagementDialog(0);
 		} else {
-			m_pInstance = new KviThemeManagementDialog(g_pFrame->splitter());
+			m_pInstance = new ThemeManagementDialog(g_pFrame->splitter());
 		}
 	}
 	m_pInstance->show();
@@ -253,28 +253,28 @@ void KviThemeManagementDialog::display(bool bTopLevel)
 	m_pInstance->setFocus();
 }
 
-void KviThemeManagementDialog::cleanup()
+void ThemeManagementDialog::cleanup()
 {
 	if(!m_pInstance)return;
 	delete m_pInstance;
 	m_pInstance = 0;
 }
 
-void KviThemeManagementDialog::packTheme()
+void ThemeManagementDialog::packTheme()
 {
 	KviPointerList<KviThemeInfo> dl;
 	dl.setAutoDelete(false);
 	QList<QListWidgetItem*> itemsSelected = m_pListWidget->selectedItems ();
 	for(int i=0;i<itemsSelected.count();i++)
-		dl.append(((KviThemeListWidgetItem *)itemsSelected.at(i))->themeInfo());
+		dl.append(((ThemeListWidgetItem *)itemsSelected.at(i))->themeInfo());
 	if(dl.isEmpty())return;
 
-	KviPackThemeDialog * pDialog = new KviPackThemeDialog(this,&dl);
+	PackThemeDialog * pDialog = new PackThemeDialog(this,&dl);
 	pDialog->exec();
 	delete pDialog;
 }
 
-void KviThemeManagementDialog::contextMenuRequested(const QPoint & pos)
+void ThemeManagementDialog::contextMenuRequested(const QPoint & pos)
 {
 	if(m_pListWidget->itemAt(pos)!=0)
 	{
@@ -286,15 +286,15 @@ void KviThemeManagementDialog::contextMenuRequested(const QPoint & pos)
 	}
 }
 
-void KviThemeManagementDialog::applyTheme ( QListWidgetItem * it)
+void ThemeManagementDialog::applyTheme ( QListWidgetItem * it)
 {
 	if(it)m_pListWidget->setCurrentItem(it);
 	applyCurrentTheme();
 }
 
-void KviThemeManagementDialog::applyCurrentTheme()
+void ThemeManagementDialog::applyCurrentTheme()
 {
-	KviThemeListWidgetItem * it = (KviThemeListWidgetItem *)m_pListWidget->currentItem();
+	ThemeListWidgetItem * it = (ThemeListWidgetItem *)m_pListWidget->currentItem();
 	if(!it)return;
 
 	if(KviMessageBox::yesNo(__tr2qs_ctx("Apply theme - KVIrc","theme"),
@@ -318,28 +318,28 @@ void KviThemeManagementDialog::applyCurrentTheme()
 	}
 }
 
-void KviThemeManagementDialog::deleteTheme()
+void ThemeManagementDialog::deleteTheme()
 {
 	QList<QListWidgetItem*> itemsSelected = m_pListWidget->selectedItems ();
 	for(int i=0;i<itemsSelected.count();i++)
 	{
 			if(!KviMessageBox::yesNo(__tr2qs_ctx("Delete Theme - KVIrc","theme"),
 				__tr2qs_ctx("Do you really wish to delete theme \"%Q\" (version %Q)?","theme"),
-					&(((KviThemeListWidgetItem *)itemsSelected.at(i))->themeInfo()->name()),&(((KviThemeListWidgetItem *)itemsSelected.at(i))->themeInfo()->version())))goto jump_out;
-			KviFileUtils::deleteDir(((KviThemeListWidgetItem *)itemsSelected.at(i))->themeInfo()->absoluteDirectory());
+					&(((ThemeListWidgetItem *)itemsSelected.at(i))->themeInfo()->name()),&(((ThemeListWidgetItem *)itemsSelected.at(i))->themeInfo()->version())))goto jump_out;
+			KviFileUtils::deleteDir(((ThemeListWidgetItem *)itemsSelected.at(i))->themeInfo()->absoluteDirectory());
 	}
 jump_out:
 	fillThemeBox();
 }
 
-void KviThemeManagementDialog::installFromFile()
+void ThemeManagementDialog::installFromFile()
 {
 	QString szFileName;
 	QString szError;
 
 	if(!KviFileDialog::askForOpenFileName(szFileName,__tr2qs_ctx("Open Theme - KVIrc","theme"),QString(),KVI_FILTER_THEME))
 		return;
-	if(!KviThemeFunctions::installThemePackage(szFileName,szError,this))
+	if(!ThemeFunctions::installThemePackage(szFileName,szError,this))
 	{
 		KviMessageBox::information(szError);
 		return;
@@ -347,21 +347,21 @@ void KviThemeManagementDialog::installFromFile()
 	fillThemeBox();
 }
 
-void KviThemeManagementDialog::getMoreThemes()
+void ThemeManagementDialog::getMoreThemes()
 {
 	if(!g_pFrame)return;
 	g_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_OPENURL_KVIRC_THEMES);
 }
 
-void KviThemeManagementDialog::saveCurrentTheme()
+void ThemeManagementDialog::saveCurrentTheme()
 {
-	KviSaveThemeDialog * pSaveThemeDialog = new KviSaveThemeDialog(this);
+	SaveThemeDialog * pSaveThemeDialog = new SaveThemeDialog(this);
 	pSaveThemeDialog->exec();
 	delete pSaveThemeDialog;
 	fillThemeBox();
 }
 
-void KviThemeManagementDialog::fillThemeBox(const QString &szDir)
+void ThemeManagementDialog::fillThemeBox(const QString &szDir)
 {
 	QDir d(szDir);
 
@@ -380,14 +380,14 @@ void KviThemeManagementDialog::fillThemeBox(const QString &szDir)
 		if(inf->loadFromDirectory(szTest))
 		{
 			inf->setSubdirectory(*it);
-			new KviThemeListWidgetItem(m_pListWidget,inf);
+			new ThemeListWidgetItem(m_pListWidget,inf);
 		} else {
 			delete inf;
 		}
 	}
 }
 
-void KviThemeManagementDialog::fillThemeBox()
+void ThemeManagementDialog::fillThemeBox()
 {
 	m_pListWidget->clear();
 
@@ -400,39 +400,39 @@ void KviThemeManagementDialog::fillThemeBox()
 	enableDisableButtons();
 }
 
-bool KviThemeManagementDialog::hasSelectedItems()
+bool ThemeManagementDialog::hasSelectedItems()
 {
 	QList<QListWidgetItem*> itemsSelected = m_pListWidget->selectedItems ();
 	return itemsSelected.count()?true:false;
 
 }
 
-void KviThemeManagementDialog::enableDisableButtons()
+void ThemeManagementDialog::enableDisableButtons()
 {
 	bool b = hasSelectedItems();
 	m_pPackThemeButton->setEnabled(b);
 	m_pDeleteThemeButton->setEnabled(b);
 }
 
-void KviThemeManagementDialog::closeEvent(QCloseEvent * e)
+void ThemeManagementDialog::closeEvent(QCloseEvent * e)
 {
 	e->ignore();
 	delete this;
 }
 
-void KviThemeManagementDialog::tipRequest(QListWidgetItem *,const QPoint &)
+void ThemeManagementDialog::tipRequest(QListWidgetItem *,const QPoint &)
 {
 	// FIXME
 	/*
-	//KviThemeListWidgetItem * it = (KviThemeListWidgetItem *)(m_pListWidget->itemAt(pnt));
+	//ThemeListWidgetItem * it = (ThemeListWidgetItem *)(m_pListWidget->itemAt(pnt));
 
 	//if(!it)return;
 
-	KviThemeInfo * pThemeInfo = ((KviThemeListWidgetItem *)it)->themeInfo();
+	KviThemeInfo * pThemeInfo = ((ThemeListWidgetItem *)it)->themeInfo();
 
 	QString szThemeDescription;
 
-	KviThemeFunctions::getThemeHtmlDescription(
+	ThemeFunctions::getThemeHtmlDescription(
 		szThemeDescription,
 		pThemeInfo->name(),
 		pThemeInfo->version(),
diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h
index be5995c3c..beed4ade9 100644
--- a/src/modules/theme/managementdialog.h
+++ b/src/modules/theme/managementdialog.h
@@ -45,11 +45,11 @@ class QLabel;
 class KviDynamicToolTip;
 
 
-class KviThemeListWidgetItem : public KviTalListWidgetItem
+class ThemeListWidgetItem : public KviTalListWidgetItem
 {
 public:
-	KviThemeListWidgetItem(KviTalListWidget * box,KviThemeInfo * inf);
-	virtual ~KviThemeListWidgetItem();
+	ThemeListWidgetItem(KviTalListWidget * box,KviThemeInfo * inf);
+	virtual ~ThemeListWidgetItem();
 public:
 	KviThemeInfo   * m_pThemeInfo;
 public:
@@ -57,21 +57,21 @@ public:
 };
 
 
-class KviThemeManagementDialog : public QWidget
+class ThemeManagementDialog : public QWidget
 {
 	Q_OBJECT
 public:
-	KviThemeManagementDialog(QWidget * parent);
-	virtual ~KviThemeManagementDialog();
+	ThemeManagementDialog(QWidget * parent);
+	virtual ~ThemeManagementDialog();
 protected:
-	static KviThemeManagementDialog   * m_pInstance;
+	static ThemeManagementDialog   * m_pInstance;
 	KviTalIconAndRichTextItemDelegate * m_pItemDelegate;
 	KviTalListWidget    * m_pListWidget;
 	KviTalPopupMenu     * m_pContextPopup;
 	QToolButton         * m_pDeleteThemeButton;
 	QToolButton         * m_pPackThemeButton;
 public:
-	static KviThemeManagementDialog * instance(){ return m_pInstance; };
+	static ThemeManagementDialog * instance(){ return m_pInstance; };
 	static void display(bool bTopLevel);
 	static void cleanup();
 protected: