diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-16 17:27:31 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-20 07:38:17 +0100 |
| commit | 2e4b1a8334d4de585e90637c070ba9832a0608f1 (patch) | |
| tree | 4eb33e95bf8f5d064b219bf271bc5c30cffd5de9 /src/widgets/itemviews | |
| parent | 5d366f7e422129ec0c229b78f247b66e4ba63a59 (diff) | |
Remove Q_NO_USING_KEYWORD
There's a lot of code now requiring it. Any compiler that doesn't
support the keyword is too old for Qt now. The last time anyone asked
about this macro was for QTBUG-27393 and we don't know which compiler
that was.
As a necessity, this patch contains a reversal of
a0c3a57aed5cde37017733e7cf5e41cc6a1174aa
[ChangeLog][Compiler Specific Changes] Qt 5.5 now unconditionally uses
the "using" keyword. Compilers that do not support this keyword are
deprecated and will not be able to build Qt. Previous versions of Qt may
or may not compile, as no testing was done to ensure it worked.
Change-Id: Ief042f34aba555a095d1f342a0ee7ee9feadf42d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Diffstat (limited to 'src/widgets/itemviews')
| -rw-r--r-- | src/widgets/itemviews/qabstractitemview.cpp | 5 | ||||
| -rw-r--r-- | src/widgets/itemviews/qabstractitemview.h | 4 | ||||
| -rw-r--r-- | src/widgets/itemviews/qdirmodel.cpp | 5 | ||||
| -rw-r--r-- | src/widgets/itemviews/qdirmodel.h | 4 |
4 files changed, 0 insertions, 18 deletions
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index 68f43aa750..2460955eb4 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -594,11 +594,6 @@ void QAbstractItemViewPrivate::_q_scrollerStateChanged() */ /*! - \fn void QAbstractItemView::update() - \internal -*/ - -/*! Constructs an abstract item view with the given \a parent. */ QAbstractItemView::QAbstractItemView(QWidget *parent) diff --git a/src/widgets/itemviews/qabstractitemview.h b/src/widgets/itemviews/qabstractitemview.h index 18b024a0e8..28c43633ea 100644 --- a/src/widgets/itemviews/qabstractitemview.h +++ b/src/widgets/itemviews/qabstractitemview.h @@ -211,11 +211,7 @@ public: virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE; -#ifdef Q_NO_USING_KEYWORD - inline void update() { QAbstractScrollArea::update(); } -#else using QAbstractScrollArea::update; -#endif public Q_SLOTS: virtual void reset(); diff --git a/src/widgets/itemviews/qdirmodel.cpp b/src/widgets/itemviews/qdirmodel.cpp index 6bb8cd29c5..bff50fae0a 100644 --- a/src/widgets/itemviews/qdirmodel.cpp +++ b/src/widgets/itemviews/qdirmodel.cpp @@ -1146,11 +1146,6 @@ QFileInfo QDirModel::fileInfo(const QModelIndex &index) const return node->info; } -/*! - \fn QObject *QDirModel::parent() const - \internal -*/ - /* The root node is never seen outside the model. */ diff --git a/src/widgets/itemviews/qdirmodel.h b/src/widgets/itemviews/qdirmodel.h index 68d6f56152..56b5a247d4 100644 --- a/src/widgets/itemviews/qdirmodel.h +++ b/src/widgets/itemviews/qdirmodel.h @@ -121,11 +121,7 @@ public: QIcon fileIcon(const QModelIndex &index) const; QFileInfo fileInfo(const QModelIndex &index) const; -#ifdef Q_NO_USING_KEYWORD - inline QObject *parent() const { return QObject::parent(); } -#else using QObject::parent; -#endif public Q_SLOTS: void refresh(const QModelIndex &parent = QModelIndex()); |