From 3c54bd67dacc2a5d11246213377e804be364a387 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 28 Sep 2011 22:34:12 +0200 Subject: [PATCH] Remove QT_MOC_COMPAT signals These are also obsolete since quite some time. Change-Id: Id04543ff4a4464922a204f59989abaeedb18df14 Reviewed-on: http://codereview.qt-project.org/5756 Reviewed-by: Qt Sanity Bot Reviewed-by: Friedemann Kleint --- src/widgets/kernel/qactiongroup.cpp | 7 ------- src/widgets/kernel/qactiongroup.h | 1 - src/widgets/kernel/qwidget.cpp | 5 ----- src/widgets/kernel/qwidget.h | 1 - 4 files changed, 14 deletions(-) diff --git a/src/widgets/kernel/qactiongroup.cpp b/src/widgets/kernel/qactiongroup.cpp index cbab6aa93a..25ff59947c 100644 --- a/src/widgets/kernel/qactiongroup.cpp +++ b/src/widgets/kernel/qactiongroup.cpp @@ -91,7 +91,6 @@ void QActionGroupPrivate::_q_actionTriggered() QAction *action = qobject_cast(q->sender()); Q_ASSERT_X(action != 0, "QWidgetGroup::_q_actionTriggered", "internal error"); emit q->triggered(action); - emit q->selected(action); } void QActionGroupPrivate::_q_actionHovered() @@ -408,12 +407,6 @@ bool QActionGroup::isVisible() const \endcode */ -/*! - \fn void QActionGroup::selected(QAction *action); - - Use triggered() instead. - -*/ QT_END_NAMESPACE diff --git a/src/widgets/kernel/qactiongroup.h b/src/widgets/kernel/qactiongroup.h index d8a95fcde4..5379ef4197 100644 --- a/src/widgets/kernel/qactiongroup.h +++ b/src/widgets/kernel/qactiongroup.h @@ -87,7 +87,6 @@ public Q_SLOTS: Q_SIGNALS: void triggered(QAction *); - QT_MOC_COMPAT void selected(QAction *); void hovered(QAction *); private: diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 2b9592f280..4d6c44398b 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -7456,11 +7456,6 @@ void QWidget::setVisible(bool visible) Convenience function, equivalent to setVisible(!\a hidden). */ -/*!\fn void QWidget::setShown(bool shown) - - Use setVisible(\a shown) instead. -*/ - void QWidgetPrivate::_q_showIfNotHidden() { diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index 365d995b4f..1e0e29eae9 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -496,7 +496,6 @@ public Q_SLOTS: void show(); #endif inline void hide() { setVisible(false); } - inline QT_MOC_COMPAT void setShown(bool shown) { setVisible(shown); } void showMinimized(); void showMaximized();