diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-01 01:00:23 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-03 14:13:02 +0100 |
| commit | 63312fe2ec1c1d8c0efabc02e3af8e5b47ca320e (patch) | |
| tree | fc850de8f31581cc6a64db7a78d1cca479e20ce9 /src/widgets/widgets | |
| parent | 5ebb03c47604e0597502fbe1069de636987f33fc (diff) | |
| parent | fbebc93617d99d2bf8fed559f17dba8bed15a063 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: If36d96c0fef3de5ab6503977501c55c62a2ecc97
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qtabbar.h | 6 | ||||
| -rw-r--r-- | src/widgets/widgets/qtabwidget.h | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/widgets/widgets/qtabbar.h b/src/widgets/widgets/qtabbar.h index c49c12f38c..f3cd914277 100644 --- a/src/widgets/widgets/qtabbar.h +++ b/src/widgets/widgets/qtabbar.h @@ -103,10 +103,10 @@ public: void moveTab(int from, int to); bool isTabEnabled(int index) const; - void setTabEnabled(int index, bool); + void setTabEnabled(int index, bool enabled); bool isTabVisible(int index) const; - void setTabVisible(int index, bool); + void setTabVisible(int index, bool visible); QString tabText(int index) const; void setTabText(int index, const QString &text); @@ -118,7 +118,7 @@ public: void setTabIcon(int index, const QIcon &icon); Qt::TextElideMode elideMode() const; - void setElideMode(Qt::TextElideMode); + void setElideMode(Qt::TextElideMode mode); #ifndef QT_NO_TOOLTIP void setTabToolTip(int index, const QString &tip); diff --git a/src/widgets/widgets/qtabwidget.h b/src/widgets/widgets/qtabwidget.h index e6b3f93303..ceec3f8dd8 100644 --- a/src/widgets/widgets/qtabwidget.h +++ b/src/widgets/widgets/qtabwidget.h @@ -80,13 +80,13 @@ public: void removeTab(int index); bool isTabEnabled(int index) const; - void setTabEnabled(int index, bool); + void setTabEnabled(int index, bool enabled); bool isTabVisible(int index) const; - void setTabVisible(int index, bool); + void setTabVisible(int index, bool visible); QString tabText(int index) const; - void setTabText(int index, const QString &); + void setTabText(int index, const QString &text); QIcon tabIcon(int index) const; void setTabIcon(int index, const QIcon & icon); @@ -110,7 +110,7 @@ public: enum TabPosition { North, South, West, East }; Q_ENUM(TabPosition) TabPosition tabPosition() const; - void setTabPosition(TabPosition); + void setTabPosition(TabPosition position); bool tabsClosable() const; void setTabsClosable(bool closeable); @@ -132,7 +132,7 @@ public: QWidget * cornerWidget(Qt::Corner corner = Qt::TopRightCorner) const; Qt::TextElideMode elideMode() const; - void setElideMode(Qt::TextElideMode); + void setElideMode(Qt::TextElideMode mode); QSize iconSize() const; void setIconSize(const QSize &size); |