diff options
author | Morten Sorvig <morten.sorvig@nokia.com> | 2011-09-07 11:44:00 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@nokia.com> | 2011-09-08 13:29:53 +0200 |
commit | 9abb38f5a693dfc30842c5c1aa012ab5d72e0d16 (patch) | |
tree | b3ba8b8ad39b254eb89d37c17d37b3c93d92cabb /src/widgets/widgets/qmenu.h | |
parent | 6f65a55fa9a5bf8a547dff2893d49ab405a16af0 (diff) |
Remove QT3_SUPPORT code from QMenu classes
Change-Id: I22df8f96ddca9784d6487a59a0c780ca9641fe23
Reviewed-on: http://codereview.qt-project.org/4434
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
Diffstat (limited to 'src/widgets/widgets/qmenu.h')
-rw-r--r-- | src/widgets/widgets/qmenu.h | 216 |
1 files changed, 0 insertions, 216 deletions
diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h index 8d7e281fd4..49bf8295ec 100644 --- a/src/widgets/widgets/qmenu.h +++ b/src/widgets/widgets/qmenu.h @@ -48,10 +48,6 @@ #include <QtWidgets/qaction.h> #include <QtWidgets/qplatformmenu_qpa.h> -#ifdef QT3_SUPPORT -#include <QtGui/qpixmap.h> -#endif - #ifdef Q_WS_WINCE #include <windef.h> // for HMENU #endif @@ -66,9 +62,6 @@ QT_MODULE(Gui) class QMenuPrivate; class QStyleOptionMenuItem; -#ifdef QT3_SUPPORT -class QMenuItem; -#endif class Q_WIDGETS_EXPORT QMenu : public QWidget { @@ -191,215 +184,6 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_actionHovered()) Q_PRIVATE_SLOT(d_func(), void _q_overrideMenuActionDestroyed()) -#ifdef QT3_SUPPORT -public: - //menudata - inline QT3_SUPPORT uint count() const { return actions().count(); } - inline QT3_SUPPORT int insertItem(const QString &text, const QObject *receiver, const char* member, - const QKeySequence& shortcut = 0, int id = -1, int index = -1) { - return insertAny(0, &text, receiver, member, &shortcut, 0, id, index); - } - inline QT3_SUPPORT int insertItem(const QIcon& icon, const QString &text, - const QObject *receiver, const char* member, - const QKeySequence& shortcut = 0, int id = -1, int index = -1) { - return insertAny(&icon, &text, receiver, member, &shortcut, 0, id, index); - } - inline QT3_SUPPORT int insertItem(const QPixmap &pixmap, const QObject *receiver, const char* member, - const QKeySequence& shortcut = 0, int id = -1, int index = -1) { - QIcon icon(pixmap); - return insertAny(&icon, 0, receiver, member, &shortcut, 0, id, index); - } - inline QT3_SUPPORT int insertItem(const QString &text, int id=-1, int index=-1) { - return insertAny(0, &text, 0, 0, 0, 0, id, index); - } - inline QT3_SUPPORT int insertItem(const QIcon& icon, const QString &text, int id=-1, int index=-1) { - return insertAny(&icon, &text, 0, 0, 0, 0, id, index); - } - inline QT3_SUPPORT int insertItem(const QString &text, QMenu *popup, int id=-1, int index=-1) { - return insertAny(0, &text, 0, 0, 0, popup, id, index); - } - inline QT3_SUPPORT int insertItem(const QIcon& icon, const QString &text, QMenu *popup, int id=-1, int index=-1) { - return insertAny(&icon, &text, 0, 0, 0, popup, id, index); - } - inline QT3_SUPPORT int insertItem(const QPixmap &pixmap, int id=-1, int index=-1) { - QIcon icon(pixmap); - return insertAny(&icon, 0, 0, 0, 0, 0, id, index); - } - inline QT3_SUPPORT int insertItem(const QPixmap &pixmap, QMenu *popup, int id=-1, int index=-1) { - QIcon icon(pixmap); - return insertAny(&icon, 0, 0, 0, 0, popup, id, index); - } - QT3_SUPPORT int insertItem(QMenuItem *item, int id=-1, int index=-1); - QT3_SUPPORT int insertSeparator(int index=-1); - inline QT3_SUPPORT void removeItem(int id) { - if(QAction *act = findActionForId(id)) - removeAction(act); } - inline QT3_SUPPORT void removeItemAt(int index) { - if(QAction *act = actions().value(index)) - removeAction(act); } -#ifndef QT_NO_SHORTCUT - inline QT3_SUPPORT QKeySequence accel(int id) const { - if(QAction *act = findActionForId(id)) - return act->shortcut(); - return QKeySequence(); } - inline QT3_SUPPORT void setAccel(const QKeySequence& key, int id) { - if(QAction *act = findActionForId(id)) - act->setShortcut(key); - } -#endif - inline QT3_SUPPORT QIcon iconSet(int id) const { - if(QAction *act = findActionForId(id)) - return act->icon(); - return QIcon(); } - inline QT3_SUPPORT QString text(int id) const { - if(QAction *act = findActionForId(id)) - return act->text(); - return QString(); } - inline QT3_SUPPORT QPixmap pixmap(int id) const { - if(QAction *act = findActionForId(id)) - return act->icon().pixmap(QSize(22, 22)); - return QPixmap(); } - inline QT3_SUPPORT void setWhatsThis(int id, const QString &w) { - if(QAction *act = findActionForId(id)) - act->setWhatsThis(w); } - inline QT3_SUPPORT QString whatsThis(int id) const { - if(QAction *act = findActionForId(id)) - return act->whatsThis(); - return QString(); } - - inline QT3_SUPPORT void changeItem(int id, const QString &text) { - if(QAction *act = findActionForId(id)) - act->setText(text); } - inline QT3_SUPPORT void changeItem(int id, const QPixmap &pixmap) { - if(QAction *act = findActionForId(id)) - act->setIcon(QIcon(pixmap)); } - inline QT3_SUPPORT void changeItem(int id, const QIcon &icon, const QString &text) { - if(QAction *act = findActionForId(id)) { - act->setIcon(icon); - act->setText(text); - } - } - inline QT3_SUPPORT void setActiveItem(int id) { - setActiveAction(findActionForId(id)); - } - inline QT3_SUPPORT bool isItemActive(int id) const { - return findActionForId(id) == activeAction(); - } - inline QT3_SUPPORT bool isItemEnabled(int id) const { - if(QAction *act = findActionForId(id)) - return act->isEnabled(); - return false; } - inline QT3_SUPPORT void setItemEnabled(int id, bool enable) { - if(QAction *act = findActionForId(id)) - act->setEnabled(enable); - } - inline QT3_SUPPORT bool isItemChecked(int id) const { - if(QAction *act = findActionForId(id)) - return act->isChecked(); - return false; - } - inline QT3_SUPPORT void setItemChecked(int id, bool check) { - if(QAction *act = findActionForId(id)) { - act->setCheckable(true); - act->setChecked(check); - } - } - inline QT3_SUPPORT bool isItemVisible(int id) const { - if(QAction *act = findActionForId(id)) - return act->isVisible(); - return false; - } - inline QT3_SUPPORT void setItemVisible(int id, bool visible) { - if(QAction *act = findActionForId(id)) - act->setVisible(visible); - } - inline QT3_SUPPORT QRect itemGeometry(int index) { - if(QAction *act = actions().value(index)) - return actionGeometry(act); - return QRect(); - } - inline QT3_SUPPORT QFont itemFont(int id) const { - if(QAction *act = findActionForId(id)) - return act->font(); - return QFont(); - } - inline QT3_SUPPORT void setItemFont(int id, const QFont &font) { - if(QAction *act = findActionForId(id)) - act->setFont(font); - } - inline QT3_SUPPORT int indexOf(int id) const { - return actions().indexOf(findActionForId(id)); - } - inline QT3_SUPPORT int idAt(int index) const { - return findIdForAction(actions().value(index)); - } - QT3_SUPPORT void setId (int index, int id); - inline QT3_SUPPORT void activateItemAt(int index) { - if(QAction *ret = actions().value(index)) - ret->activate(QAction::Trigger); - } - inline QT3_SUPPORT bool connectItem(int id, const QObject *receiver, const char* member) { - if(QAction *act = findActionForId(id)) { - QObject::connect(act, SIGNAL(activated(int)), receiver, member); - return true; - } - return false; - } - inline QT3_SUPPORT bool disconnectItem(int id,const QObject *receiver, const char* member) { - if(QAction *act = findActionForId(id)) { - QObject::disconnect(act, SIGNAL(triggered()), receiver, member); - return true; - } - return false; - } - inline QT3_SUPPORT QMenuItem *findItem(int id) const { - return reinterpret_cast<QMenuItem*>(findActionForId(id)); - } - - inline QT3_SUPPORT void setCheckable(bool){} - inline QT3_SUPPORT bool isCheckable() const {return true;} - - QT3_SUPPORT QMenuItem *findPopup( QMenu *popup, int *index ); - - QT3_SUPPORT bool setItemParameter(int id, int param); - QT3_SUPPORT int itemParameter(int id) const; - - //frame - QT3_SUPPORT int frameWidth() const; - - //popupmenu - inline QT3_SUPPORT void popup(const QPoint & pos, int indexAtPoint) { popup(pos, actions().value(indexAtPoint)); } - inline QT3_SUPPORT int insertTearOffHandle(int = 0, int = 0) { - setTearOffEnabled(true); - return -1; - } - -protected: - inline QT3_SUPPORT int itemAtPos(const QPoint &p, bool ignoreSeparator = true) { - QAction *ret = actionAt(p); - if(ignoreSeparator && ret && ret->isSeparator()) - return -1; - return findIdForAction(ret); - } - inline QT3_SUPPORT int columns() const { return columnCount(); } - inline QT3_SUPPORT int itemHeight(int index) { - return actionGeometry(actions().value(index)).height(); - } - inline QT3_SUPPORT int itemHeight(QMenuItem *mi) { - return actionGeometry(reinterpret_cast<QAction *>(mi)).height(); - } - -Q_SIGNALS: - QT_MOC_COMPAT void activated(int itemId); - QT_MOC_COMPAT void highlighted(int itemId); - -private: - int insertAny(const QIcon *icon, const QString *text, const QObject *receiver, const char *member, - const QKeySequence *shorcut, const QMenu *popup, int id, int index); - QAction *findActionForId(int id) const; - int findIdForAction(QAction*) const; -#endif - protected: QMenu(QMenuPrivate &dd, QWidget* parent = 0); |