diff options
| -rw-r--r-- | qt4/TelepathyQt4/stream-tube-server.cpp | 12 | ||||
| -rw-r--r-- | qt4/TelepathyQt4/stream-tube-server.h | 6 | ||||
| -rw-r--r-- | qt4/tests/dbus/stream-tube-handlers.cpp | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/qt4/TelepathyQt4/stream-tube-server.cpp b/qt4/TelepathyQt4/stream-tube-server.cpp index dc143bc61..f07ab6694 100644 --- a/qt4/TelepathyQt4/stream-tube-server.cpp +++ b/qt4/TelepathyQt4/stream-tube-server.cpp @@ -47,7 +47,7 @@ public: FixedParametersGenerator(const QVariantMap ¶ms) : mParams(params) {} QVariantMap nextParameters(const AccountPtr &, const OutgoingStreamTubeChannelPtr &, - const ChannelRequestHints &) const + const ChannelRequestHints &) { return mParams; } @@ -103,7 +103,7 @@ struct StreamTubeServer::Private QHostAddress exportedAddr; quint16 exportedPort; - const ParametersGenerator *generator; + ParametersGenerator *generator; QScopedPointer<FixedParametersGenerator> fixedGenerator; QHash<StreamTubeChannelPtr, TubeWrapper *> tubes; @@ -283,8 +283,8 @@ QVariantMap StreamTubeServer::exportedParameters() const return QVariantMap(); } - const FixedParametersGenerator *generator = - dynamic_cast<const FixedParametersGenerator *>(mPriv->generator); + FixedParametersGenerator *generator = + dynamic_cast<FixedParametersGenerator *>(mPriv->generator); if (generator) { return generator->nextParameters(AccountPtr(), OutgoingStreamTubeChannelPtr(), @@ -337,7 +337,7 @@ void StreamTubeServer::exportTcpSocket( void StreamTubeServer::exportTcpSocket( const QHostAddress &addr, quint16 port, - const ParametersGenerator *generator) + ParametersGenerator *generator) { if (addr.isNull() || port == 0) { warning() << "Attempted to export null TCP socket address or zero port, ignoring"; @@ -353,7 +353,7 @@ void StreamTubeServer::exportTcpSocket( void StreamTubeServer::exportTcpSocket( const QTcpServer *server, - const ParametersGenerator *generator) + ParametersGenerator *generator) { if (!server->isListening()) { warning() << "Attempted to export non-listening QTcpServer, ignoring"; diff --git a/qt4/TelepathyQt4/stream-tube-server.h b/qt4/TelepathyQt4/stream-tube-server.h index 0232405b7..750e4e769 100644 --- a/qt4/TelepathyQt4/stream-tube-server.h +++ b/qt4/TelepathyQt4/stream-tube-server.h @@ -51,7 +51,7 @@ public: public: virtual QVariantMap nextParameters(const AccountPtr &account, const OutgoingStreamTubeChannelPtr &tube, - const ChannelRequestHints &hints) const = 0; + const ChannelRequestHints &hints) = 0; protected: virtual ~ParametersGenerator() {} @@ -129,10 +129,10 @@ public: void exportTcpSocket( const QHostAddress &address, quint16 port, - const ParametersGenerator *generator); + ParametersGenerator *generator); void exportTcpSocket( const QTcpServer *server, - const ParametersGenerator *generator); + ParametersGenerator *generator); // TODO: Add Unix sockets if needed (are there other common services one might want to export // listening on Unix sockets and not necessarily on TCP than X11 and perhaps CUPS?) diff --git a/qt4/tests/dbus/stream-tube-handlers.cpp b/qt4/tests/dbus/stream-tube-handlers.cpp index 95fd4117b..08f1798bf 100644 --- a/qt4/tests/dbus/stream-tube-handlers.cpp +++ b/qt4/tests/dbus/stream-tube-handlers.cpp @@ -789,7 +789,7 @@ void TestStreamTubeHandlers::testRegistration() CookieGenerator() : serial(0) {} QVariantMap nextParameters(const AccountPtr &account, const OutgoingStreamTubeChannelPtr &tube, - const ChannelRequestHints &hints) const + const ChannelRequestHints &hints) { QVariantMap params; params.insert(QLatin1String("cookie-y"), @@ -798,7 +798,7 @@ void TestStreamTubeHandlers::testRegistration() } private: - mutable uint serial; // mmm. I wonder if we should make nextParameters() non-const? that'd require giving a non const pointer when exporting too. + uint serial; } httpGenerator; QVariantMap whiteboardParams; |