Beginning of 'the big rename & cleanup'. File names should match class names, when possible. Move classes to one per file. Move C functions to namespaces, if possible. Kill some abbreviations...

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

2 files changed, 16 insertions, 16 deletions

diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp
index 25fac73da..f9c12a4c1 100644
--- a/src/modules/ident/libkviident.cpp
+++ b/src/modules/ident/libkviident.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Tue Oct  2 18:22:04 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
@@ -29,7 +29,7 @@
 #include "kvi_app.h"
 #include "kvi_out.h"
 #include "kvi_netutils.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
 #include "kvi_window.h"
 #include "kvi_options.h"
 #include "kvi_defaults.h"
@@ -463,7 +463,7 @@ ipv6_failure:
 				if(idx != -1)
 				{
 					// Ok...parse the request
-					KviStr szReq = r->m_szData.left(idx);
+					KviCString szReq = r->m_szData.left(idx);
 					r->m_szData.cutLeft(idx + 1);
 					szReq.trimmed();
 
@@ -473,10 +473,10 @@ ipv6_failure:
 
 						if(kvi_strEqualCI("VERSION",szReq.ptr()))
 						{
-							KviStr reply("Quad-Echelon 7.12-r-244");
+							KviCString reply("Quad-Echelon 7.12-r-244");
 							kvi_socket_write(r->m_sock,reply.ptr(),reply.len());
 						} else {
-							KviStr reply(KviStr::Format,"%s : USERID : UNIX : %s\r\n",szReq.ptr(),m_szUser.ptr());
+							KviCString reply(KviCString::Format,"%s : USERID : UNIX : %s\r\n",szReq.ptr(),m_szUser.ptr());
 							kvi_socket_write(r->m_sock,reply.ptr(),reply.len());
 						}
 
diff --git a/src/modules/ident/libkviident.h b/src/modules/ident/libkviident.h
index 20f852992..8a2f2c88b 100644
--- a/src/modules/ident/libkviident.h
+++ b/src/modules/ident/libkviident.h
@@ -6,7 +6,7 @@
 //   Creation date : Tue Oct  2 18:22:05 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2010 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
@@ -24,12 +24,12 @@
 //
 //=============================================================================
 
-#include "kvi_thread.h"
+#include "KviThread.h"
 #include "kvi_sockettype.h"
-#include "kvi_string.h"
-#include "kvi_time.h"
+#include "KviCString.h"
+#include "KviTimeUtils.h"
 #include "kvi_settings.h"
-#include "kvi_pointerlist.h"
+#include "KviPointerList.h"
 
 #include <QObject>
 
@@ -40,17 +40,17 @@ public:
 	~KviIdentRequest();
 public:
 	kvi_socket_t       m_sock;
-	KviStr             m_szData;
-	KviStr             m_szHost;
+	KviCString             m_szData;
+	KviCString             m_szHost;
 	kvi_u32_t m_uPort;
 	time_t             m_tStart;
 };
 
 typedef struct _KviIdentMessageData
 {
-	KviStr             szMessage;
-	KviStr             szHost;
-	KviStr             szAux;
+	KviCString             szMessage;
+	KviCString             szHost;
+	KviCString             szAux;
 	unsigned int       uPort;
 } KviIdentMessageData;
 
@@ -71,7 +71,7 @@ public:
 	KviIdentDaemon();
 	~KviIdentDaemon();
 private:
-	KviStr                    m_szUser;
+	KviCString                    m_szUser;
 	kvi_u32_t        m_uPort;
 	bool                      m_bEnableIPv6;
 	bool                      m_bIPv6ContainsIPv4;