From b4384bde09c72dde1620478c98fc20eb76529f3f Mon Sep 17 00:00:00 2001 From: Mateusz Piekos Date: Fri, 20 Jul 2012 12:24:26 +0200 Subject: Made compilation of whiteboard components warning free diff --git a/Swift/QtUI/Whiteboard/FreehandLineItem.cpp b/Swift/QtUI/Whiteboard/FreehandLineItem.cpp index 92c4005..9beb47b 100644 --- a/Swift/QtUI/Whiteboard/FreehandLineItem.cpp +++ b/Swift/QtUI/Whiteboard/FreehandLineItem.cpp @@ -16,7 +16,7 @@ namespace Swift { return boundRect; } - void FreehandLineItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) + void FreehandLineItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* /*option*/, QWidget* /*widget*/) { painter->setPen(pen_); if (points_.size() > 0) { @@ -67,7 +67,7 @@ namespace Swift { update(rect); } - bool FreehandLineItem::collidesWithPath(const QPainterPath& path, Qt::ItemSelectionMode mode) const + bool FreehandLineItem::collidesWithPath(const QPainterPath& path, Qt::ItemSelectionMode /*mode*/) const { QVector::const_iterator it; QSizeF size(1,1); diff --git a/Swift/QtUI/Whiteboard/FreehandLineItem.h b/Swift/QtUI/Whiteboard/FreehandLineItem.h index b0be36b..f3c6607 100644 --- a/Swift/QtUI/Whiteboard/FreehandLineItem.h +++ b/Swift/QtUI/Whiteboard/FreehandLineItem.h @@ -18,10 +18,10 @@ namespace Swift { enum {Type = UserType + 1}; FreehandLineItem(QGraphicsItem* parent = 0); QRectF boundingRect() const; - void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0); + void paint(QPainter* painter, const QStyleOptionGraphicsItem* /*option*/, QWidget* /*widget*/ = 0); void setStartPoint(QPointF point); void lineTo(QPointF point); - bool collidesWithPath(const QPainterPath& path, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape) const; + bool collidesWithPath(const QPainterPath& path, Qt::ItemSelectionMode /*mode*/ = Qt::IntersectsItemShape) const; void setPen(const QPen& pen); QPen pen() const; const QVector& points() const; diff --git a/Swift/QtUI/Whiteboard/GView.cpp b/Swift/QtUI/Whiteboard/GView.cpp index eead3c7..e82d193 100644 --- a/Swift/QtUI/Whiteboard/GView.cpp +++ b/Swift/QtUI/Whiteboard/GView.cpp @@ -346,7 +346,7 @@ namespace Swift { } } - void GView::mouseReleaseEvent(QMouseEvent *event) + void GView::mouseReleaseEvent(QMouseEvent* /*event*/) { mousePressed = false; QGraphicsPolygonItem* polygon = dynamic_cast(lastItem); diff --git a/Swift/QtUI/Whiteboard/GView.h b/Swift/QtUI/Whiteboard/GView.h index e18cb74..786c1f3 100644 --- a/Swift/QtUI/Whiteboard/GView.h +++ b/Swift/QtUI/Whiteboard/GView.h @@ -31,7 +31,7 @@ namespace Swift { void setMode(Mode mode); void mouseMoveEvent(QMouseEvent* event); void mousePressEvent(QMouseEvent* event); - void mouseReleaseEvent(QMouseEvent* event); + void mouseReleaseEvent(QMouseEvent* /*event*/); void addItem(QGraphicsItem* item, QString id, int pos); void setIDPrefix(QString prefix); void clear(); diff --git a/Swiften/Elements/WhiteboardPayload.h b/Swiften/Elements/WhiteboardPayload.h index cf22f20..d884f13 100644 --- a/Swiften/Elements/WhiteboardPayload.h +++ b/Swiften/Elements/WhiteboardPayload.h @@ -18,7 +18,7 @@ namespace Swift { typedef boost::shared_ptr ref; public: - enum Type {Data, SessionRequest, SessionAccept, SessionTerminate}; + enum Type {UnknownType, Data, SessionRequest, SessionAccept, SessionTerminate}; WhiteboardPayload(Type type = WhiteboardPayload::Data) : type_(type) { } diff --git a/Swiften/Parser/PayloadParsers/WhiteboardParser.cpp b/Swiften/Parser/PayloadParsers/WhiteboardParser.cpp index cdcbb8c..0381abb 100644 --- a/Swiften/Parser/PayloadParsers/WhiteboardParser.cpp +++ b/Swiften/Parser/PayloadParsers/WhiteboardParser.cpp @@ -21,7 +21,6 @@ namespace Swift { WhiteboardParser::WhiteboardParser() : actualIsText(false), level_(0) { - operation = NULL; } void WhiteboardParser::handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) { @@ -81,8 +80,8 @@ namespace Swift { std::string pathData = attributes.getAttributeValue("d").get_value_or(""); std::vector > points; if (pathData[0] == 'M') { - int pos = 1; - int npos; + unsigned int pos = 1; + unsigned int npos; int x, y; if (pathData[pos] == ' ') { pos++; @@ -161,8 +160,8 @@ namespace Swift { std::string pointsData = attributes.getAttributeValue("points").get_value_or(""); std::vector > points; - int pos = 0; - int npos; + unsigned int pos = 0; + unsigned int npos; int x, y; try { while (pos < pointsData.size()) { @@ -286,7 +285,7 @@ namespace Swift { } WhiteboardPayload::Type WhiteboardParser::stringToType(const std::string& type) const { - if (type.empty()) { + if (type == "data") { return WhiteboardPayload::Data; } else if (type == "session-request") { return WhiteboardPayload::SessionRequest; @@ -294,6 +293,8 @@ namespace Swift { return WhiteboardPayload::SessionAccept; } else if (type == "session-terminate") { return WhiteboardPayload::SessionTerminate; + } else { + return WhiteboardPayload::UnknownType; } } diff --git a/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp b/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp index c5e3d4f..1a9d761 100644 --- a/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp @@ -184,7 +184,22 @@ namespace Swift { } std::string WhiteboardSerializer::typeToString(WhiteboardPayload::Type type) const { - if(type == WhiteboardPayload::Data) { + switch (type) { + case WhiteboardPayload::Data: + return "data"; + case WhiteboardPayload::SessionRequest: + return "session-request"; + case WhiteboardPayload::SessionAccept: + return "session-accept"; + case WhiteboardPayload::SessionTerminate: + return "session-terminate"; + case WhiteboardPayload::UnknownType: + std::cerr << "Serializing unknown action value." << std::endl; + return ""; + } + assert(false); + return ""; +/* if (type == WhiteboardPayload::Data) { return ""; } else if (type == WhiteboardPayload::SessionRequest) { return "session-request"; @@ -192,6 +207,6 @@ namespace Swift { return "session-accept"; } else if (type == WhiteboardPayload::SessionTerminate) { return "session-terminate"; - } + } else*/ } } diff --git a/Swiften/Whiteboard/OutgoingWhiteboardSession.cpp b/Swiften/Whiteboard/OutgoingWhiteboardSession.cpp index b3722ac..0c7bc42 100644 --- a/Swiften/Whiteboard/OutgoingWhiteboardSession.cpp +++ b/Swiften/Whiteboard/OutgoingWhiteboardSession.cpp @@ -28,7 +28,7 @@ namespace Swift { return "a"; } - void OutgoingWhiteboardSession::handleRequestResponse(boost::shared_ptr payload, ErrorPayload::ref error) { + void OutgoingWhiteboardSession::handleRequestResponse(boost::shared_ptr /*payload*/, ErrorPayload::ref error) { if (error) { onRequestRejected(toJID_); } diff --git a/Swiften/Whiteboard/OutgoingWhiteboardSession.h b/Swiften/Whiteboard/OutgoingWhiteboardSession.h index 66b2d3f..149e483 100644 --- a/Swiften/Whiteboard/OutgoingWhiteboardSession.h +++ b/Swiften/Whiteboard/OutgoingWhiteboardSession.h @@ -23,7 +23,7 @@ namespace Swift { std::string getClientID() const; private: - void handleRequestResponse(boost::shared_ptr payload, ErrorPayload::ref error); + void handleRequestResponse(boost::shared_ptr /*payload*/, ErrorPayload::ref error); void handleIncomingOperation(WhiteboardOperation::ref operation); void sendOperation(WhiteboardOperation::ref operation); diff --git a/Swiften/Whiteboard/WhiteboardClient.cpp b/Swiften/Whiteboard/WhiteboardClient.cpp index 70271e6..f8c677b 100644 --- a/Swiften/Whiteboard/WhiteboardClient.cpp +++ b/Swiften/Whiteboard/WhiteboardClient.cpp @@ -86,7 +86,6 @@ namespace Swift { if (bridge_.size() > 0 && (bridge_.front())->getParentID() == lastSentOperationID_) { lastSentOperationID_ = (bridge_.front())->getID(); result.server = bridge_.front(); - result.server->setOrigin(WhiteboardOperation::Other); } if (!result.server) { lastSentOperationID_.clear(); diff --git a/Swiften/Whiteboard/WhiteboardResponder.cpp b/Swiften/Whiteboard/WhiteboardResponder.cpp index c947aec..356356c 100644 --- a/Swiften/Whiteboard/WhiteboardResponder.cpp +++ b/Swiften/Whiteboard/WhiteboardResponder.cpp @@ -15,7 +15,7 @@ namespace Swift { WhiteboardResponder::WhiteboardResponder(WhiteboardSessionManager* sessionManager, IQRouter* router) : SetResponder(router), sessionManager_(sessionManager), router_(router) { } - bool WhiteboardResponder::handleSetRequest(const JID& from, const JID& to, const std::string& id, boost::shared_ptr payload) { + bool WhiteboardResponder::handleSetRequest(const JID& from, const JID& /*to*/, const std::string& id, boost::shared_ptr payload) { if (payload->getType() == WhiteboardPayload::SessionRequest) { if (sessionManager_->getSession(from.toBare())) { sendError(from, id, ErrorPayload::Conflict, ErrorPayload::Cancel); diff --git a/Swiften/Whiteboard/WhiteboardResponder.h b/Swiften/Whiteboard/WhiteboardResponder.h index b171ef3..c05be23 100644 --- a/Swiften/Whiteboard/WhiteboardResponder.h +++ b/Swiften/Whiteboard/WhiteboardResponder.h @@ -16,7 +16,7 @@ namespace Swift { class WhiteboardResponder : public SetResponder { public: WhiteboardResponder(WhiteboardSessionManager* sessionManager, IQRouter* router); - bool handleSetRequest(const JID& from, const JID& to, const std::string& id, boost::shared_ptr payload); + bool handleSetRequest(const JID& from, const JID& /*to*/, const std::string& id, boost::shared_ptr payload); private: WhiteboardSessionManager* sessionManager_; diff --git a/Swiften/Whiteboard/WhiteboardServer.cpp b/Swiften/Whiteboard/WhiteboardServer.cpp index e84ddb3..53a131f 100644 --- a/Swiften/Whiteboard/WhiteboardServer.cpp +++ b/Swiften/Whiteboard/WhiteboardServer.cpp @@ -21,22 +21,17 @@ namespace Swift { for (it = operations_.rbegin(); it != operations_.rend(); ++it) { WhiteboardOperation::ref operation = *it; while (newOperation->getParentID() == operation->getParentID()) { -// WhiteboardInsertOperation::ref insertOperation = boost::dynamic_pointer_cast(operation); -// if (insertOperation) { - std::pair tResult = WhiteboardTransformer::transform(newOperation, operation); + std::pair tResult = WhiteboardTransformer::transform(newOperation, operation); + + if (it == operations_.rbegin()) { + operations_.push_back(tResult.second); + return tResult.second; + } else { + newOperation = tResult.second; + --it; + operation = *it; + } - if (it == operations_.rbegin()) { - operations_.push_back(tResult.second); - return tResult.second; - } else { - newOperation = tResult.second; - --it; - operation = *it; - } -// } else { -// operations_.push_back(operation); -// return *it; -// } } } return WhiteboardOperation::ref(); diff --git a/Swiften/Whiteboard/WhiteboardSession.cpp b/Swiften/Whiteboard/WhiteboardSession.cpp index 492aec5..92865e3 100644 --- a/Swiften/Whiteboard/WhiteboardSession.cpp +++ b/Swiften/Whiteboard/WhiteboardSession.cpp @@ -20,20 +20,22 @@ namespace Swift { } void WhiteboardSession::handleIncomingAction(boost::shared_ptr payload) { - if (payload->getType() == WhiteboardPayload::SessionTerminate) { - onSessionTerminateReceived(toJID_); - return; - } - switch (payload->getType()) { - case WhiteboardPayload::Data: - //onElementReceived(payload->getElement()); -// onOperationReceived(payload->getOperation()); - handleIncomingOperation(payload->getOperation()); - break; - case WhiteboardPayload::SessionAccept: - onRequestAccepted(toJID_); - break; + case WhiteboardPayload::Data: + handleIncomingOperation(payload->getOperation()); + return; + case WhiteboardPayload::SessionAccept: + onRequestAccepted(toJID_); + return; + case WhiteboardPayload::SessionTerminate: + onSessionTerminateReceived(toJID_); + return; + + //handled elsewhere + case WhiteboardPayload::SessionRequest: + + case WhiteboardPayload::UnknownType: + return; } } @@ -44,10 +46,6 @@ namespace Swift { request->send(); } -/* void WhiteboardSession::sendOperation(const WhiteboardOperation::ref operation) { - handleSendOperationRequest(operation); - }*/ - void WhiteboardSession::sendPayload(boost::shared_ptr payload) { boost::shared_ptr > request = boost::make_shared >(IQ::Set, toJID_, payload, router_); request->send(); -- cgit v0.10.2-6-g49f6