From 4c47d7cbcb483810d8adb40b7aba993d6f5bc414 Mon Sep 17 00:00:00 2001
From: Noldor
Date: Wed, 15 Oct 2008 16:26:21 +0000
Subject: fixed some serious bugs in module object+code clean and improvements.

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2738 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/objects/class_dockwindow.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/modules/objects/class_dockwindow.cpp')

diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index c787733a6..40d83927a 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -91,7 +91,7 @@ bool KviKvsObject_dockwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariant
 
 KVSO_CLASS_FUNCTION(dockwindow,addWidget)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	kvs_hobject_t hWidget;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("widget",KVS_PT_HOBJECT,0,hWidget)
@@ -99,32 +99,32 @@ KVSO_CLASS_FUNCTION(dockwindow,addWidget)
 	if(hWidget == (kvs_hobject_t)0)
 	{
 		// null widget ?
-		c->warning(__tr2qs("Can't add a null object"));
+		c->warning(__tr2qs_ctx("Can't add a null object","objects"));
 		return true;
 	}
 
 	KviKvsObject * pWidget = KviKvsKernel::instance()->objectController()->lookupObject(hWidget);
 	if(!pWidget)
 	{
-		c->warning(__tr2qs("Invalid object handle passed as parameter (the object is no longer existing ?)"));
+		c->warning(__tr2qs_ctx("Invalid object handle passed as parameter (the object is no longer existing ?)","objects"));
 		return true;
 	}
 
 	if(!pWidget->object())
 	{
-		c->warning(__tr2qs("Object in invalid state"));
+		c->warning(__tr2qs_ctx("Object in invalid state","objects"));
 		return true;
 	}
 
 	if(!pWidget->object()->isWidgetType())
 	{
-		c->warning(__tr2qs("Can't set a non-widget object to be the main widget of a dock window"));
+		c->warning(__tr2qs_ctx("Can't set a non-widget object to be the main widget of a dock window","objects"));
 		return true;
 	}
 
 	if(((QWidget *)(pWidget->object()))->parent() != (QObject *)_pDockWindow)
 	{
-		c->warning(__tr2qs("The added widget is not a child of this dock window"));
+		c->warning(__tr2qs_ctx("The added widget is not a child of this dock window","objects"));
 	}
 
 	_pDockWindow->setWidget((QWidget *)(pWidget->object()));
@@ -133,7 +133,7 @@ KVSO_CLASS_FUNCTION(dockwindow,addWidget)
 // Fix me
 KVSO_CLASS_FUNCTION(dockwindow,resizeEnabled)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setBoolean(false);
 	return true;
 }
@@ -141,7 +141,7 @@ KVSO_CLASS_FUNCTION(dockwindow,resizeEnabled)
 // Fix me
 KVSO_CLASS_FUNCTION(dockwindow,setResizeEnabled)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	bool bResizeEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bResizeEnabled)
@@ -151,7 +151,7 @@ KVSO_CLASS_FUNCTION(dockwindow,setResizeEnabled)
 
 KVSO_CLASS_FUNCTION(dockwindow,setAllowedDockAreas)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	QString szFlags;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("docks",KVS_PT_STRING,0,szFlags)
@@ -177,7 +177,7 @@ KVSO_CLASS_FUNCTION(dockwindow,setAllowedDockAreas)
 
 KVSO_CLASS_FUNCTION(dockwindow,dock)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	QString szDock;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("dock",KVS_PT_STRING,0,szDock)
-- 
cgit v1.3.1-10-gc9f91