aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/objects
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/objects')
-rw-r--r--src/modules/objects/class_groupbox.cpp6
-rw-r--r--src/modules/objects/class_layout.cpp4
-rw-r--r--src/modules/objects/class_lcd.cpp31
-rw-r--r--src/modules/objects/class_listwidget.cpp2
-rw-r--r--src/modules/objects/class_memorybuffer.cpp4
-rw-r--r--src/modules/objects/class_popupmenu.cpp2
-rw-r--r--src/modules/objects/class_process.cpp2
-rw-r--r--src/modules/objects/class_socket.cpp6
8 files changed, 30 insertions, 27 deletions
diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp
index f9be717d4..f272ed193 100644
--- a/src/modules/objects/class_groupbox.cpp
+++ b/src/modules/objects/class_groupbox.cpp
@@ -310,7 +310,7 @@ KVSO_CLASS_FUNCTION(groupbox,setAlignment)
return true;
}
}
- c->warning(__tr2qs_ctx("Unknown alignment: 'Q'","objets"),&szAlign);
+ c->warning(__tr2qs_ctx("Unknown alignment: '%Q'","objets"),&szAlign);
return true;
}
@@ -343,9 +343,7 @@ KVSO_CLASS_FUNCTION(groupbox,setOrientation)
else
if(KviQString::equalCI(szMode, "Vertical"))
((KviTalGroupBox *)widget())->setOrientation(Qt::Horizontal);
- else c->warning( __tr2qs_ctx("Unknown orientation: 'Q'","objects"),&szMode);
+ else c->warning( __tr2qs_ctx("Unknown orientation: '%Q'","objects"),&szMode);
return true;
}
-
-
diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp
index 0507212bc..b32a72f4b 100644
--- a/src/modules/objects/class_layout.cpp
+++ b/src/modules/objects/class_layout.cpp
@@ -158,7 +158,7 @@ KVSO_CLASS_FUNCTION(layout,addWidget)
pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
if (!pObject)
{
- c->warning(__tr2qs_ctx("Widget parameter is not an object","objets"));
+ c->warning(__tr2qs_ctx("Widget parameter is not an object","objects"));
return true;
}
if (!pObject->object())
@@ -263,7 +263,7 @@ KVSO_CLASS_FUNCTION(layout,addRowSpacing)
KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,uRow)
KVSO_PARAMETER("spacing",KVS_PT_UNSIGNEDINTEGER,0,uSpacing)
KVSO_PARAMETERS_END(c)
- //((QGridLayout *)object())->addRowSpacing(uRow,uSpacing);
+ //((QGridLayout *)object())->addRowSpacing(uRow,uSpacing);
((QGridLayout *)object())->addItem(new QSpacerItem(0, uSpacing), uRow, 0);
return true;
}
diff --git a/src/modules/objects/class_lcd.cpp b/src/modules/objects/class_lcd.cpp
index 8610b2ba0..5f70501ca 100644
--- a/src/modules/objects/class_lcd.cpp
+++ b/src/modules/objects/class_lcd.cpp
@@ -94,6 +94,7 @@ bool KviKvsObject_lcd::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *p
SET_OBJECT(QLCDNumber)
return true;
}
+
KVSO_CLASS_FUNCTION(lcd,displayInt)
{
CHECK_INTERNAL_POINTER(widget())
@@ -101,8 +102,8 @@ KVSO_CLASS_FUNCTION(lcd,displayInt)
KVSO_PARAMETERS_BEGIN(c)
KVSO_PARAMETER("number",KVS_PT_INT,0,iDigit)
KVSO_PARAMETERS_END(c)
- ((QLCDNumber *)widget())->display((int)iDigit);
- return true;
+ ((QLCDNumber *)widget())->display((int)iDigit);
+ return true;
}
KVSO_CLASS_FUNCTION(lcd,displayStr)
@@ -112,8 +113,8 @@ KVSO_CLASS_FUNCTION(lcd,displayStr)
KVSO_PARAMETERS_BEGIN(c)
KVSO_PARAMETER("number",KVS_PT_STRING,0,szText)
KVSO_PARAMETERS_END(c)
- ((QLCDNumber *)widget())->display(szText);
- return true;
+ ((QLCDNumber *)widget())->display(szText);
+ return true;
}
KVSO_CLASS_FUNCTION(lcd,displayDouble)
@@ -124,8 +125,9 @@ KVSO_CLASS_FUNCTION(lcd,displayDouble)
KVSO_PARAMETER("number",KVS_PT_DOUBLE,0,dDigit)
KVSO_PARAMETERS_END(c)
((QLCDNumber *)widget())->display(dDigit);
- return true;
+ return true;
}
+
KVSO_CLASS_FUNCTION(lcd,setMode)
{
CHECK_INTERNAL_POINTER(widget())
@@ -137,9 +139,10 @@ KVSO_CLASS_FUNCTION(lcd,setMode)
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_ctx("Unknown mode: 'Q'","objects"),&szMode);
+ else c->warning( __tr2qs_ctx("Unknown mode: '%Q'","objects"),&szMode);
return true;
}
+
KVSO_CLASS_FUNCTION(lcd,setSegmentStyle)
{
CHECK_INTERNAL_POINTER(widget())
@@ -150,9 +153,10 @@ KVSO_CLASS_FUNCTION(lcd,setSegmentStyle)
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_ctx("Unknown segment style: 'Q'","objects"),&szStyle);
+ else c->warning( __tr2qs_ctx("Unknown segment style: '%Q'","objects"),&szStyle);
return true;
}
+
KVSO_CLASS_FUNCTION(lcd,setNumDigits)
{
CHECK_INTERNAL_POINTER(widget())
@@ -160,9 +164,10 @@ KVSO_CLASS_FUNCTION(lcd,setNumDigits)
KVSO_PARAMETERS_BEGIN(c)
KVSO_PARAMETER("digit",KVS_PT_DOUBLE,0,digit)
KVSO_PARAMETERS_END(c)
- ((QLCDNumber *)widget())->setNumDigits(digit);
- return true;
+ ((QLCDNumber *)widget())->setNumDigits(digit);
+ return true;
}
+
KVSO_CLASS_FUNCTION(lcd,setSmallDecimalPoint)
{
CHECK_INTERNAL_POINTER(widget())
@@ -170,7 +175,7 @@ KVSO_CLASS_FUNCTION(lcd,setSmallDecimalPoint)
KVSO_PARAMETERS_BEGIN(c)
KVSO_PARAMETER("bflag",KVS_PT_BOOLEAN,0,bFlag)
KVSO_PARAMETERS_END(c)
- ((QLCDNumber *)widget())->setSmallDecimalPoint(bFlag);
+ ((QLCDNumber *)widget())->setSmallDecimalPoint(bFlag);
return true;
}
KVSO_CLASS_FUNCTION(lcd,checkOverflow)
@@ -180,8 +185,6 @@ KVSO_CLASS_FUNCTION(lcd,checkOverflow)
KVSO_PARAMETERS_BEGIN(c)
KVSO_PARAMETER("digit",KVS_PT_DOUBLE,0,iDigit)
KVSO_PARAMETERS_END(c)
- c->returnValue()->setBoolean(((QLCDNumber *)widget())->checkOverflow(iDigit));
- return true;
+ c->returnValue()->setBoolean(((QLCDNumber *)widget())->checkOverflow(iDigit));
+ return true;
}
-
-
diff --git a/src/modules/objects/class_listwidget.cpp b/src/modules/objects/class_listwidget.cpp
index ab4a6aad0..3a877722d 100644
--- a/src/modules/objects/class_listwidget.cpp
+++ b/src/modules/objects/class_listwidget.cpp
@@ -300,7 +300,7 @@ KVSO_CLASS_FUNCTION(listwidget,insertWidgetItem)
pObject=KviKvsKernel::instance()->objectController()->lookupObject(hWid);
if(pObject==this)
{
- c->warning(__tr2qs_ctx("Can't insert the listwidget itelf!","objects"));
+ c->warning(__tr2qs_ctx("Can't insert the listwidget itself!","objects"));
return true;
}
if(!pObject->object()->isWidgetType())
diff --git a/src/modules/objects/class_memorybuffer.cpp b/src/modules/objects/class_memorybuffer.cpp
index 9413ced2c..8690b0d60 100644
--- a/src/modules/objects/class_memorybuffer.cpp
+++ b/src/modules/objects/class_memorybuffer.cpp
@@ -24,6 +24,7 @@
//=============================================================================
#include "class_memorybuffer.h"
+
#include "kvi_error.h"
#include "kvi_debug.h"
#include "kvi_settings.h"
@@ -31,6 +32,7 @@
#include "kvi_process.h"
#include "kvi_fileutils.h"
#include "kvi_file.h"
+
#include <QFileInfo>
/*
@@ -87,7 +89,7 @@ KVSO_CLASS_FUNCTION(memorybuffer,loadFromFile)
f.load(*m_pBuffer);
f.close();
}
- else c->warning(__tr2qs_ctx("The file '%Q' does not exists","objects"),&szFileName);
+ else c->warning(__tr2qs_ctx("The file '%Q' does not exist","objects"),&szFileName);
return true;
}
KVSO_CLASS_FUNCTION(memorybuffer,saveToFile)
diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp
index a540645f5..66a2eb66c 100644
--- a/src/modules/objects/class_popupmenu.cpp
+++ b/src/modules/objects/class_popupmenu.cpp
@@ -212,7 +212,7 @@ KVSO_CLASS_FUNCTION(popupmenu,insertItem)
{
pix = g_pIconManager->getImage(szIcon);
if (pix) action=((QMenu *)widget())->addAction(*pix,szItem);
- else c->warning(__tr2qs_ctx("pix '%Q' doesn't exists","objects"),&szIcon);
+ else c->warning(__tr2qs_ctx("Icon '%Q' doesn't exist","objects"),&szIcon);
}
else
action=((QMenu *)widget())->addAction(szItem);
diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp
index 14cd63b08..beb75636b 100644
--- a/src/modules/objects/class_process.cpp
+++ b/src/modules/objects/class_process.cpp
@@ -218,7 +218,7 @@ KVSO_CLASS_FUNCTION(process,startProcess)
if(m_pProcess->state()==KviProcess::NotRunning)
{
- c->warning( __tr2qs_ctx("Process could not be starded.","objects"));
+ c->warning( __tr2qs_ctx("Process could not be started.","objects"));
}
return true;
}
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index 242dadcb2..ff8528c0e 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -607,7 +607,7 @@ KVSO_CLASS_FUNCTION(socket,writeHex)
KVSO_PARAMETERS_END(c)
if (m_szHex.length()%2)
{
- c->warning(__tr2qs_ctx("Lenght of hex string is not multiple 2","objects"));
+ c->warning(__tr2qs_ctx("The hex string lenght is not a multiple of 2","objects"));
return true;
}
unsigned char byte,lsb,msb;
@@ -932,13 +932,13 @@ void KviKvsObject_socket::doConnect()
if(!sa.socketAddress())
{
unsigned int uOldConnectionId = m_uConnectionId;
- QString ipAddressError=__tr2qs_ctx("Invalid ip address ","objects");
+ QString ipAddressError=__tr2qs_ctx("Invalid IP address ","objects");
ipAddressError.append(m_szRemoteIp);
KviKvsVariantList params;
QString tmp;
- KviQString::sprintf(tmp,__tr2qs_ctx("Invalid ip address (%Q)","objects"),&m_szRemoteIp);
+ KviQString::sprintf(tmp,__tr2qs_ctx("Invalid IP address (%Q)","objects"),&m_szRemoteIp);
params.append(new KviKvsVariant(tmp));
callFunction(this,"connectFailedEvent",&params);
if(m_uConnectionId == uOldConnectionId)reset();
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 12:50:46 +0000