From 9e0effdc52a48f6ffe9ee04451b762c639fff688 Mon Sep 17 00:00:00 2001
From: Noldor
Date: Thu, 16 Oct 2008 12:28:36 +0000
Subject: more works on objects module (locale stuff+some fixes+code clean)

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

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

diff --git a/src/modules/objects/class_lcd.cpp b/src/modules/objects/class_lcd.cpp
index 2ee34b6f0..8610b2ba0 100644
--- a/src/modules/objects/class_lcd.cpp
+++ b/src/modules/objects/class_lcd.cpp
@@ -96,85 +96,91 @@ bool KviKvsObject_lcd::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *p
 }
 KVSO_CLASS_FUNCTION(lcd,displayInt)
 {
+	CHECK_INTERNAL_POINTER(widget())	
 	kvs_int_t iDigit;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("number",KVS_PT_INT,0,iDigit)
 	KVSO_PARAMETERS_END(c)
-    if(widget())((QLCDNumber *)widget())->display((int)iDigit);
+    ((QLCDNumber *)widget())->display((int)iDigit);
     return true;
 }
 
 KVSO_CLASS_FUNCTION(lcd,displayStr)
 {
+	CHECK_INTERNAL_POINTER(widget())	
 	QString szText;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("number",KVS_PT_STRING,0,szText)
 	KVSO_PARAMETERS_END(c)
-    if(widget()) ((QLCDNumber *)widget())->display(szText);
+    ((QLCDNumber *)widget())->display(szText);
     return true;
 }
 
 KVSO_CLASS_FUNCTION(lcd,displayDouble)
 {
+	CHECK_INTERNAL_POINTER(widget())	
 	kvs_real_t dDigit;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("number",KVS_PT_DOUBLE,0,dDigit)
 	KVSO_PARAMETERS_END(c)
-    if(widget()) ((QLCDNumber *)widget())->display(dDigit);
+	((QLCDNumber *)widget())->display(dDigit);
     return true;
 }
 KVSO_CLASS_FUNCTION(lcd,setMode)
 {
+	CHECK_INTERNAL_POINTER(widget())	
 	QString szMode;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("mode",KVS_PT_STRING,0,szMode)
 	KVSO_PARAMETERS_END(c)
-	if(!widget())return true;
 	if(KviQString::equalCI(szMode, "HEX")) ((QLCDNumber *)widget())->setHexMode();
 	else if(KviQString::equalCI(szMode, "DEC")) ((QLCDNumber *)widget())->setDecMode();
 	else if(KviQString::equalCI(szMode, "BIN")) ((QLCDNumber *)widget())->setBinMode();
 	else if(KviQString::equalCI(szMode, "OCT")) ((QLCDNumber *)widget())->setOctMode();
-	else c->warning( __tr2qs("Unknown mode "));
+	else c->warning( __tr2qs_ctx("Unknown mode: 'Q'","objects"),&szMode);
 	return true;
 }
 KVSO_CLASS_FUNCTION(lcd,setSegmentStyle)
 {
+	CHECK_INTERNAL_POINTER(widget())	
 	QString szStyle;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("style",KVS_PT_STRING,0,szStyle)
 	KVSO_PARAMETERS_END(c)
-	if(!widget())return true;
 	if(KviQString::equalCI(szStyle, "Outline")) ((QLCDNumber *)widget())->setSegmentStyle(QLCDNumber::Outline);
 	else if(KviQString::equalCI(szStyle, "Filled")) ((QLCDNumber *)widget())->setSegmentStyle(QLCDNumber::Filled);
 	else if(KviQString::equalCI(szStyle, "Flat")) ((QLCDNumber *)widget())->setSegmentStyle(QLCDNumber::Flat);
-	else c->warning( __tr2qs("Unknown segment style "));
+	else c->warning( __tr2qs_ctx("Unknown segment style: 'Q'","objects"),&szStyle);
 	return true;
 }
 KVSO_CLASS_FUNCTION(lcd,setNumDigits)
 {
+	CHECK_INTERNAL_POINTER(widget())	
 	kvs_real_t digit;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("digit",KVS_PT_DOUBLE,0,digit)
 	KVSO_PARAMETERS_END(c)
-    if(widget()) ((QLCDNumber *)widget())->setNumDigits(digit);
+    ((QLCDNumber *)widget())->setNumDigits(digit);
     return true;
 }
 KVSO_CLASS_FUNCTION(lcd,setSmallDecimalPoint)
 {
+	CHECK_INTERNAL_POINTER(widget())	
 	bool bFlag;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("bflag",KVS_PT_BOOLEAN,0,bFlag)
 	KVSO_PARAMETERS_END(c)
-    if(widget()) ((QLCDNumber *)widget())->setSmallDecimalPoint(bFlag);
+    ((QLCDNumber *)widget())->setSmallDecimalPoint(bFlag);
 	return true;
 }
 KVSO_CLASS_FUNCTION(lcd,checkOverflow)
 {
+	CHECK_INTERNAL_POINTER(widget())	
 	kvs_real_t iDigit;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("digit",KVS_PT_DOUBLE,0,iDigit)
 	KVSO_PARAMETERS_END(c)
-    if(widget())c->returnValue()->setBoolean(((QLCDNumber *)widget())->checkOverflow(iDigit));
+    c->returnValue()->setBoolean(((QLCDNumber *)widget())->checkOverflow(iDigit));
     return true;
 }
 
-- 
cgit v1.3.1-10-gc9f91