More renaming and cleanup

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

3 files changed, 24 insertions, 24 deletions

diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index e5f622110..66ecad7d2 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -24,22 +24,22 @@
 
 #include "userwindow.h"
 
-#include "kvi_module.h"
-#include "kvi_console.h"
-#include "kvi_options.h"
-#include "kvi_ircsocket.h"
-#include "kvi_frame.h"
+#include "KviModule.h"
+#include "KviConsoleWindow.h"
+#include "KviOptions.h"
+#include "KviIrcSocket.h"
+#include "KviMainWindow.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviError.h"
-#include "kvi_ircview.h"
-#include "kvi_input.h"
-#include "kvi_iconmanager.h"
-#include "kvi_modulemanager.h"
+#include "KviIrcView.h"
+#include "KviInput.h"
+#include "KviIconManager.h"
+#include "KviModuleManager.h"
 #include "KviMemory.h"
 #include "KviMemory.h"
-#include "kvi_mdichild.h"
-#include "kvi_channel.h"
+#include "KviMdiChild.h"
+#include "KviChannelWindow.h"
 #include "KviPointerHashTable.h"
 
 #include <QTimer>
@@ -47,13 +47,13 @@
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	#include "KviCryptEngine.h"
-	#include "kvi_cryptcontroller.h"
-	// kvi_app.cpp
+	#include "KviCryptController.h"
+	// KviApplication.cpp
 	extern KVIRC_API KviCryptEngineManager * g_pCryptEngineManager;
 #endif
 
 
-// kvi_app.cpp
+// KviApplication.cpp
 extern KVIRC_API KviPointerHashTable<QString,KviWindow> * g_pGlobalWindowDict;
 KviPointerList<KviUserWindow> * g_pUserWindowList = 0;
 
@@ -125,7 +125,7 @@ static bool window_kvs_cmd_clearOutput(KviKvsModuleCommandCall * c)
 		if(pWnd->view())pWnd->view()->clearBuffer();
 		if(pWnd->type() == KVI_WINDOW_TYPE_CHANNEL)
 		{
-			KviChannel *chan = (KviChannel *)pWnd;
+			KviChannelWindow *chan = (KviChannelWindow *)pWnd;
 			if(chan->messageView()) chan->messageView()->clearBuffer();
 		}
 	}
diff --git a/src/modules/window/userwindow.cpp b/src/modules/window/userwindow.cpp
index 6007e85fa..58c3c8f10 100644
--- a/src/modules/window/userwindow.cpp
+++ b/src/modules/window/userwindow.cpp
@@ -24,16 +24,16 @@
 
 #include "userwindow.h"
 
-#include "kvi_iconmanager.h"
-#include "kvi_input.h"
-#include "kvi_ircview.h"
-#include "kvi_frame.h"
-#include "kvi_console.h"
+#include "KviIconManager.h"
+#include "KviInput.h"
+#include "KviIrcView.h"
+#include "KviMainWindow.h"
+#include "KviConsoleWindow.h"
 
 extern KviPointerList<KviUserWindow> * g_pUserWindowList;
 
 
-KviUserWindow::KviUserWindow(KviFrame * pFrm,const char * name,int iIcon,KviConsole * pConsole,int iCreationFlags)
+KviUserWindow::KviUserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConsole * pConsole,int iCreationFlags)
 : KviWindow(KVI_WINDOW_TYPE_USERWINDOW,pFrm,name,pConsole)
 {
 	g_pUserWindowList->append(this);
diff --git a/src/modules/window/userwindow.h b/src/modules/window/userwindow.h
index fe4e372e7..7ba63d954 100644
--- a/src/modules/window/userwindow.h
+++ b/src/modules/window/userwindow.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 
 class KviUserWindow : public KviWindow
 {
@@ -33,7 +33,7 @@ class KviUserWindow : public KviWindow
 public:
 	enum CreationFlags { HasInput = 1 };
 public:
-	KviUserWindow(KviFrame * pFrm,const char * name,int iIcon,KviConsole * pConsole = 0,int iCreationFlags = 0);
+	KviUserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConsole * pConsole = 0,int iCreationFlags = 0);
 	~KviUserWindow();
 protected:
 	int m_iIcon;