summaryrefslogtreecommitdiff
path: root/src/websockets/qwebsocket.h
Commit message (Collapse)AuthorAgeFilesLines
* Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-031-1/+1
| | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: Id9621ffedaf190f8b97db613a7c6be2a45f117b3 Task-number: QTBUG-45291 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Add open(const QNetworkRequest &) and request()Luca Niccoli2015-04-081-0/+3
| | | | | | | | | | | Request headers are not yet handled, only the QNetworkRequest::url() is taken into consideration. [ChangeLog][QWebSocket] Added open(const QNetworkRequest &) and request() Task-number: QTBUG-40842 Change-Id: Ia2e10f22c79b0a085afb9a2eb8437b7a73d4a045 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-161-6/+6
| | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I8467410bfad44e8d3fe6bd5724c61bb0c07c91f9 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-241-18/+10
| | | | | | | - Added LICENSE.LGPLv3, LICENSE.GPLv2 & LICENSE.LGPLv21 Change-Id: I0586e35a7aa99be1b5b3bda580b05897f451acbf Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Use 0 instead of Q_NULLPTR in public headers.v5.3.25.3.2Sergio Martins2014-07-111-1/+1
| | | | | | | | Otherwise Q_NULLPTR appears in documentation, which is inconsistent. Change-Id: I0f4b07b25c6012d502938aa452e68c75d910f954 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* fix compilation with QT_NO_NETWORKPROXYMaurice Kalinowski2014-03-181-0/+1
| | | | | Change-Id: Ice7ad51cbbde0ef2459642309c32dd392463754d Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* Adapt copyright headerKurt Pattyn2014-02-151-1/+1
| | | | | Change-Id: I9773492d3673d8aabdb4dd178be6af12eca7ba74 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add user configurable mask generationKurt Pattyn2014-02-151-0/+3
| | | | | | | | | Created a QMaskGenerator abstract base class to serve as a basis for user specific mask generators. Added the possibility to override the default mask generation in QWebSocket. Change-Id: Iaa02b44193f854d103b5f352617789175fe61f89 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Sanitize open() methodKurt Pattyn2014-02-071-1/+1
| | | | | | | | | Removed the mask parameter because a web socket client does not have a choice between masking and not masking. Change-Id: I3c33acc235bb2a99476abb6201e6dbb6f881dd70 Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Use QObjectPrivate instead of dedicated d-ptrKurt Pattyn2014-02-051-1/+0
| | | | | Change-Id: I3f69a2b0ca81e1e003200bb8e0a337b9532e64a0 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Remove superfluous Q_REQUIRED_RESULTKurt Pattyn2014-02-041-2/+2
| | | | | | Change-Id: Ie4e01a82082c45918b55e8588c7322dd359ba8c1 Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Remove socketOption functionalityKurt Pattyn2014-02-011-2/+0
| | | | | | | | | | Removed the setSocketOption() and socketOption(0 methods as they are not really relevant for web sockets. Also, internally for the underlying real socket the LowDelayOption and KeepAliveOption are already set. If ever needed, these methods can be added later. Change-Id: Ibfa279990c5277970eaa2dbc2dd3a7d0cce7154e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Removed unsupported functionalityKurt Pattyn2014-02-011-2/+0
| | | | | | | | | | Removed subprotocol and extension getter functionality, as this is currently not supported by QtWebSockets. I left the backend implementation intact (in the _p files), for future reference. Change-Id: Ia00739f6f225cd557ceb10b40c83fc81d98aae0b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Rename write methodsKurt Pattyn2014-01-201-2/+2
| | | | | | | | | Renamed the write methods to sendTextMessage and sendBinaryMessage respectively. This makes the code more readable. Change-Id: Ie49abf07a37f54c84bd01c5c788d2e42b28bcfdd Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Remove dubious functionsKurt Pattyn2014-01-201-2/+0
| | | | | Change-Id: Ida5c46e3e42685f5e78f2aee657d12af62286810 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Rename enumerations to comply with Qt styleKurt Pattyn2014-01-181-2/+2
| | | | | Change-Id: Id72fe27cec606e7f02b8e9ac1d0d763890e86a95 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Use const ref in public signalsFrederik Gladhorn2014-01-171-5/+5
| | | | | | Change-Id: I2846f668848395a820aabcc0359bcda2979bde1e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Limit line length to 100 characters.Kurt Pattyn2014-01-121-6/+8
| | | | | Change-Id: I9da963570b174b9a5a33e65cf144402677b4bab5 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Remove waitXXX() methods from websocketsKurt Pattyn2014-01-111-3/+0
| | | | | | | | | | | | | The QWebSocketServer::waitForNewConnection() was just calling QTcpServer::waitForNewConnection(), which was not correct because a connection is only complete when the handshake succeeds. Waiting for the handshake to complete would need a separate thread for the handshake handling code, which would complicate the code a lot. It was decided to leave out all waitXXX() methods from the module, as it is easier to add this functionality later, then to remove it. Change-Id: I778bae45b67f81e151ad2362f772c75e9f537ff0 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add optimizationsKurt Pattyn2013-12-231-1/+3
| | | | | Change-Id: Icd293f832e2d7a6272d4953c1994065d16222375 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add close code and close reason getter functionsKurt Pattyn2013-11-171-0/+2
| | | | | Change-Id: I4eeab1521054e4f4921d25c6a990eeb7486443cb Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Sanitize include directivesKurt Pattyn2013-11-061-4/+4
| | | | | Change-Id: I510e5e8f263d3ea08dd3d623b054d06b2911c6d6 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add correct license headersKurt Pattyn2013-11-011-20/+42
| | | | | Change-Id: I789cd780697aedbca7a90a5991df00b2c7e9ec98 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add functionality to ignore ssl errorsKurt Pattyn2013-11-011-0/+7
| | | | | Change-Id: I81248b9af104c0b3d37c9cfcef250a102f4b1d32 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Implement of secure web socketsKurt Pattyn2013-10-311-1/+11
| | | | | Change-Id: I1f96d5e4e327eae211fd6b458168e1f7607e2dcf Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Remove QtWebSockets from include directivesKurt Pattyn2013-10-151-2/+2
| | | | | | | Having QtWebSockets/ in front of the includes, results in a failing Windows build. Change-Id: I3b7f9ee3f1f06d4588a25a02324d1e1f0e4fde81 Reviewed-by: Steven Ceuppens <steven.ceuppens@icloud.com>
* make use of the new Q_NULLPTR keyword & shorten if(ptr) conditionsSteven Ceuppens2013-10-111-2/+2
| | | | | Change-Id: I4a71909134032d10b398ede74c431964bce7d675 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Update to fix minor compiler warningsSteven Ceuppens2013-10-011-2/+2
| | | | | Change-Id: I9b8e4cb5ad174faaf7d8c32a00a0b4b4c66edb68 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* update _global file, to match Qt defaultSteven Ceuppens2013-09-291-1/+2
| | | | | Change-Id: I4bbf6bd60abd93bd18947b8d2a9d42784aaea10b Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* removed unused includesSteven Ceuppens2013-09-291-3/+0
| | | | | Change-Id: I7b934942c77b1da566acf77dc46521975c3ecba4 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* whitesapce updatesSteven Ceuppens2013-09-291-1/+1
| | | | | Change-Id: I3e7feb9123868c558e5500c2142774df54afdfc6 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* update class & filenamesSteven Ceuppens2013-09-291-2/+2
| | | | | Change-Id: Idd2caa074f2f3feba99714bf6927ca879809ad47 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Changes to integrate the websocket module as a full Qt Add-On moduleSteven Ceuppens2013-09-281-0/+116
- Changed project files to use Qt structure - Moved existing sources into subdirectory, to make room for moduels - Created a "import/qmlwebsocket" module skeleton (works, but needs to be extended) - Modified examples to not use "include(.pri)", but use "QT += websocket" - Added qml example skeleton (works, but no useful functionality yet) Project can be build with: $ qmake $ make $ make install Module can be used in other projects with QT += websockets Change-Id: I2123026958b264670dbf8a978dee76edf5855806 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
View Lorry Controller Status