From a85d343a39577cdf953d0759e356c59a77ae743f Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 27 Sep 2011 14:48:51 +0200 Subject: Widgets: Remove QT3_SUPPPORT. Reviewed-by: Lars Knoll Change-Id: Ie884f0cc9b3970b01c3c0c26600b1bcd92548077 Reviewed-on: http://codereview.qt-project.org/5629 Reviewed-by: Friedemann Kleint Reviewed-by: Qt Sanity Bot Reviewed-by: Lars Knoll --- src/widgets/kernel/qaction.h | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'src/widgets/kernel/qaction.h') diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h index da8c24e184..193328dbdd 100644 --- a/src/widgets/kernel/qaction.h +++ b/src/widgets/kernel/qaction.h @@ -102,14 +102,6 @@ public: QAction(const QString &text, QObject* parent); QAction(const QIcon &icon, const QString &text, QObject* parent); -#ifdef QT3_SUPPORT - QT3_SUPPORT_CONSTRUCTOR QAction(QObject* parent, const char* name); - QT3_SUPPORT_CONSTRUCTOR QAction(const QString &text, const QKeySequence &shortcut, - QObject* parent, const char* name); - QT3_SUPPORT_CONSTRUCTOR QAction(const QIcon &icon, const QString &text, - const QKeySequence &shortcut, - QObject* parent, const char* name); -#endif ~QAction(); void setActionGroup(QActionGroup *group); @@ -186,19 +178,6 @@ public: void setIconVisibleInMenu(bool visible); bool isIconVisibleInMenu() const; -#ifdef QT3_SUPPORT - inline QT3_SUPPORT void setMenuText(const QString &text) { setText(text); } - inline QT3_SUPPORT QString menuText() const { return text(); } - inline QT3_SUPPORT bool isOn() const { return isChecked(); } - inline QT3_SUPPORT bool isToggleAction() const { return isCheckable(); } - inline QT3_SUPPORT void setToggleAction(bool b) { setCheckable(b); } - inline QT3_SUPPORT void setIconSet(const QIcon &i) { setIcon(i); } - inline QT3_SUPPORT QIcon iconSet() const { return icon(); } - inline QT3_SUPPORT bool addTo(QWidget *w) { w->addAction(this); return true; } - inline QT3_SUPPORT bool removeFrom(QWidget *w) { w->removeAction(this); return true; } - inline QT3_SUPPORT void setAccel(const QKeySequence &shortcut) { setShortcut(shortcut); } - inline QT3_SUPPORT QKeySequence accel() const { return shortcut(); } -#endif QWidget *parentWidget() const; @@ -212,9 +191,6 @@ protected: QAction(QActionPrivate &dd, QObject *parent); public Q_SLOTS: -#ifdef QT3_SUPPORT - inline QT_MOC_COMPAT void setOn(bool b) { setChecked(b); } -#endif void trigger() { activate(Trigger); } void hover() { activate(Hover); } void setChecked(bool); @@ -228,16 +204,10 @@ Q_SIGNALS: void triggered(bool checked = false); void hovered(); void toggled(bool); -#ifdef QT3_SUPPORT - QT_MOC_COMPAT void activated(int = 0); -#endif private: Q_DISABLE_COPY(QAction) -#ifdef QT3_SUPPORT - friend class QMenuItem; -#endif friend class QGraphicsWidget; friend class QWidget; friend class QActionGroup; -- cgit v1.2.3