6 files changed, 26 insertions, 26 deletions
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 6df0a77fb..e08181b0b 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -32,16 +32,16 @@
 #include "KviLocale.h"
 #include "KviIrcMask.h"
 #include "kvi_debug.h"
-#include "kvi_iconmanager.h"
-#include "kvi_app.h"
-#include "kvi_options.h"
+#include "KviIconManager.h"
+#include "KviApplication.h"
+#include "KviOptions.h"
 #include "KviFile.h"
-#include "kvi_filedialog.h"
-#include "kvi_msgbox.h"
+#include "KviFileDialog.h"
+#include "KviMessageBox.h"
 #include "KviFileUtils.h"
 #include "kvi_settings.h"
 #include "KviStringConversion.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviPointerHashTable.h"
 #include "KviTalHBox.h"
 #include "KviTalVBox.h"
@@ -896,7 +896,7 @@ void KviRegisteredUsersDialog::importClicked()
 			int rnm = 0 ;
 			do
 			{
-				g_pApp->getLocalKvircDirectory(fPath,KviApp::Avatars,fName);
+				g_pApp->getLocalKvircDirectory(fPath,KviApplication::Avatars,fName);
 				fPath.append(QString("%1.png").arg(rnm));
 				rnm++;
 			} while(KviFileUtils::fileExists(fPath));
diff --git a/src/modules/reguser/dialog.h b/src/modules/reguser/dialog.h
index e3eff6420..1d41209d3 100644
--- a/src/modules/reguser/dialog.h
+++ b/src/modules/reguser/dialog.h
@@ -26,7 +26,7 @@
 
 #include "KviCString.h"
 #include "KviRegisteredUserDataBase.h"
-#include "kvi_selectors.h"
+#include "KviSelectors.h"
 #include "KviPointerHashTable.h"
 #include <QTreeWidget>
 #include "KviTalListWidget.h"
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index d49c2404f..711a52637 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -32,16 +32,16 @@
 #include "KviLocale.h"
 #include "KviIrcMask.h"
 #include "kvi_debug.h"
-#include "kvi_iconmanager.h"
-#include "kvi_app.h"
-#include "kvi_options.h"
+#include "KviIconManager.h"
+#include "KviApplication.h"
+#include "KviOptions.h"
 #include "KviFile.h"
-#include "kvi_filedialog.h"
-#include "kvi_msgbox.h"
+#include "KviFileDialog.h"
+#include "KviMessageBox.h"
 #include "KviFileUtils.h"
 #include "kvi_settings.h"
 #include "KviStringConversion.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviPointerHashTable.h"
 #include "KviTalHBox.h"
 #include "KviTalVBox.h"
@@ -62,7 +62,7 @@
 #include <QEvent>
 #include <QCloseEvent>
 
-// kvi_app.cpp
+// KviApplication.cpp
 extern KviRegisteredUsersDialog * g_pRegisteredUsersDialog;
 
 KviRegisteredUserDataBase * g_pLocalRegisteredUserDataBase; // local copy!
diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/edituser.h
index aa5d6fece..43855cc89 100644
--- a/src/modules/reguser/edituser.h
+++ b/src/modules/reguser/edituser.h
@@ -26,7 +26,7 @@
 
 #include "KviCString.h"
 #include "KviRegisteredUserDataBase.h"
-#include "kvi_selectors.h"
+#include "KviSelectors.h"
 #include "KviPointerHashTable.h"
 #include <QTreeWidget>
 #include "KviTalPopupMenu.h"
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index 34bc5115f..e514cae9d 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -24,19 +24,19 @@
 
 #include "edituser.h"
 #include "wizard.h"
-#include "kvi_ircconnection.h"
+#include "KviIrcConnection.h"
 #include "dialog.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviRegisteredUserDataBase.h"
 #include "KviIrcUserDataBase.h"
 #include "kvi_out.h"
 #include "KviMircCntrl.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
-#include "kvi_window.h"
-#include "kvi_frame.h"
+#include "KviApplication.h"
+#include "KviWindow.h"
+#include "KviMainWindow.h"
 #include "KviPointerList.h"
 
 #include <QSplitter> // FIXME: REmove this!
@@ -46,7 +46,7 @@
 
 //#warning "THIS MODULE HAS TO BE REVISED (notify list consistency!!!)"
 
-// kvi_app.cpp
+// KviApplication.cpp
 
 
 extern KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase;
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp
index 86b888ead..bb14d71aa 100644
--- a/src/modules/reguser/wizard.cpp
+++ b/src/modules/reguser/wizard.cpp
@@ -27,12 +27,12 @@
 
 #include "KviLocale.h"
 #include "KviPointerList.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviIrcMask.h"
-#include "kvi_selectors.h"
+#include "KviSelectors.h"
 #include "KviPixmap.h"
 #include "KviRegisteredUserDataBase.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 #include <QDesktopWidget>
 #include <QLabel>