aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/objects
diff options
context:
space:
mode:
authorGravatar un1versal2015-10-08 13:39:40 +0100
committerGravatar un1versal2015-10-08 17:39:58 +0100
commit382a6b70bf65bc9776b084a600e4025a249c1665 (patch)
tree77d1de4a06bd793fcefe541ff517fdacf03c0763 /src/modules/objects
parent[ci skip] cpp file typos and capitalization corrections (diff)
downloadKVIrc-382a6b70bf65bc9776b084a600e4025a249c1665.tar.gz
KVIrc-382a6b70bf65bc9776b084a600e4025a249c1665.tar.bz2
KVIrc-382a6b70bf65bc9776b084a600e4025a249c1665.zip
[ci skip] cpp files, capitalization, typos, syntax normalization and punctuation
Diffstat (limited to 'src/modules/objects')
-rw-r--r--src/modules/objects/KvsObject_file.cpp6
-rw-r--r--src/modules/objects/KvsObject_listWidget.cpp2
-rw-r--r--src/modules/objects/KvsObject_tableWidget.cpp8
-rw-r--r--src/modules/objects/KvsObject_treeWidgeteItem.cpp2
-rw-r--r--src/modules/objects/KvsObject_widget.cpp8
5 files changed, 13 insertions, 13 deletions
diff --git a/src/modules/objects/KvsObject_file.cpp b/src/modules/objects/KvsObject_file.cpp
index cf46dc252..6fc521667 100644
--- a/src/modules/objects/KvsObject_file.cpp
+++ b/src/modules/objects/KvsObject_file.cpp
@@ -334,7 +334,7 @@ KVSO_CLASS_FUNCTION(file,putch)
KVSO_PARAMETERS_END(c)
if (szChar.length()>1)c->warning(__tr2qs_ctx("Argument too long, using only first char","objects"));
const char *ch=szChar.toUtf8().data();
- if (!m_pFile->putChar(ch[0])) c->warning(__tr2qs_ctx("Write error occured!","objects"));
+ if (!m_pFile->putChar(ch[0])) c->warning(__tr2qs_ctx("Write error occurred!","objects"));
return true;
}
@@ -343,7 +343,7 @@ KVSO_CLASS_FUNCTION(file,getch)
CHECK_INTERNAL_POINTER(m_pFile)
CHECK_FILE_IS_OPEN
char ch;
- if (!m_pFile->getChar(&ch)) c->warning(__tr2qs_ctx("Read error occured!","objects")); // c->error ?
+ if (!m_pFile->getChar(&ch)) c->warning(__tr2qs_ctx("Read error occurred!","objects")); // c->error ?
QString szChar = QChar(ch);
c->returnValue()->setString(szChar);
return true;
@@ -354,7 +354,7 @@ KVSO_CLASS_FUNCTION(file,readByte)
CHECK_INTERNAL_POINTER(m_pFile)
CHECK_FILE_IS_OPEN
char ch;
- if (!m_pFile->getChar(&ch)) c->warning(__tr2qs_ctx("Read error occured!","objects")); // c->error ?
+ if (!m_pFile->getChar(&ch)) c->warning(__tr2qs_ctx("Read error occurred!","objects")); // c->error ?
//QString szChar = QChar(ch);
c->returnValue()->setInteger((kvs_int_t) ch);
return true;
diff --git a/src/modules/objects/KvsObject_listWidget.cpp b/src/modules/objects/KvsObject_listWidget.cpp
index 972f563a2..6dba669c8 100644
--- a/src/modules/objects/KvsObject_listWidget.cpp
+++ b/src/modules/objects/KvsObject_listWidget.cpp
@@ -352,7 +352,7 @@ KVSO_CLASS_FUNCTION(listWidget,setIcon)
pix=g_pIconManager->getImage(szPix);
if(!pix)
{
- c->warning(__tr2qs_ctx("Error occured: the suitable file '%Q' is not of the correct format or it is not a valid icon number.","objects"),&szPix);
+ c->warning(__tr2qs_ctx("Error occurred: the suitable file '%Q' is not of the correct format or it is not a valid icon number.","objects"),&szPix);
return true;
}
}
diff --git a/src/modules/objects/KvsObject_tableWidget.cpp b/src/modules/objects/KvsObject_tableWidget.cpp
index 8b127e936..796d94694 100644
--- a/src/modules/objects/KvsObject_tableWidget.cpp
+++ b/src/modules/objects/KvsObject_tableWidget.cpp
@@ -347,17 +347,17 @@ KVSO_CLASS_FUNCTION(tableWidget,setForeground)
color.setNamedColor(szColor);
if (!color.isValid())
{
- // itsn't a color name: let try with an hex triplette
+ // isn't a color name: lets try with an hex triplet
color.setNamedColor("#"+szColor);
if (!color.isValid())
{
- c->warning(__tr2qs_ctx("Not a valid color !","objects"));
+ c->warning(__tr2qs_ctx("Not a valid color!","objects"));
return true;
}
}
}
else {
- c->warning(__tr2qs_ctx("Not a valid color !","objects"));
+ c->warning(__tr2qs_ctx("Not a valid color!","objects"));
return true;
}
QBrush brush(color);
@@ -499,7 +499,7 @@ KVSO_CLASS_FUNCTION(tableWidget,setIcon)
pix=g_pIconManager->getImage(szPix);
if(!pix)
{
- c->warning(__tr2qs_ctx("Error occured: the suitable file '%Q' is not of the correct format or it is not a valid icon number.","objects"),&szPix);
+ c->warning(__tr2qs_ctx("Error occurred: the suitable file '%Q' is not of the correct format or it is not a valid icon number.","objects"),&szPix);
return true;
}
}
diff --git a/src/modules/objects/KvsObject_treeWidgeteItem.cpp b/src/modules/objects/KvsObject_treeWidgeteItem.cpp
index 7da3a2920..5c8e08b85 100644
--- a/src/modules/objects/KvsObject_treeWidgeteItem.cpp
+++ b/src/modules/objects/KvsObject_treeWidgeteItem.cpp
@@ -420,7 +420,7 @@ KVSO_CLASS_FUNCTION(treeWidgetItem,setPixmap)
pix=g_pIconManager->getImage(szPix);
if(!pix)
{
- c->warning(__tr2qs_ctx("Error occured: the suitable file '%Q' is not of the correct format or it is not a valid icon number.","objects"),&szPix);
+ c->warning(__tr2qs_ctx("Error occurred: the suitable file '%Q' is not of the correct format or it is not a valid icon number.","objects"),&szPix);
return true;
}
}
diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp
index 90222b8a5..977850d61 100644
--- a/src/modules/objects/KvsObject_widget.cpp
+++ b/src/modules/objects/KvsObject_widget.cpp
@@ -1276,13 +1276,13 @@ KVSO_CLASS_FUNCTION(widget,setForegroundColor)
color.setNamedColor("#"+szColor);
if (!color.isValid())
{
- c->warning(__tr2qs_ctx("Not a valid color !","objects"));
+ c->warning(__tr2qs_ctx("Not a valid color!","objects"));
return true;
}
}
}
else {
- c->warning(__tr2qs_ctx("Not a valid color !","objects"));
+ c->warning(__tr2qs_ctx("Not a valid color!","objects"));
return true;
}
QPalette p = widget()->palette();
@@ -1358,13 +1358,13 @@ KVSO_CLASS_FUNCTION(widget,setBackgroundColor)
color.setNamedColor("#"+szColor);
if (!color.isValid())
{
- c->warning(__tr2qs_ctx("Not a valid color !","objects"));
+ c->warning(__tr2qs_ctx("Not a valid color!","objects"));
return true;
}
}
}
else {
- c->warning(__tr2qs_ctx("Not a valid color !","objects"));
+ c->warning(__tr2qs_ctx("Not a valid color!","objects"));
return true;
}
QPalette p = widget()->palette();