More renaming and cleanup

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

5 files changed, 15 insertions, 15 deletions

diff --git a/src/modules/term/libkviterm.cpp b/src/modules/term/libkviterm.cpp
index 851715b5f..4001d8e7c 100644
--- a/src/modules/term/libkviterm.cpp
+++ b/src/modules/term/libkviterm.cpp
@@ -23,9 +23,9 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_module.h"
-#include "kvi_window.h"
-#include "kvi_frame.h"
+#include "KviModule.h"
+#include "KviWindow.h"
+#include "KviMainWindow.h"
 #include "KviPointerList.h"
 
 #include <QSplitter>
diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp
index efa4e099b..ad153f02d 100644
--- a/src/modules/term/termwidget.cpp
+++ b/src/modules/term/termwidget.cpp
@@ -25,9 +25,9 @@
 #include "termwidget.h"
 #include "termwindow.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 "KviPointerList.h"
 
@@ -46,7 +46,7 @@
 	extern KviPointerList<KviTermWidget> * g_pTermWidgetList;
 	extern KviPointerList<KviTermWindow> * g_pTermWindowList;
 
-	KviTermWidget::KviTermWidget(QWidget * par,KviFrame *,bool bIsStandalone)
+	KviTermWidget::KviTermWidget(QWidget * par,KviMainWindow *,bool bIsStandalone)
 	: QFrame(par)
 	{
 		setObjectName("term_widget");
diff --git a/src/modules/term/termwidget.h b/src/modules/term/termwidget.h
index d8ec94900..a0ad9cdbb 100644
--- a/src/modules/term/termwidget.h
+++ b/src/modules/term/termwidget.h
@@ -34,14 +34,14 @@
 
 	#include "kparts/part.h"
 
-	class KviFrame;
+	class KviMainWindow;
 
 	class KviTermWidget : public QFrame
 	{
 		Q_OBJECT
 		Q_PROPERTY( int KviProperty_ChildFocusOwner READ dummy )
 	public:
-		KviTermWidget(QWidget * par,KviFrame * lpFrm,bool bIsStandalone = false);
+		KviTermWidget(QWidget * par,KviMainWindow * lpFrm,bool bIsStandalone = false);
 		~KviTermWidget();
 	private:
 		KviTalHBox   * m_pHBox;
diff --git a/src/modules/term/termwindow.cpp b/src/modules/term/termwindow.cpp
index 5b3ff0cb7..e586cbb4e 100644
--- a/src/modules/term/termwindow.cpp
+++ b/src/modules/term/termwindow.cpp
@@ -26,17 +26,17 @@
 #include "termwidget.h"
 
 #ifdef COMPILE_KDE_SUPPORT
-	#include "kvi_iconmanager.h"
-	#include "kvi_options.h"
+	#include "KviIconManager.h"
+	#include "KviOptions.h"
 	#include "KviLocale.h"
-	#include "kvi_module.h"
+	#include "KviModule.h"
 
 	extern KviModule * g_pTermModule;
 	extern KviPointerList<KviTermWindow> * g_pTermWindowList;
 	extern KviPointerList<KviTermWidget> * g_pTermWidgetList;
 	extern KviIconManager * g_pIconManager;
 
-	KviTermWindow::KviTermWindow(KviFrame * lpFrm,const char * name)
+	KviTermWindow::KviTermWindow(KviMainWindow * lpFrm,const char * name)
 	: KviWindow(KVI_WINDOW_TYPE_TERM,lpFrm,name)
 	{
 		g_pTermWindowList->append(this);
diff --git a/src/modules/term/termwindow.h b/src/modules/term/termwindow.h
index 466520b64..556469ea2 100644
--- a/src/modules/term/termwindow.h
+++ b/src/modules/term/termwindow.h
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 
 #ifdef COMPILE_KDE_SUPPORT
-	#include "kvi_window.h"
+	#include "KviWindow.h"
 	#include "KviCString.h"
 
 	class KviTermWidget;
@@ -36,7 +36,7 @@
 	{
 		Q_OBJECT
 	public:
-		KviTermWindow(KviFrame * lpFrm,const char * name);
+		KviTermWindow(KviMainWindow * lpFrm,const char * name);
 		~KviTermWindow();
 	protected:
 		KviTermWidget * m_pTermWidget;