More renaming & cleanup.

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

13 files changed, 22 insertions, 22 deletions

diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp
index 89c714025..6633bbad6 100644
--- a/src/modules/objects/class_groupbox.cpp
+++ b/src/modules/objects/class_groupbox.cpp
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include <kvi_tal_groupbox.h>
+#include <KviTalGroupBox.h>
 #include "class_groupbox.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
diff --git a/src/modules/objects/class_groupbox.h b/src/modules/objects/class_groupbox.h
index b1447e749..07320df56 100644
--- a/src/modules/objects/class_groupbox.h
+++ b/src/modules/objects/class_groupbox.h
@@ -27,7 +27,7 @@
 
 
 
-#include <kvi_tal_groupbox.h>
+#include <KviTalGroupBox.h>
 #include "class_widget.h"
 #include "object_macros.h"
 
diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp
index e224b95ec..b38310c65 100644
--- a/src/modules/objects/class_hbox.cpp
+++ b/src/modules/objects/class_hbox.cpp
@@ -26,7 +26,7 @@
 #include "kvi_debug.h"
 #include "KviLocale.h"
 #include "class_hbox.h"
-#include "kvi_tal_hbox.h"
+#include "KviTalHBox.h"
 
 const char * const align_tbl[] = {
 	"Left",
diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp
index 5621b87c1..c1a58580d 100644
--- a/src/modules/objects/class_mainwindow.cpp
+++ b/src/modules/objects/class_mainwindow.cpp
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "kvi_tal_mainwindow.h"
+#include "KviTalMainWindow.h"
 #include "class_mainwindow.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp
index 013fa945e..6c1b78fa7 100644
--- a/src/modules/objects/class_popupmenu.cpp
+++ b/src/modules/objects/class_popupmenu.cpp
@@ -30,7 +30,7 @@
 #include "kvi_debug.h"
 #include "KviLocale.h"
 #include "kvi_iconmanager.h"
-#include "kvi_tal_popupmenu.h"
+#include "KviTalPopupMenu.h"
 
 #include <QCursor>
 #include <QMenu>
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index e35c62654..a22082902 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -36,8 +36,8 @@
 #include "KviFileUtils.h"
 #include "KviLocale.h"
 #include "kvi_error.h"
-#include "kvi_netutils.h"
-#include "kvi_dns.h"
+#include "KviNetUtils.h"
+#include "KviDnsResolver.h"
 #include "kvi_error.h"
 #include "kvi_socket.h"
 #include "KviMemory.h"
@@ -1000,9 +1000,9 @@ void KviKvsObject_socket::lookupRemoteIp()
 	if(m_pDelayTimer)delete m_pDelayTimer;
 	m_pDelayTimer = 0;
 	if(m_pDns)delete m_pDns;
-	m_pDns = new KviDns();
-	connect(m_pDns,SIGNAL(lookupDone(KviDns *)),this,SLOT(lookupDone(KviDns *)));
-	if(!m_pDns->lookup(m_szRemoteIp,KviDns::Any))
+	m_pDns = new KviDnsResolver();
+	connect(m_pDns,SIGNAL(lookupDone(KviDnsResolver *)),this,SLOT(lookupDone(KviDnsResolver *)));
+	if(!m_pDns->lookup(m_szRemoteIp,KviDnsResolver::Any))
 	{
 		unsigned int uOldConnectionId = m_uConnectionId;
 		KviKvsVariantList lParams;
@@ -1013,10 +1013,10 @@ void KviKvsObject_socket::lookupRemoteIp()
 	}
 }
 
-void KviKvsObject_socket::lookupDone(KviDns *pDns)
+void KviKvsObject_socket::lookupDone(KviDnsResolver *pDns)
 {
 
-	if(pDns->state() != KviDns::Success)
+	if(pDns->state() != KviDnsResolver::Success)
 	{
 		unsigned int uOldConnectionId = m_uConnectionId;
 		KviKvsVariantList lParams;
diff --git a/src/modules/objects/class_socket.h b/src/modules/objects/class_socket.h
index a4e252693..40ac42d47 100644
--- a/src/modules/objects/class_socket.h
+++ b/src/modules/objects/class_socket.h
@@ -36,7 +36,7 @@
 #define KVI_SCRIPT_SOCKET_STATUS_LISTENING 3
 #define KVI_SCRIPT_SOCKET_STATUS_CONNECTED 4
 
-class KviDns;
+class KviDnsResolver;
 class KviDataBuffer;
 #include "object_macros.h"
 
@@ -56,7 +56,7 @@ protected:
 	kvi_u32_t          m_uLocalPort;
 	unsigned int       m_uConnectTimeout;
 	QSocketNotifier  * m_pSn;
-	KviDns           * m_pDns;
+	KviDnsResolver           * m_pDns;
 	QTimer           * m_pDelayTimer;
 	char				* m_pInBuffer;
 	unsigned int       m_uInBufferLen;
@@ -103,7 +103,7 @@ protected:
 protected slots:
 	void doConnect();
 	void lookupRemoteIp();
-	void lookupDone(KviDns * pDns);
+	void lookupDone(KviDnsResolver * pDns);
 	void connectTimeoutSlot();
 	void writeNotifierFired(int);
 	void readNotifierFired(int);
diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp
index b650d38b8..b572bbb08 100644
--- a/src/modules/objects/class_toolbar.cpp
+++ b/src/modules/objects/class_toolbar.cpp
@@ -26,8 +26,8 @@
 #include "class_toolbar.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
-#include "kvi_tal_toolbar.h"
-#include "kvi_tal_mainwindow.h"
+#include "KviTalToolBar.h"
+#include "KviTalMainWindow.h"
 #include "KviLocale.h"
 #include "kvi_iconmanager.h"
 #include "class_mainwindow.h"
diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp
index 0de288057..4e44c8efa 100644
--- a/src/modules/objects/class_toolbutton.cpp
+++ b/src/modules/objects/class_toolbutton.cpp
@@ -29,7 +29,7 @@
 
 #include "KviLocale.h"
 #include "kvi_iconmanager.h"
-#include "kvi_tal_popupmenu.h"
+#include "KviTalPopupMenu.h"
 /*
 	@doc:	toolbutton
 	@keyterms:
diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp
index 5ac157775..dbf172b5a 100644
--- a/src/modules/objects/class_vbox.cpp
+++ b/src/modules/objects/class_vbox.cpp
@@ -29,7 +29,7 @@
 
 #include "class_vbox.h"
 
-#include "kvi_tal_vbox.h"
+#include "KviTalVBox.h"
 
 
 // Tables used in $setAlignment & $alignment
diff --git a/src/modules/objects/class_widget.h b/src/modules/objects/class_widget.h
index f2575793c..3debaef5d 100644
--- a/src/modules/objects/class_widget.h
+++ b/src/modules/objects/class_widget.h
@@ -27,7 +27,7 @@
 
 #include "kvi_settings.h"
 #include "KviCString.h"
-#include "kvi_tal_tooltip.h"
+#include "KviTalToolTip.h"
 #include "object_macros.h"
 
 #ifdef COMPILE_WEBKIT_SUPPORT
diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp
index 5d7d5559e..b2b5b2127 100644
--- a/src/modules/objects/class_wizard.cpp
+++ b/src/modules/objects/class_wizard.cpp
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include <kvi_tal_wizard.h>
+#include <KviTalWizard.h>
 
 #include "class_wizard.h"
 #include "kvi_error.h"
diff --git a/src/modules/objects/class_wizard.h b/src/modules/objects/class_wizard.h
index 5b5ba6e63..1b71cd06e 100644
--- a/src/modules/objects/class_wizard.h
+++ b/src/modules/objects/class_wizard.h
@@ -25,7 +25,7 @@
 //
 //=============================================================================
 
-#include <kvi_tal_wizard.h>
+#include <KviTalWizard.h>
 #include "class_widget.h"
 #include "object_macros.h"