More renaming and cleanup

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

3 files changed, 16 insertions, 16 deletions

diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
index 44cc175bb..1a91fc044 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/actioneditor.cpp
@@ -23,22 +23,22 @@
 //=============================================================================
 #include "actioneditor.h"
 
-#include "kvi_iconmanager.h"
-#include "kvi_options.h"
+#include "KviIconManager.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
-#include "kvi_imagedialog.h"
+#include "KviImageDialog.h"
 #include "KviConfigurationFile.h"
 #include "KviFileUtils.h"
-#include "kvi_scripteditor.h"
+#include "KviScriptEditor.h"
 #include "kvi_debug.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviQString.h"
-#include "kvi_kvs_aliasmanager.h"
-#include "kvi_filedialog.h"
-#include "kvi_actionmanager.h"
-#include "kvi_action.h"
-#include "kvi_kvs_useraction.h"
-#include "kvi_customtoolbarmanager.h"
+#include "KviKvsAliasManager.h"
+#include "KviFileDialog.h"
+#include "KviActionManager.h"
+#include "KviAction.h"
+#include "KviKvsUserAction.h"
+#include "KviCustomToolBarManager.h"
 #include "KviTalVBox.h"
 #include <KviTalGroupBox.h>
 #include "KviTalIconAndRichTextItemDelegate.h"
@@ -860,7 +860,7 @@ void KviActionEditor::commit()
 }
 
 
-KviActionEditorWindow::KviActionEditorWindow(KviFrame * lpFrm)
+KviActionEditorWindow::KviActionEditorWindow(KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"actioneditor",0)
 {
 	g_pActionEditorWindow = this;
diff --git a/src/modules/actioneditor/actioneditor.h b/src/modules/actioneditor/actioneditor.h
index ca9c0e8a1..a8e3e2b88 100644
--- a/src/modules/actioneditor/actioneditor.h
+++ b/src/modules/actioneditor/actioneditor.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include <QTreeWidget>
 
 #include <QWidget>
@@ -186,7 +186,7 @@ class KviActionEditorWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviActionEditorWindow(KviFrame * lpFrm);
+	KviActionEditorWindow(KviMainWindow * lpFrm);
 	~KviActionEditorWindow();
 protected:
 	KviActionEditor * m_pEditor;
diff --git a/src/modules/actioneditor/libkviactioneditor.cpp b/src/modules/actioneditor/libkviactioneditor.cpp
index 10ee5d2d4..720ed2599 100644
--- a/src/modules/actioneditor/libkviactioneditor.cpp
+++ b/src/modules/actioneditor/libkviactioneditor.cpp
@@ -24,9 +24,9 @@
 
 #include "actioneditor.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviLocale.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 
 KviActionEditorWindow * g_pActionEditorWindow = 0;