only style changes

MongoDB/src/Array.cpp

@@ -34,13 +34,16 @@
 // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 //
-#include <sstream>
+
 
 #include "Poco/MongoDB/Array.h"
+#include <sstream>
+
 
 namespace Poco {
 namespace MongoDB {
 
+
 Array::Array() : Document()
 {
 }

MongoDB/src/Binary.cpp

@@ -35,8 +35,10 @@
 // DEALINGS IN THE SOFTWARE.
 //
 
+
 #include "Poco/MongoDB/Binary.h"
 
+
 namespace Poco {
 namespace MongoDB {
 

MongoDB/src/Connection.cpp

@@ -34,15 +34,16 @@
 // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 //
-#include <iostream>
+
 
 #include "Poco/Net/SocketStream.h"
 #include "Poco/MongoDB/Connection.h"
+#include <iostream>
+
+
+namespace Poco {
+namespace MongoDB {
 
-namespace Poco
-{
-namespace MongoDB
-{
 
 Connection::Connection() : _address(), _socket()
 {
@@ -54,6 +55,7 @@ Connection::Connection(const std::string& hostAndPort) : _address(hostAndPort),
 	connect();
 }
 
+
 Connection::Connection(const std::string& host, int port) : _address(host, port), _socket()
 {
 	connect();
@@ -90,6 +92,7 @@ void Connection::connect(const std::string& hostAndPort)
 	connect();
 }
 
+
 void Connection::connect(const std::string& host, int port)
 {
 	_address = Net::SocketAddress(host, port);
@@ -103,17 +106,20 @@ void Connection::connect(const Net::SocketAddress& addrs)
 	connect();
 }
 
+
 void Connection::disconnect()
 {
 	_socket.close();
 }
 
+
 void Connection::sendRequest(RequestMessage& request)
 {
 	Net::SocketOutputStream sos(_socket);
 	request.send(sos);
 }
 
+
 void Connection::sendRequest(RequestMessage& request, ResponseMessage& response)
 {
 	sendRequest(request);

MongoDB/src/Cursor.cpp

@@ -35,14 +35,14 @@
 // DEALINGS IN THE SOFTWARE.
 //
 
+
 #include "Poco/MongoDB/Cursor.h"
 #include "Poco/MongoDB/GetMoreRequest.h"
 #include "Poco/MongoDB/KillCursorsRequest.h"
 
-namespace Poco
-{
-namespace MongoDB
-{
+
+namespace Poco {
+namespace MongoDB {
 
 
 Cursor::Cursor(const std::string& db, const std::string& collection, QueryRequest::Flags flags)
@@ -91,5 +91,5 @@ void Cursor::kill(Connection& connection)
 	_response.clear();
 }
 
-} } // Namespace Poco::MongoDB
 
+} } // Namespace Poco::MongoDB

MongoDB/src/Database.cpp

@@ -35,12 +35,12 @@
 // DEALINGS IN THE SOFTWARE.
 //
 
+
 #include "Poco/MongoDB/Database.h"
 
-namespace Poco
-{
-namespace MongoDB
-{
+
+namespace Poco {
+namespace MongoDB {
 
 
 Database::Database( const std::string& db) : _dbname(db)
@@ -126,6 +126,7 @@ Document::Ptr Database::getLastErrorDoc(Connection& connection) const
 	return errorDoc;
 }
 
+
 std::string Database::getLastError(Connection& connection) const
 {
 	Document::Ptr errorDoc = getLastErrorDoc(connection);

MongoDB/src/DeleteRequest.cpp

@@ -35,12 +35,12 @@
 // DEALINGS IN THE SOFTWARE.
 //
 
+
 #include "Poco/MongoDB/DeleteRequest.h"
 
-namespace Poco
-{
-namespace MongoDB
-{
+
+namespace Poco {
+namespace MongoDB {
 
 
 DeleteRequest::DeleteRequest(const std::string& collectionName, DeleteRequest::Flags flags) 
@@ -65,6 +65,7 @@ DeleteRequest::~DeleteRequest()
 {
 }
 
+
 void DeleteRequest::buildRequest(BinaryWriter& writer)
 {
 	writer << 0; // 0 - reserved for future use
@@ -74,4 +75,4 @@ void DeleteRequest::buildRequest(BinaryWriter& writer)
 }
 
 
-}} // Namespace MongoDB
+} } // namespace Poco::MongoDB

MongoDB/src/Document.cpp

@@ -35,7 +35,6 @@
 // DEALINGS IN THE SOFTWARE.
 //
 
-#include <sstream>
 
 #include "Poco/MongoDB/Document.h"
 #include "Poco/MongoDB/Binary.h"
@@ -43,17 +42,18 @@
 #include "Poco/MongoDB/Array.h"
 #include "Poco/MongoDB/RegularExpression.h"
 #include "Poco/MongoDB/JavaScriptCode.h"
+#include <sstream>
 
-namespace Poco
-{
-namespace MongoDB
-{
+
+namespace Poco {
+namespace MongoDB {
 
 
 Document::Document()
 {
 }
 
+
 Document::~Document()
 {
 }
@@ -198,14 +198,14 @@ void Document::write(BinaryWriter& writer)
 		Poco::BinaryWriter tempWriter(sstream);
 		for(ElementSet::iterator it = _elements.begin(); it != _elements.end(); ++it)
 		{
-			tempWriter << (unsigned char) (*it)->type();
+			tempWriter << static_cast<unsigned char>((*it)->type());
 			BSONWriter(tempWriter).writeCString((*it)->name());
 			Element::Ptr element = *it;
 			element->write(tempWriter);
 		}
 		tempWriter.flush();
 		
-		Poco::Int32 len = 5 + sstream.tellp(); /* 5 = sizeof(len) + 0-byte */
+		Poco::Int32 len = static_cast<Poco::Int32>(5 + sstream.tellp()); /* 5 = sizeof(len) + 0-byte */
 		writer << len;
 		writer.writeRaw(sstream.str());
 	}

MongoDB/src/Element.cpp

@@ -35,17 +35,19 @@
 // DEALINGS IN THE SOFTWARE.
 //
 
+
 #include "Poco/MongoDB/Element.h"
 
-namespace Poco
-{
-namespace MongoDB
-{
+
+namespace Poco {
+namespace MongoDB {
+
 
 Element::Element(const std::string& name) : _name(name)
 {
 }
 
+
 Element::~Element() 
 {
 }

MongoDB/src/GetMoreRequest.cpp

@@ -35,13 +35,13 @@
 // DEALINGS IN THE SOFTWARE.
 //
 
+
 #include "Poco/MongoDB/GetMoreRequest.h"
 #include "Poco/MongoDB/Element.h"
 
-namespace Poco
-{
-namespace MongoDB
-{
+
+namespace Poco {
+namespace MongoDB {
 
 
 GetMoreRequest::GetMoreRequest(const std::string& collectionName, Int64 cursorID) 
@@ -52,10 +52,12 @@ GetMoreRequest::GetMoreRequest(const std::string& collectionName, Int64 cursorID
 {
 }
 
+
 GetMoreRequest::~GetMoreRequest()
 {
 }
 
+
 void GetMoreRequest::buildRequest(BinaryWriter& writer)
 {
 	writer << 0; // 0 - reserved for future use
@@ -65,4 +67,4 @@ void GetMoreRequest::buildRequest(BinaryWriter& writer)
 }
 
 
-}} // Namespace MongoDB
+} } // namespace Poco::MongoDB

MongoDB/src/InsertRequest.cpp

@@ -35,12 +35,12 @@
 // DEALINGS IN THE SOFTWARE.
 //
 
+
 #include "Poco/MongoDB/InsertRequest.h"
 
-namespace Poco
-{
-namespace MongoDB
-{
+
+namespace Poco {
+namespace MongoDB {
 
 
 InsertRequest::InsertRequest(const std::string& collectionName, Flags flags) 
@@ -50,10 +50,12 @@ InsertRequest::InsertRequest(const std::string& collectionName, Flags flags)
 {
 }
 
+
 InsertRequest::~InsertRequest()
 {
 }
 
+
 void InsertRequest::buildRequest(BinaryWriter& writer)
 {
 	//TODO: throw exception when no document is added
@@ -67,4 +69,5 @@ void InsertRequest::buildRequest(BinaryWriter& writer)
 	}
 }
 
-}} // Namespace MongoDB
+
+} } // namespace Poco::MongoDB

MongoDB/src/JavaScriptCode.cpp

@@ -34,8 +34,11 @@
 // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 //
+
+
 #include "Poco/MongoDB/JavaScriptCode.h"
 
+
 namespace Poco {
 namespace MongoDB {
 
@@ -45,8 +48,10 @@ JavaScriptCode::JavaScriptCode()
 
 }
 
+
 JavaScriptCode::~JavaScriptCode()
 {
 }
 
+
 } } // namespace Poco::MongoDB

MongoDB/src/KillCursorsRequest.cpp

@@ -35,12 +35,12 @@
 // DEALINGS IN THE SOFTWARE.
 //
 
+
 #include "Poco/MongoDB/KillCursorsRequest.h"
 
-namespace Poco
-{
-namespace MongoDB
-{
+
+namespace Poco {
+namespace MongoDB {
 
 
 KillCursorsRequest::KillCursorsRequest() 
@@ -48,10 +48,12 @@ KillCursorsRequest::KillCursorsRequest()
 {
 }
 
+
 KillCursorsRequest::~KillCursorsRequest()
 {
 }
 
+
 void KillCursorsRequest::buildRequest(BinaryWriter& writer)
 {
 	writer << 0; // 0 - reserved for future use
@@ -63,4 +65,4 @@ void KillCursorsRequest::buildRequest(BinaryWriter& writer)
 }
 
 
-}} // Namespace MongoDB
+} } // namespace Poco::MongoDB

MongoDB/src/Message.cpp

@@ -35,20 +35,22 @@
 // DEALINGS IN THE SOFTWARE.
 //
 
+
 #include "Poco/MongoDB/Message.h"
 
-namespace Poco
-{
-namespace MongoDB
-{
+
+namespace Poco {
+namespace MongoDB {
 
 
 Message::Message(MessageHeader::OpCode opcode) : _header(opcode)
 {
 }
 
+
 Message::~Message()
 {
 }
 
-}} // Namespace MongoDB
+
+} } // namespace Poco::MongoDB

MongoDB/src/MessageHeader.cpp

@@ -34,25 +34,28 @@
 // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 //
-#include "Poco/MongoDB/Message.h"
 
+
+#include "Poco/MongoDB/Message.h"
 #include "Poco/Exception.h"
 #include "Poco/Net/SocketStream.h"
 #include "Poco/StreamCopier.h"
 
-namespace Poco
-{
-namespace MongoDB
-{
+
+namespace Poco {
+namespace MongoDB {
+
 
 MessageHeader::MessageHeader(OpCode opCode) : _messageLength(0), _requestID(0), _responseTo(0), _opCode(opCode)
 {
 }
 
+
 MessageHeader::~MessageHeader()
 {
 }
 
+
 void MessageHeader::read(BinaryReader& reader)
 {
 	reader >> _messageLength;
@@ -69,6 +72,7 @@ void MessageHeader::read(BinaryReader& reader)
 	}
 }
 
+
 void MessageHeader::write(BinaryWriter& writer)
 {
 	writer << _messageLength;
@@ -77,4 +81,5 @@ void MessageHeader::write(BinaryWriter& writer)
 	writer << (Int32) _opCode;
 }
 
-}} // Namespace MongoDB
+
+} } // namespace Poco::MongoDB

MongoDB/src/ObjectId.cpp

@@ -35,14 +35,14 @@
 // DEALINGS IN THE SOFTWARE.
 //
 
-#include "Poco/MongoDB/ObjectId.h"
 
+#include "Poco/MongoDB/ObjectId.h"
 #include "Poco/Format.h"
 
-namespace Poco
-{
-namespace MongoDB
-{
+
+namespace Poco {
+namespace MongoDB {
+
 
 ObjectId::ObjectId()
 {

MongoDB/src/QueryRequest.cpp

@@ -35,12 +35,12 @@
 // DEALINGS IN THE SOFTWARE.
 //
 
+
 #include "Poco/MongoDB/QueryRequest.h"
 
-namespace Poco
-{
-namespace MongoDB
-{
+
+namespace Poco {
+namespace MongoDB {
 
 
 QueryRequest::QueryRequest(const std::string& collectionName, QueryRequest::Flags flags) 
@@ -59,6 +59,7 @@ QueryRequest::~QueryRequest()
 {
 }
 
+
 void QueryRequest::buildRequest(BinaryWriter& writer)
 {
 	writer << _flags;
@@ -74,4 +75,4 @@ void QueryRequest::buildRequest(BinaryWriter& writer)
 }
 
 
-}} // Namespace MongoDB
+} } // namespace Poco::MongoDB

MongoDB/src/RegularExpression.cpp

@@ -35,9 +35,10 @@
 // DEALINGS IN THE SOFTWARE.
 //
 
-#include <sstream>
 
 #include "Poco/MongoDB/RegularExpression.h"
+#include <sstream>
+
 
 namespace Poco {
 namespace MongoDB {
@@ -88,4 +89,5 @@ SharedPtr<Poco::RegularExpression> RegularExpression::createRE() const
 	return new Poco::RegularExpression(_pattern, options);
 }
 
+
 } } // namespace Poco::MongoDB

MongoDB/src/ReplicaSet.cpp

@@ -34,19 +34,21 @@
 // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 //
+
+
 #include "Poco/MongoDB/ReplicaSet.h"
 #include "Poco/MongoDB/QueryRequest.h"
 #include "Poco/MongoDB/ResponseMessage.h"
 
-namespace Poco
-{
-namespace MongoDB
-{
+namespace Poco {
+namespace MongoDB {
+
 
 ReplicaSet::ReplicaSet(const std::vector<Net::SocketAddress> &addresses) : _addresses(addresses)
 {
 }
 
+
 ReplicaSet::~ReplicaSet()
 {
 }
@@ -68,6 +70,7 @@ Connection::Ptr ReplicaSet::findMaster()
 	return master;
 }
 
+
 Connection::Ptr ReplicaSet::isMaster(const Net::SocketAddress& address)
 {
 	Connection::Ptr conn = new Connection();

MongoDB/src/RequestMessage.cpp

@@ -35,20 +35,21 @@
 // DEALINGS IN THE SOFTWARE.
 //
 
+
 #include "Poco/MongoDB/RequestMessage.h"
 #include "Poco/Net/SocketStream.h"
 #include "Poco/StreamCopier.h"
 
-namespace Poco
-{
-namespace MongoDB
-{
+
+namespace Poco {
+namespace MongoDB {
 
 
 RequestMessage::RequestMessage(MessageHeader::OpCode opcode) : Message(opcode)
 {
 }
 
+
 RequestMessage::~RequestMessage()
 {
 }
@@ -69,4 +70,5 @@ void RequestMessage::send(std::ostream& ostr)
 	ostr.flush();
 }
 
-}} // Namespace MongoDB
+
+} } // namespace Poco::MongoDB

MongoDB/src/ResponseMessage.cpp

@@ -35,18 +35,20 @@
 // DEALINGS IN THE SOFTWARE.
 //
 
+
 #include "Poco/MongoDB/ResponseMessage.h"
 #include "Poco/Net/SocketStream.h"
 
-namespace Poco
-{
-namespace MongoDB
-{
+
+namespace Poco {
+namespace MongoDB {
+
 
 ResponseMessage::ResponseMessage() : Message(MessageHeader::Reply), _responseFlags(0), _cursorID(0), _startingFrom(0), _numberReturned(0)
 {
 }
 
+
 ResponseMessage::~ResponseMessage()
 {
 }
@@ -83,4 +85,5 @@ void ResponseMessage::read(std::istream& istr)
 	}
 }
 
-}} // Namespace MongoDB
+
+} } // namespace Poco::MongoDB

MongoDB/src/UpdateRequest.cpp

@@ -35,12 +35,12 @@
 // DEALINGS IN THE SOFTWARE.
 //
 
+
 #include "Poco/MongoDB/UpdateRequest.h"
 
-namespace Poco
-{
-namespace MongoDB
-{
+
+namespace Poco {
+namespace MongoDB {
 
 
 UpdateRequest::UpdateRequest(const std::string& collectionName, UpdateRequest::Flags flags) 
@@ -52,10 +52,12 @@ UpdateRequest::UpdateRequest(const std::string& collectionName, UpdateRequest::F
 {
 }
 
+
 UpdateRequest::~UpdateRequest()
 {
 }
 
+
 void UpdateRequest::buildRequest(BinaryWriter& writer)
 {
 	writer << 0; // 0 - reserved for future use
@@ -65,4 +67,5 @@ void UpdateRequest::buildRequest(BinaryWriter& writer)
 	_update.write(writer);
 }
 
-}} // Namespace MongoDB
+
+} } // namespace Poco::MongoDB