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/widgets/qtoolbutton.h | 53 --------------------------------------- 1 file changed, 53 deletions(-) (limited to 'src/widgets/widgets/qtoolbutton.h') diff --git a/src/widgets/widgets/qtoolbutton.h b/src/widgets/widgets/qtoolbutton.h index 7d1ff13409..5ec507904a 100644 --- a/src/widgets/widgets/qtoolbutton.h +++ b/src/widgets/widgets/qtoolbutton.h @@ -135,59 +135,6 @@ private: #endif Q_PRIVATE_SLOT(d_func(), void _q_actionTriggered()) -#ifdef QT3_SUPPORT -public: - enum TextPosition { - BesideIcon, - BelowIcon - , Right = BesideIcon, - Under = BelowIcon - }; - - QT3_SUPPORT_CONSTRUCTOR QToolButton(QWidget * parent, const char* name); - QT3_SUPPORT_CONSTRUCTOR QToolButton(Qt::ArrowType type, QWidget *parent, const char* name); - QT3_SUPPORT_CONSTRUCTOR QToolButton( const QIcon& s, const QString &textLabel, - const QString& grouptext, - QObject * receiver, const char* slot, - QWidget * parent, const char* name=0 ); - inline QT3_SUPPORT void setPixmap(const QPixmap &pixmap) { setIcon(static_cast(pixmap)); } - QT3_SUPPORT void setOnIconSet(const QIcon&); - QT3_SUPPORT void setOffIconSet(const QIcon&); - inline QT3_SUPPORT void setIconSet(const QIcon &icon){setIcon(icon);} - QT3_SUPPORT void setIconSet(const QIcon &, bool on); - inline QT3_SUPPORT void setTextLabel(const QString &text, bool tooltip = true) { - setText(text); -#ifndef QT_NO_TOOLTIP - if (tooltip) - setToolTip(text); -#else - Q_UNUSED(tooltip); -#endif - } - inline QT3_SUPPORT QString textLabel() const { return text(); } - QT3_SUPPORT QIcon onIconSet() const; - QT3_SUPPORT QIcon offIconSet() const; - QT3_SUPPORT QIcon iconSet(bool on) const; - inline QT3_SUPPORT QIcon iconSet() const { return icon(); } - inline QT3_SUPPORT void openPopup() { showMenu(); } - inline QT3_SUPPORT void setPopup(QMenu* popup) {setMenu(popup); } - inline QT3_SUPPORT QMenu* popup() const { return menu(); } - inline QT3_SUPPORT bool usesBigPixmap() const { return iconSize().height() > 22; } - inline QT3_SUPPORT bool usesTextLabel() const { return toolButtonStyle() != Qt::ToolButtonIconOnly; } - inline QT3_SUPPORT TextPosition textPosition() const - { return toolButtonStyle() == Qt::ToolButtonTextUnderIcon ? BelowIcon : BesideIcon; } - QT3_SUPPORT void setPopupDelay(int delay); - QT3_SUPPORT int popupDelay() const; - -public Q_SLOTS: - QT_MOC_COMPAT void setUsesBigPixmap(bool enable) - { setIconSize(enable?QSize(32,32):QSize(22,22)); } - QT_MOC_COMPAT void setUsesTextLabel(bool enable) - { setToolButtonStyle(enable?Qt::ToolButtonTextUnderIcon : Qt::ToolButtonIconOnly); } - QT_MOC_COMPAT void setTextPosition(QToolButton::TextPosition pos) - { setToolButtonStyle(pos == BesideIcon ? Qt::ToolButtonTextBesideIcon : Qt::ToolButtonTextUnderIcon); } - -#endif }; #endif // QT_NO_TOOLBUTTON -- cgit v1.2.3