From d334ed84c569eda7b555b35f4d6e2dd5f239fd19 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Wed, 11 Nov 2020 11:50:41 +0100 Subject: [PATCH] API cleanup --- playground/grids/GridSkinny.cpp | 4 ++-- src/layouts/QskGridBox.cpp | 16 ++++++++-------- src/layouts/QskGridBox.h | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/playground/grids/GridSkinny.cpp b/playground/grids/GridSkinny.cpp index e8292d63..a4ce1f85 100644 --- a/playground/grids/GridSkinny.cpp +++ b/playground/grids/GridSkinny.cpp @@ -70,9 +70,9 @@ void GridSkinny::setSizeHint( int pos, Qt::Orientation orientation, Qt::SizeHint which, int hint ) { if ( orientation == Qt::Vertical ) - m_grid->setRowSizeHint( pos, which, hint ); + m_grid->setRowHeightHint( pos, which, hint ); else - m_grid->setColumnSizeHint( pos, which, hint ); + m_grid->setColumnWidthHint( pos, which, hint ); } void GridSkinny::setStretchFactor( diff --git a/src/layouts/QskGridBox.cpp b/src/layouts/QskGridBox.cpp index bff2911d..d8b45dac 100644 --- a/src/layouts/QskGridBox.cpp +++ b/src/layouts/QskGridBox.cpp @@ -345,34 +345,34 @@ int QskGridBox::columnStretchFactor( int column ) const void QskGridBox::setRowFixedHeight( int row, qreal height ) { - setRowSizeHint( row, Qt::MinimumSize, height ); - setRowSizeHint( row, Qt::MaximumSize, height ); + setRowHeightHint( row, Qt::MinimumSize, height ); + setRowHeightHint( row, Qt::MaximumSize, height ); } void QskGridBox::setColumnFixedWidth( int column, qreal width ) { - setColumnSizeHint( column, Qt::MinimumSize, width ); - setColumnSizeHint( column, Qt::MaximumSize, width ); + setColumnWidthHint( column, Qt::MinimumSize, width ); + setColumnWidthHint( column, Qt::MaximumSize, width ); } -void QskGridBox::setRowSizeHint( int row, Qt::SizeHint which, qreal height ) +void QskGridBox::setRowHeightHint( int row, Qt::SizeHint which, qreal height ) { if ( m_data->engine.setRowSizeHint( row, which, height ) ) polish(); } -qreal QskGridBox::rowSizeHint( int row, Qt::SizeHint which ) const +qreal QskGridBox::rowHeightHint( int row, Qt::SizeHint which ) const { return m_data->engine.rowSizeHint( row, which ); } -void QskGridBox::setColumnSizeHint( int column, Qt::SizeHint which, qreal width ) +void QskGridBox::setColumnWidthHint( int column, Qt::SizeHint which, qreal width ) { if ( m_data->engine.setColumnSizeHint( column, which, width ) ) polish(); } -qreal QskGridBox::columnSizeHint( int column, Qt::SizeHint which ) const +qreal QskGridBox::columnWidthHint( int column, Qt::SizeHint which ) const { return m_data->engine.columnSizeHint( column, which ); } diff --git a/src/layouts/QskGridBox.h b/src/layouts/QskGridBox.h index 73cfe27a..17208507 100644 --- a/src/layouts/QskGridBox.h +++ b/src/layouts/QskGridBox.h @@ -77,11 +77,11 @@ class QSK_EXPORT QskGridBox : public QskBox // row/column size hints - Q_INVOKABLE void setColumnSizeHint( int column, Qt::SizeHint, qreal width ); - Q_INVOKABLE qreal columnSizeHint( int column, Qt::SizeHint ) const; + Q_INVOKABLE void setColumnWidthHint( int column, Qt::SizeHint, qreal width ); + Q_INVOKABLE qreal columnWidthHint( int column, Qt::SizeHint ) const; - Q_INVOKABLE void setRowSizeHint( int row, Qt::SizeHint, qreal height ); - Q_INVOKABLE qreal rowSizeHint( int row, Qt::SizeHint ) const; + Q_INVOKABLE void setRowHeightHint( int row, Qt::SizeHint, qreal height ); + Q_INVOKABLE qreal rowHeightHint( int row, Qt::SizeHint ) const; Q_INVOKABLE void setRowFixedHeight( int row, qreal height ); Q_INVOKABLE void setColumnFixedWidth( int column, qreal width );