aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/objects
diff options
context:
space:
mode:
authorGravatar Robert Förster2014-11-21 14:34:32 +0000
committerGravatar Robert Förster2014-11-21 14:34:32 +0000
commit43e0468a233a49b1010f34c5ce888204fa4e9416 (patch)
treeb1f97b1b9fdfc72677b935d34e26c70fa7030feb /src/modules/objects
parentTrivial typo (diff)
downloadKVIrc-43e0468a233a49b1010f34c5ce888204fa4e9416.tar.gz
KVIrc-43e0468a233a49b1010f34c5ce888204fa4e9416.tar.bz2
KVIrc-43e0468a233a49b1010f34c5ce888204fa4e9416.zip
- massive trailing whitespace cleanup (yes, one of these "you can hate me for that" commits)
- apply patch by d00p: show the correct protocol version instead of just "SSLv3/TLSv1", thanks! - fix compilation on qt 5.4 on windows git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6398 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/objects')
-rw-r--r--src/modules/objects/KvsObject_http.cpp2
-rw-r--r--src/modules/objects/KvsObject_multiLineEdit.cpp2
-rw-r--r--src/modules/objects/KvsObject_pixmap.cpp8
-rw-r--r--src/modules/objects/KvsObject_socket.cpp24
-rw-r--r--src/modules/objects/KvsObject_webView.cpp2
-rw-r--r--src/modules/objects/KvsObject_widget.cpp2
6 files changed, 20 insertions, 20 deletions
diff --git a/src/modules/objects/KvsObject_http.cpp b/src/modules/objects/KvsObject_http.cpp
index 3983f5d90..21e93bf35 100644
--- a/src/modules/objects/KvsObject_http.cpp
+++ b/src/modules/objects/KvsObject_http.cpp
@@ -287,7 +287,7 @@ bool KvsObject_http::functionGet(KviKvsObjectFunctionCall *c)
KVSO_PARAMETER("remote_path",KVS_PT_STRING,0,szPath)
KVSO_PARAMETER("local_filename",KVS_PT_STRING,KVS_PF_OPTIONAL,szDest)
KVSO_PARAMETERS_END(c)
-
+
QFile * pFile=0;
if (!szDest.isEmpty())
{
diff --git a/src/modules/objects/KvsObject_multiLineEdit.cpp b/src/modules/objects/KvsObject_multiLineEdit.cpp
index 48dedf4fc..5c026c661 100644
--- a/src/modules/objects/KvsObject_multiLineEdit.cpp
+++ b/src/modules/objects/KvsObject_multiLineEdit.cpp
@@ -212,7 +212,7 @@ KVSO_BEGIN_REGISTERCLASS(KvsObject_textedit,"multilineedit","widget")
KVSO_REGISTER_HANDLER(KvsObject_textedit,"setPointSize", functionsetPointSize)
KVSO_REGISTER_HANDLER(KvsObject_textedit,"setReadOnly",functionSetReadOnly)
-
+
KVSO_REGISTER_HANDLER(KvsObject_textedit,"setTextFormat", functionsetTextFormat)
KVSO_REGISTER_HANDLER(KvsObject_textedit,"textFormat", functiontextFormat)
KVSO_REGISTER_HANDLER(KvsObject_textedit,"loadFile", functionloadFile);
diff --git a/src/modules/objects/KvsObject_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp
index fcb57a78d..55bf48f40 100644
--- a/src/modules/objects/KvsObject_pixmap.cpp
+++ b/src/modules/objects/KvsObject_pixmap.cpp
@@ -144,7 +144,7 @@ KVSO_CLASS_FUNCTION(pixmap,fill)
if (!var1->asInteger(iCol1))
{
var1->asString(szColor);
- if (c->paramCount()<2)
+ if (c->paramCount()<2)
iOpacity=255;
else {
if (!var2->asInteger(iOpacity))
@@ -362,11 +362,11 @@ KVSO_CLASS_FUNCTION(pixmap,rotate)
{
if (KviQString::equalCI(szAxis,"XAxis"))
axis=Qt::XAxis;
- else if (KviQString::equalCI(szAxis,"YAxis"))
+ else if (KviQString::equalCI(szAxis,"YAxis"))
axis=Qt::YAxis;
- else if (KviQString::equalCI(szAxis,"ZAxis"))
+ else if (KviQString::equalCI(szAxis,"ZAxis"))
axis=Qt::ZAxis;
- else
+ else
c->warning(__tr2qs_ctx("Unknown axis '%Q' switching to default ZAxis","objects"),&szAxis);
}
diff --git a/src/modules/objects/KvsObject_socket.cpp b/src/modules/objects/KvsObject_socket.cpp
index 571aff749..98cb3d217 100644
--- a/src/modules/objects/KvsObject_socket.cpp
+++ b/src/modules/objects/KvsObject_socket.cpp
@@ -109,7 +109,7 @@ const char * const sockerrors_tbl[] = {
4=Bound[br]
5=Closing[br]
6=Listening
-
+
!fn: $connect(<host>,<port>)
Attempts a connection to <host> on port <port>.[br]
<host> can be a numeric internet address (either Ipv4 or Ipv6 (if supported)) or a hostname.[br]
@@ -124,7 +124,7 @@ const char * const sockerrors_tbl[] = {
and you will be notified of the attempt result by an asynchronous event call:
in case of failure, $connectFailedEvent() will be called, in case of
succes, $connectEvent() will be called.
-
+
!fn: $listen([<port>[,<interface>[,<force_ipv6>]]])
Attempts to listen on the specified <port> and <interface>.[br]
If <port> is not passed it is assumed to be 0, if <interface> is not passed, it is assumed to be
@@ -136,14 +136,14 @@ const char * const sockerrors_tbl[] = {
On some systems listening in the IPV6 namespace allows to accept also IPV4 connections (this includes
linux but not windows afaik).[br]
When an incoming connection will arrive, $incomingConnectionEvent() will be called.
-
+
!fn: $connectedEvent()
This function is called when a connection attempt has been successfully completed.
The socket is actually connected to [classfnc:socket]$remoteIp[/classfnc]() on
[classfnc:socket]$remotePort[/classfnc](). You can start
writing data and you may expect [classfnc:socket]$dataAvailableEvent[/classfnc]() to be
triggered.
-
+
!fn: $incomingConnectionEvent(<socket:h_object>)
This function is called when an incoming connection arrives over a socket in listening state.[br]
You must return 1 if you to terminad this incoming connectioncall [classfnc:socket]$accept[/classfnc]() passing a newly created socket object
@@ -165,14 +165,14 @@ const char * const sockerrors_tbl[] = {
This function is called when some data is available to be read: the <data_length> parameter specifies
the length of the available data in bytes.[br]
You can use one of the $read* functions to obtain the data
-
+
!fn: $read(<length>[,<hobject>])
Reads at most <length> bytes of data from the socket. If <length> is anything "outside" the
available data range (<length> < 0 or <length> > available_data_length), this function
returns all the available data.[br]
By default this function can deal ascii data only: NULL characters are transformed to
ASCII characters 255. You can pass a [class]memorybuffer[/class] object to read binary data.
-
+
!fn: $write(<data, array,files or hobject>[,length])
Writes <data> to the socket.[br]
This function can deal with binary data passing a [class]memorybuffer[/class] object[br]
@@ -182,7 +182,7 @@ const char * const sockerrors_tbl[] = {
Using an array you can pass bytes or data string like this: @$write($array($(0xff),$(0xff),$(0xff),$(0xff),"This is an example"));
If you're going to [cmd]delete[/cmd] this object just after the $write call, you should
call [classfnc:socket]$close[/classfnc]() just before [cmd]delete[/cmd] to ensure the data delivery.
-
+
!fn: $close()
Resets this socket state: kills any pending or active connection. After a close() call
the socket may be used for a new connection.[br]
@@ -190,22 +190,22 @@ const char * const sockerrors_tbl[] = {
You don't need to call $close() if you [cmd]delete[/cmd] the socket: KVIrc will
reset the socket state automatically and free the memory. But if you want to ensure data delivery
after a $write call sequece and just before a [cmd]delete[/cmd], $close() is the only chance to do it.
-
+
!fn: $remoteIp()
Returns the IP address of the remote end of this socket.[br]
The return value is meaningful only if the socket is in connected or connecting state.
-
+
!fn: $setProtocol(<protocol>)
Let KVIrc use TCP or UDP protocol
-
+
!fn: $remotePort()
Returns the port of the remote end of this socket.[br]
The return value is meaningful only if the socket is in connected or connecting state.
-
+
!fn: $localIp()
Returns the IP address of the local end of this socket.[br]
The return value is meaningful only if the socket is in connected, listening or connecting state.
-
+
!fn: $localPort()
Returns the port of the local end of this socket.[br]
The return value is meaningful only if the socket is in connected, listening or connecting state.
diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp
index ba1758b45..90c7e051b 100644
--- a/src/modules/objects/KvsObject_webView.cpp
+++ b/src/modules/objects/KvsObject_webView.cpp
@@ -260,7 +260,7 @@ const char * const actions_tbl[] = {
Sets the link delegation policy: what happens when the users click on a link. Valid values:
[br] DontDelegateLinks: No links are delegated. Instead, webView tries to handle them all.
[br] DelegateExternalLinks: When activating links that point to documents not stored on the local filesystem or an equivalent then $linkClickedEvent() is executed.
- [br] DelegateAllLinks: Whenever a link is activated the $linkClickedEvent() is executed.
+ [br] DelegateAllLinks: Whenever a link is activated the $linkClickedEvent() is executed.
!fn: $linkClickedEvent()
This function can be called when the user clicks on a link, depending no the current link delegation policy.
The argument of the function is the url that has been clicked.[br]
diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp
index 0d93f72ab..1e7eafe9a 100644
--- a/src/modules/objects/KvsObject_widget.cpp
+++ b/src/modules/objects/KvsObject_widget.cpp
@@ -1741,7 +1741,7 @@ KVSO_CLASS_FUNCTION(widget,setFont)
QString szFamily;
QStringList szListStyle;
kvs_int_t iSize;
- KVSO_PARAMETERS_BEGIN(c)
+ KVSO_PARAMETERS_BEGIN(c)
KVSO_PARAMETER("family",KVS_PT_STRING,0,szFamily)
KVSO_PARAMETER("size",KVS_PT_INTEGER,0,iSize)
KVSO_PARAMETER("style",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,szListStyle)