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/qlabel.cpp | |
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/qlabel.cpp')
-rw-r--r-- | src/widgets/widgets/qlabel.cpp | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index b122632e44..8a698c528a 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -193,75 +193,6 @@ QLabel::QLabel(const QString &text, QWidget *parent, Qt::WindowFlags f) } -#ifdef QT3_SUPPORT -/*! \obsolete - Constructs an empty label. - - The \a parent, \a name and widget flag \a f, arguments are passed - to the QFrame constructor. - - \sa setAlignment(), setFrameStyle(), setIndent() -*/ - -QLabel::QLabel(QWidget *parent, const char *name, Qt::WindowFlags f) - : QFrame(*new QLabelPrivate(), parent, f) -{ - Q_D(QLabel); - if (name) - setObjectName(QString::fromAscii(name)); - d->init(); -} - - -/*! \obsolete - Constructs a label that displays the text, \a text. - - The \a parent, \a name and widget flag \a f, arguments are passed - to the QFrame constructor. - - \sa setText(), setAlignment(), setFrameStyle(), setIndent() -*/ - -QLabel::QLabel(const QString &text, QWidget *parent, const char *name, - Qt::WindowFlags f) - : QFrame(*new QLabelPrivate(), parent, f) -{ - Q_D(QLabel); - if (name) - setObjectName(QString::fromAscii(name)); - d->init(); - setText(text); -} - - -/*! \obsolete - Constructs a label that displays the text \a text. The label has a - buddy widget, \a buddy. - - If the \a text contains an underlined letter (a letter preceded by - an ampersand, \&), when the user presses Alt+ the underlined letter, - focus is passed to the buddy widget. - - The \a parent, \a name and widget flag, \a f, arguments are passed - to the QFrame constructor. - - \sa setText(), setBuddy(), setAlignment(), setFrameStyle(), - setIndent() -*/ -QLabel::QLabel(QWidget *buddy, const QString &text, - QWidget *parent, const char *name, Qt::WindowFlags f) - : QFrame(*new QLabelPrivate(), parent, f) -{ - Q_D(QLabel); - if (name) - setObjectName(QString::fromAscii(name)); - d->init(); -#ifndef QT_NO_SHORTCUT - setBuddy(buddy); -#endif - setText(text); -} -#endif //QT3_SUPPORT /*! Destroys the label. @@ -512,20 +443,6 @@ void QLabel::setAlignment(Qt::Alignment alignment) d->updateLabel(); } -#ifdef QT3_SUPPORT -/*! - Use setAlignment(Qt::Alignment) instead. - - If \a alignment specifies text flags as well, use setTextFormat() - to set those. -*/ -void QLabel::setAlignment(int alignment) -{ - Q_D(QLabel); - d->align = alignment & ~(Qt::AlignVertical_Mask|Qt::AlignHorizontal_Mask|Qt::TextWordWrap); - setAlignment(Qt::Alignment(QFlag(alignment))); -} -#endif Qt::Alignment QLabel::alignment() const { |