More renaming and cleanup

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

5 files changed, 22 insertions, 22 deletions

diff --git a/src/modules/logview/libkvilogview.cpp b/src/modules/logview/libkvilogview.cpp
index b4b9f4d85..8db879281 100644
--- a/src/modules/logview/libkvilogview.cpp
+++ b/src/modules/logview/libkvilogview.cpp
@@ -26,11 +26,11 @@
 #include "logviewmdiwindow.h"
 
 #include "KviConfigurationFile.h"
-#include "kvi_module.h"
-#include "kvi_frame.h"
-#include "kvi_iconmanager.h"
+#include "KviModule.h"
+#include "KviMainWindow.h"
+#include "KviIconManager.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 
 static QRect                 g_rectLogViewGeometry;
 KviLogViewMDIWindow        * g_pLogViewWindow = 0;
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index 62ca73513..b69581b30 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -26,14 +26,14 @@
 #include "logviewmdiwindow.h"
 #include "logviewwidget.h"
 
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviLocale.h"
-#include "kvi_module.h"
-#include "kvi_options.h"
-#include "kvi_frame.h"
-#include "kvi_ircview.h"
+#include "KviModule.h"
+#include "KviOptions.h"
+#include "KviMainWindow.h"
+#include "KviIrcView.h"
 #include "KviQString.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviFileUtils.h"
 #include "KviTalPopupMenu.h"
 
@@ -65,7 +65,7 @@
 
 extern KviLogViewMDIWindow * g_pLogViewWindow;
 
-KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFrame * lpFrm)
+KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_LOGVIEW,lpFrm,"logview"), KviModuleExtension(d)
 {
 	g_pLogViewWindow = this;
@@ -168,7 +168,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 	li.append(width()-110);
 	m_pSplitter->setSizes(li);
 
-	g_pApp->getLocalKvircDirectory(m_szLogDirectory,KviApp::Log);
+	g_pApp->getLocalKvircDirectory(m_szLogDirectory,KviApplication::Log);
 	KviQString::ensureLastCharIs(m_szLogDirectory,'/'); // Does this work on Windows?
 
 	m_pTimer = new QTimer(this);
@@ -373,7 +373,7 @@ void KviLogViewMDIWindow::itemSelected(QTreeWidgetItem * it,QTreeWidgetItem *)
 QStringList KviLogViewMDIWindow::getFileNames()
 {
 	QString logPath;
-	g_pApp->getLocalKvircDirectory(logPath,KviApp::Log);
+	g_pApp->getLocalKvircDirectory(logPath,KviApplication::Log);
 	QString qPath(logPath);
 	QDir logDir(qPath);
 	return logDir.entryList();
@@ -430,7 +430,7 @@ void KviLogViewMDIWindow::deleteCurrent()
 				if(!pCurItem->fileName().isNull())
 				{
 					QString szFname;
-					g_pApp->getLocalKvircDirectory(szFname,KviApp::Log,pCurItem->fileName());
+					g_pApp->getLocalKvircDirectory(szFname,KviApplication::Log,pCurItem->fileName());
 					KviFileUtils::removeFile(szFname);
 				}
 			}
@@ -440,7 +440,7 @@ void KviLogViewMDIWindow::deleteCurrent()
 			if(!pItem->fileName().isNull())
 		{
 			QString szFname;
-			g_pApp->getLocalKvircDirectory(szFname,KviApp::Log,pItem->fileName());
+			g_pApp->getLocalKvircDirectory(szFname,KviApplication::Log,pItem->fileName());
 			KviFileUtils::removeFile(szFname);
 			delete pItem;
 			m_pIrcView->clearBuffer();
diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/logviewmdiwindow.h
index a9e03799b..4c201edd7 100644
--- a/src/modules/logview/logviewmdiwindow.h
+++ b/src/modules/logview/logviewmdiwindow.h
@@ -26,8 +26,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_window.h"
-#include "kvi_moduleextension.h"
+#include "KviWindow.h"
+#include "KviModuleExtension.h"
 #include "KviTalVBox.h"
 #include <QTreeWidget>
 #include "KviPointerList.h"
@@ -91,7 +91,7 @@ class KviLogViewMDIWindow : public KviWindow, public KviModuleExtension
 {
     Q_OBJECT
 public:
-	KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFrame * lpFrm);
+	KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm);
 	~KviLogViewMDIWindow();
 protected:
 	KviPointerList<KviLogFile> m_logList;
diff --git a/src/modules/logview/logviewwidget.cpp b/src/modules/logview/logviewwidget.cpp
index ef70b0c7a..5af476622 100644
--- a/src/modules/logview/logviewwidget.cpp
+++ b/src/modules/logview/logviewwidget.cpp
@@ -27,8 +27,8 @@
 
 //#include "kvi_debug.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
-#include "kvi_app.h"
+#include "KviIconManager.h"
+#include "KviApplication.h"
 #include "KviQString.h"
 
 #include <QLayout>
diff --git a/src/modules/logview/logviewwidget.h b/src/modules/logview/logviewwidget.h
index b3e6929a4..cff1c2868 100644
--- a/src/modules/logview/logviewwidget.h
+++ b/src/modules/logview/logviewwidget.h
@@ -27,8 +27,8 @@
 
 #include "logviewmdiwindow.h"
 
-#include "kvi_window.h"
-#include "kvi_scripteditor.h"
+#include "KviWindow.h"
+#include "KviScriptEditor.h"
 #include <QTreeWidget>
 
 class KviScriptEditor;