Merge with MS "private instead of protected in CRTP" changes

This commit is contained in:
Klaus Basan
2013-05-01 00:51:57 +02:00
3 changed files with 49 additions and 48 deletions

View File

@@ -20,17 +20,7 @@ namespace Math
*/
template<class ImplMatrix, int Rows, int Columns> class CMatrixBase : public BlackMisc::CBaseStreamStringifier<ImplMatrix>
{
protected:
// no bug, Qt expects columns rows
QGenericMatrix<Columns, Rows, double> m_matrix; //!< backing data
/*!
* \brief Conversion to string
* \return
*/
QString stringForConverter() const;
private:
/*!
* \brief Easy access to derived class (CRTP template parameter)
* \return
@@ -49,6 +39,16 @@ protected:
return static_cast<ImplMatrix *>(this);
}
protected:
// no bug, Qt expects columns rows
QGenericMatrix<Columns, Rows, double> m_matrix; //!< backing data
/*!
* \brief Conversion to string
* \return
*/
QString stringForConverter() const;
public:
/*!
* \brief Default constructor