aboutsummaryrefslogtreecommitdiffstats
path: root/src/templates/qquickcombobox.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-11 15:34:55 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-14 14:40:04 +0000
commitcd0c04c630b6924d444f0e84e1b63477e4346aeb (patch)
tree2196a818bf085be65630ce2034b12d46da29f03b /src/templates/qquickcombobox.cpp
parent96da2a94e1b2d25fa39417d9088c9889f504e934 (diff)
Popup: rename show()/hide() to open()/close()
QML popups have traditionally used more explicit open() and close(). Renaming them to show() and hide() at this stage doesn't seem to have any real advantages. Change-Id: I1e7c8c4817c67e62cef965525e00f5bf125a7d76 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/templates/qquickcombobox.cpp')
-rw-r--r--src/templates/qquickcombobox.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/templates/qquickcombobox.cpp b/src/templates/qquickcombobox.cpp
index f95dd357..4465d5dc 100644
--- a/src/templates/qquickcombobox.cpp
+++ b/src/templates/qquickcombobox.cpp
@@ -166,7 +166,7 @@ bool QQuickComboBoxPrivate::isPopupVisible() const
void QQuickComboBoxPrivate::showPopup()
{
if (popup && !popup->isVisible())
- popup->show();
+ popup->open();
setHighlightedIndex(currentIndex);
}
@@ -174,7 +174,7 @@ void QQuickComboBoxPrivate::hidePopup(bool accept)
{
Q_Q(QQuickComboBox);
if (popup && popup->isVisible())
- popup->hide();
+ popup->close();
if (accept) {
q->setCurrentIndex(highlightedIndex);
emit q->activated(currentIndex);