3 files changed, 14 insertions, 14 deletions
diff --git a/src/modules/popupeditor/libkvipopupeditor.cpp b/src/modules/popupeditor/libkvipopupeditor.cpp
index 9205866f8..ca0f7247c 100644
--- a/src/modules/popupeditor/libkvipopupeditor.cpp
+++ b/src/modules/popupeditor/libkvipopupeditor.cpp
@@ -24,9 +24,9 @@
 
 #include "popupeditor.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviLocale.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 
 
 KviPopupEditorWindow * g_pPopupEditorWindow = 0;
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index 31ff44e4c..14aeb3999 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -24,20 +24,20 @@
 
 #include "popupeditor.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 "kvi_filedialog.h"
+#include "KviFileDialog.h"
 #include "KviFileUtils.h"
-#include "kvi_scripteditor.h"
+#include "KviScriptEditor.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
-#include "kvi_kvs_popupmanager.h"
-#include "kvi_kvs_popupmenu.h"
-#include "kvi_kvs_variantlist.h"
+#include "KviApplication.h"
+#include "KviKvsPopupManager.h"
+#include "KviKvsPopupMenu.h"
+#include "KviKvsVariantList.h"
 #include "KviPointerHashTable.h"
 #include "KviTalVBox.h"
 #include "kvi_fileextensions.h"
@@ -1368,7 +1368,7 @@ void KviPopupEditor::getUniquePopupName(KviMenuTreeWidgetItem *item,QString &buf
 }
 
 
-KviPopupEditorWindow::KviPopupEditorWindow(KviFrame * lpFrm)
+KviPopupEditorWindow::KviPopupEditorWindow(KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"popupeditor",0)
 {
 	g_pPopupEditorWindow = this;
diff --git a/src/modules/popupeditor/popupeditor.h b/src/modules/popupeditor/popupeditor.h
index 37f29817e..6e41986b2 100644
--- a/src/modules/popupeditor/popupeditor.h
+++ b/src/modules/popupeditor/popupeditor.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviCString.h"
 #include <QTreeWidget>
 #include "KviTalPopupMenu.h"
@@ -186,7 +186,7 @@ class KviPopupEditorWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviPopupEditorWindow(KviFrame * lpFrm);
+	KviPopupEditorWindow(KviMainWindow * lpFrm);
 	~KviPopupEditorWindow();
 protected:
 	KviPopupEditor * m_pEditor;