From 0a6030f5dfc074259ee07ee48dd11d1a3d260794 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Fri, 7 Feb 2014 22:45:35 +0000 Subject: [PATCH] refs #92 fixing warnings when compiling for 64bits due to conversions between size_t and int --- src/blackcore/network_vatlib.cpp | 2 +- src/blackcore/pluginmgr.cpp | 8 ++++---- src/blackcore/pluginmgr.h | 20 ++++++++++---------- src/blackmisc/mathmatrixbase.cpp | 6 +++--- src/blackmisc/mathmatrixbase.h | 10 +++++----- src/blackmisc/mathvector3dbase.cpp | 6 +++--- src/blackmisc/mathvector3dbase.h | 10 +++++----- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/blackcore/network_vatlib.cpp b/src/blackcore/network_vatlib.cpp index 7e3c15aaa..7ea29c5c0 100644 --- a/src/blackcore/network_vatlib.cpp +++ b/src/blackcore/network_vatlib.cpp @@ -402,7 +402,7 @@ namespace BlackCore // I could send the same message to n frequencies in one step // if this is really required, I need to group by message // currently I send individual messages - std::vector freqsVec; + QVector freqsVec; freqsVec.push_back(message.getFrequency().value(CFrequencyUnit::kHz())); m_net->SendRadioTextMessage(freqsVec.size(), freqsVec.data(), toFSD(message.getMessage())); } diff --git a/src/blackcore/pluginmgr.cpp b/src/blackcore/pluginmgr.cpp index 928a4a216..f8a00c9f0 100644 --- a/src/blackcore/pluginmgr.cpp +++ b/src/blackcore/pluginmgr.cpp @@ -63,7 +63,7 @@ namespace BlackCore } } - const CPluginManager::PluginEntry &CPluginManager::getEntry(size_t index) const + const CPluginManager::PluginEntry &CPluginManager::getEntry(int index) const { Q_ASSERT_X(index < getPluginCount(), "Plugin manager", "Plugin index out of bounds"); @@ -80,17 +80,17 @@ namespace BlackCore return entry; } - const QString CPluginManager::getName(size_t index) const + const QString CPluginManager::getName(int index) const { return getFactory(index)->getName(); } - const QString CPluginManager::getDescription(size_t index) const + const QString CPluginManager::getDescription(int index) const { return getFactory(index)->getDescription(); } - BlackMisc::IPlugin *CPluginManager::constructPlugin(size_t index) + BlackMisc::IPlugin *CPluginManager::constructPlugin(int index) { BlackMisc::IPlugin *plugin = getFactory(index)->create(BlackMisc::IContext::getInstance()); if (! plugin->isValid()) diff --git a/src/blackcore/pluginmgr.h b/src/blackcore/pluginmgr.h index e791d8ab8..b10c4433c 100644 --- a/src/blackcore/pluginmgr.h +++ b/src/blackcore/pluginmgr.h @@ -45,7 +45,7 @@ namespace BlackCore Return the total number of plugins loaded so far. \return */ - size_t getPluginCount() const + int getPluginCount() const { return m_plugins.size(); } @@ -55,14 +55,14 @@ namespace BlackCore \param index the plugin's index in the vector of plugins. \return */ - const QString getName(size_t index) const; + const QString getName(int index) const; /*! Return the description of a plugin. \param index the plugin's index in the vector of plugins. \return */ - const QString getDescription(size_t index) const; + const QString getDescription(int index) const; /*! Construct a plugin. @@ -70,14 +70,14 @@ namespace BlackCore \return a pointer to the newly created plugin. \warning You must release this pointer with IPluginFactory::destroy(). */ - BlackMisc::IPlugin *constructPlugin(size_t index); + BlackMisc::IPlugin *constructPlugin(int index); /*! Direct access to the factory. You don't usually need this. \param index \return */ - BlackMisc::IPluginFactory *getFactory(size_t index) + BlackMisc::IPluginFactory *getFactory(int index) { return const_cast(static_cast(this)->getFactory(index)); } @@ -87,7 +87,7 @@ namespace BlackCore \param index \return */ - const BlackMisc::IPluginFactory *getFactory(size_t index) const + const BlackMisc::IPluginFactory *getFactory(int index) const { return getEntry(index).factory; } @@ -97,7 +97,7 @@ namespace BlackCore \param index \return */ - QPluginLoader *getLoader(size_t index) + QPluginLoader *getLoader(int index) { return const_cast(static_cast(this)->getLoader(index)); } @@ -107,7 +107,7 @@ namespace BlackCore \param index \return */ - const QPluginLoader *getLoader(size_t index) const + const QPluginLoader *getLoader(int index) const { return getEntry(index).loader.data(); } @@ -123,12 +123,12 @@ namespace BlackCore QVector m_plugins; - PluginEntry &getEntry(size_t index) + PluginEntry &getEntry(int index) { return const_cast(static_cast(this)->getEntry(index)); } - const PluginEntry &getEntry(size_t index) const; + const PluginEntry &getEntry(int index) const; }; } // namespace BlackCore diff --git a/src/blackmisc/mathmatrixbase.cpp b/src/blackmisc/mathmatrixbase.cpp index 676500bb2..6ceba0ce0 100644 --- a/src/blackmisc/mathmatrixbase.cpp +++ b/src/blackmisc/mathmatrixbase.cpp @@ -16,7 +16,7 @@ namespace BlackMisc /* * Get element by column / row */ - template double CMatrixBase::getElement(size_t row, size_t column) const + template double CMatrixBase::getElement(int row, int column) const { this->checkRange(row, column); return this->m_matrix(row, column); @@ -25,7 +25,7 @@ namespace BlackMisc /* * Set element by column / row */ - template void CMatrixBase::setElement(size_t row, size_t column, double value) + template void CMatrixBase::setElement(int row, int column, double value) { this->checkRange(row, column); this->m_matrix(row, column) = value; @@ -34,7 +34,7 @@ namespace BlackMisc /* * Check range */ - template void CMatrixBase::checkRange(size_t row, size_t column) const + template void CMatrixBase::checkRange(int row, int column) const { bool valid = (row < Rows && column < Columns); Q_ASSERT_X(valid, "getElement()", "Row or column invalid"); diff --git a/src/blackmisc/mathmatrixbase.h b/src/blackmisc/mathmatrixbase.h index d06ad3c30..c6c48d55b 100644 --- a/src/blackmisc/mathmatrixbase.h +++ b/src/blackmisc/mathmatrixbase.h @@ -324,7 +324,7 @@ namespace BlackMisc * \param column * \return */ - double getElement(size_t row, size_t column) const; + double getElement(int row, int column) const; /*! * \brief Get element @@ -332,7 +332,7 @@ namespace BlackMisc * \param column * \param value */ - void setElement(size_t row, size_t column, double value); + void setElement(int row, int column, double value); /*! * \brief Get element by operator () modifying @@ -340,7 +340,7 @@ namespace BlackMisc * \param column * \return */ - double &operator()(size_t row, size_t column) + double &operator()(int row, int column) { this->checkRange(row, column); return this->m_matrix(row, column); @@ -352,7 +352,7 @@ namespace BlackMisc * \param column * \return */ - double operator()(size_t row, size_t column) const + double operator()(int row, int column) const { return this->getElement(row, column); } @@ -369,7 +369,7 @@ namespace BlackMisc * \param column * \throws std::range_error if index out of bounds */ - void checkRange(size_t row, size_t column) const; + void checkRange(int row, int column) const; }; } // namespace diff --git a/src/blackmisc/mathvector3dbase.cpp b/src/blackmisc/mathvector3dbase.cpp index d73e2ca74..26def4f35 100644 --- a/src/blackmisc/mathvector3dbase.cpp +++ b/src/blackmisc/mathvector3dbase.cpp @@ -81,7 +81,7 @@ namespace BlackMisc /* * Element (return by reference) */ - template double &CVector3DBase::getElement(size_t row) + template double &CVector3DBase::getElement(int row) { switch (row) { @@ -100,7 +100,7 @@ namespace BlackMisc /* * Element */ - template double CVector3DBase::getElement(size_t row) const + template double CVector3DBase::getElement(int row) const { return const_cast*>(this)->getElement(row); } @@ -108,7 +108,7 @@ namespace BlackMisc /* * Set given element */ - template void CVector3DBase::setElement(size_t row, double value) + template void CVector3DBase::setElement(int row, double value) { switch (row) { diff --git a/src/blackmisc/mathvector3dbase.h b/src/blackmisc/mathvector3dbase.h index 7552134b9..a0f1e035d 100644 --- a/src/blackmisc/mathvector3dbase.h +++ b/src/blackmisc/mathvector3dbase.h @@ -71,7 +71,7 @@ namespace BlackMisc * \param row * \return Mutable reference */ - double &getElement(size_t row); + double &getElement(int row); /*! * \brief String for converter @@ -152,28 +152,28 @@ namespace BlackMisc * \param row * \return */ - double getElement(size_t row) const; + double getElement(int row) const; /*! * \brief Set element * \param row * \param value */ - void setElement(size_t row, double value); + void setElement(int row, double value); /*! * \brief Operator [] * \param row * \return */ - double operator[](size_t row) const { return this->getElement(row); } + double operator[](int row) const { return this->getElement(row); } /*! * \brief Operator [] * \param row * \return Mutable reference */ - double &operator[](size_t row) { return this->getElement(row); } + double &operator[](int row) { return this->getElement(row); } /*! * \brief Equal operator ==