diff options
| author | Jouni Roivas <jroivas@iki.fi> | 2014-01-14 00:30:43 +0200 |
|---|---|---|
| committer | Jouni Roivas <jroivas@iki.fi> | 2014-01-14 00:30:43 +0200 |
| commit | eb954450558344651e7589c5491488b8356a95be (patch) | |
| tree | 3419d5c594cc6a108412617511ec29ea23c21b3e /src | |
| parent | b3480884915e9ee04846945cda9800216c55668f (diff) | |
License formatting. Fix cover page information.
Diffstat (limited to 'src')
| -rw-r--r-- | src/watchconnector.cpp | 1 | ||||
| -rw-r--r-- | src/watchconnector.h | 6 | ||||
| -rw-r--r-- | src/waterwatch.cpp | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/watchconnector.cpp b/src/watchconnector.cpp index 55e4b80..fb518ed 100644 --- a/src/watchconnector.cpp +++ b/src/watchconnector.cpp @@ -152,6 +152,7 @@ void WatchConnector::disconnected() socket->deleteLater(); socket = nullptr; emit connectedChanged(); + emit nameChanged(); } void WatchConnector::sendData(const QByteArray &data) diff --git a/src/watchconnector.h b/src/watchconnector.h index 59ea632..198f703 100644 --- a/src/watchconnector.h +++ b/src/watchconnector.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Jouni Roivas + Copyright (C) 2014 Jouni Roivas All rights reserved. You may use this file under the terms of BSD license as follows: @@ -11,7 +11,7 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of the Jolla Ltd nor the + * Neither the name of the authors nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -80,7 +80,7 @@ public: explicit WatchConnector(QObject *parent = 0); virtual ~WatchConnector(); bool isConnected() const { return is_connected; } - QString name() const { if (socket != nullptr) return socket->peerName(); return "";} + QString name() const { if (socket != nullptr) return socket->peerName(); return ""; } QString timeStamp(); QString decodeEndpoint(unsigned int val); diff --git a/src/waterwatch.cpp b/src/waterwatch.cpp index 2f65cc0..02da4b8 100644 --- a/src/waterwatch.cpp +++ b/src/waterwatch.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Jouni Roivas + Copyright (C) 2014 Jouni Roivas Copyright (C) 2013 Jolla Ltd. Contact: Thomas Perl <thomas.perl@jollamobile.com> All rights reserved. @@ -13,7 +13,7 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of the Jolla Ltd nor the + * Neither the name of the authors nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. |