From 291746bc57cb61dabf7899fc93aa130108a501c3 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 11 Apr 2015 01:33:42 +0200 Subject: [PATCH] Some minor fixes in server and style in testing --- src/blackmisc/network/server.cpp | 8 ++------ src/blackmisc/network/server.h | 4 +--- src/blackmisc/testing.h | 9 +++------ 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/blackmisc/network/server.cpp b/src/blackmisc/network/server.cpp index 279681bf7..693c01fd4 100644 --- a/src/blackmisc/network/server.cpp +++ b/src/blackmisc/network/server.cpp @@ -64,12 +64,8 @@ namespace BlackMisc case IndexIsAcceptingConnections: return CVariant::fromValue(this->m_isAcceptingConnections); default: - break; + return CValueObject::propertyByIndex(index); } - - Q_ASSERT_X(false, "CServer", "index unknown"); - QString m = QString("no property, index ").append(index.toQString()); - return CVariant::fromValue(m); } void CServer::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) @@ -102,7 +98,7 @@ namespace BlackMisc this->setIsAcceptingConnections(variant.value()); break; default: - Q_ASSERT_X(false, "CServer", "index unknown"); + CValueObject::setPropertyByIndex(variant, index); break; } } diff --git a/src/blackmisc/network/server.h b/src/blackmisc/network/server.h index 90a9ac474..80810466d 100644 --- a/src/blackmisc/network/server.h +++ b/src/blackmisc/network/server.h @@ -20,9 +20,7 @@ namespace BlackMisc { namespace Network { - /*! - * Value object encapsulating information of a server - */ + //! Value object encapsulating information of a server class CServer : public CValueObject { public: diff --git a/src/blackmisc/testing.h b/src/blackmisc/testing.h index 1ebf5a936..1c5f25ea9 100644 --- a/src/blackmisc/testing.h +++ b/src/blackmisc/testing.h @@ -14,9 +14,7 @@ #include "blackmisc/aviation/atcstationlist.h" -/*! - * Generate data for testing purposes. - */ +//! Generate data for testing purposes. namespace BlackMisc { namespace Aviation @@ -54,8 +52,7 @@ namespace BlackMisc static void parseWgs(int times); }; - } // Aviation - -} // BlackMisc + } // ns +} // ns #endif // guard