diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-09-27 14:48:51 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-28 03:18:16 +0200 |
commit | a85d343a39577cdf953d0759e356c59a77ae743f (patch) | |
tree | fdbd9229902d5efc0ca637dc79d6aa7cc5645635 /src/widgets/widgets/qcombobox.h | |
parent | 3b6bb13e6a197bb4ba85b397ae9d2b8c659d6b26 (diff) |
Widgets: Remove QT3_SUPPPORT.
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Change-Id: Ie884f0cc9b3970b01c3c0c26600b1bcd92548077
Reviewed-on: http://codereview.qt-project.org/5629
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/widgets/qcombobox.h')
-rw-r--r-- | src/widgets/widgets/qcombobox.h | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h index ed766cc004..f0cffc2fcf 100644 --- a/src/widgets/widgets/qcombobox.h +++ b/src/widgets/widgets/qcombobox.h @@ -134,9 +134,6 @@ public: BeforeCurrent = InsertBeforeCurrent #endif }; -#ifdef QT3_SUPPORT - typedef InsertPolicy Policy; -#endif InsertPolicy insertPolicy() const; void setInsertPolicy(InsertPolicy policy); @@ -253,49 +250,6 @@ protected: QVariant inputMethodQuery(Qt::InputMethodQuery) const; void initStyleOption(QStyleOptionComboBox *option) const; -#ifdef QT3_SUPPORT -public: - QT3_SUPPORT_CONSTRUCTOR QComboBox(QWidget *parent, const char *name); - QT3_SUPPORT_CONSTRUCTOR QComboBox(bool rw, QWidget *parent, const char *name = 0); - inline QT3_SUPPORT int currentItem() const { return currentIndex(); } - inline QT3_SUPPORT void setCurrentItem(int index) { setCurrentIndex(index); } - inline QT3_SUPPORT InsertPolicy insertionPolicy() const { return insertPolicy(); } - inline QT3_SUPPORT void setInsertionPolicy(InsertPolicy policy) { setInsertPolicy(policy); } - inline QT3_SUPPORT bool editable() const { return isEditable(); } - inline QT3_SUPPORT void popup() { showPopup(); } - inline QT3_SUPPORT void setCurrentText(const QString& text) { - int i = findText(text); - if (i != -1) - setCurrentIndex(i); - else if (isEditable()) - setEditText(text); - else - setItemText(currentIndex(), text); - } - inline QT3_SUPPORT QString text(int index) const { return itemText(index); } - - inline QT3_SUPPORT QPixmap pixmap(int index) const - { return itemIcon(index).pixmap(iconSize(), isEnabled() ? QIcon::Normal : QIcon::Disabled); } - inline QT3_SUPPORT void insertStringList(const QStringList &list, int index = -1) - { insertItems((index < 0 ? count() : index), list); } - inline QT3_SUPPORT void insertItem(const QString &text, int index = -1) - { insertItem((index < 0 ? count() : index), text); } - inline QT3_SUPPORT void insertItem(const QPixmap &pix, int index = -1) - { insertItem((index < 0 ? count() : index), QIcon(pix), QString()); } - inline QT3_SUPPORT void insertItem(const QPixmap &pix, const QString &text, int index = -1) - { insertItem((index < 0 ? count() : index), QIcon(pix), text); } - inline QT3_SUPPORT void changeItem(const QString &text, int index) - { setItemText(index, text); } - inline QT3_SUPPORT void changeItem(const QPixmap &pix, int index) - { setItemIcon(index, QIcon(pix)); } - inline QT3_SUPPORT void changeItem(const QPixmap &pix, const QString &text, int index) - { setItemIcon(index, QIcon(pix)); setItemText(index, text); } - inline QT3_SUPPORT void clearValidator() { setValidator(0); } - inline QT3_SUPPORT void clearEdit() { clearEditText(); } - -Q_SIGNALS: - QT_MOC_COMPAT void textChanged(const QString &); -#endif protected: QComboBox(QComboBoxPrivate &, QWidget *); |