diff options
Diffstat (limited to 'src/gui/itemmodels')
-rw-r--r-- | src/gui/itemmodels/qstandarditemmodel.cpp | 6 | ||||
-rw-r--r-- | src/gui/itemmodels/qstandarditemmodel.h | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp index 44ee710268..4102230e1b 100644 --- a/src/gui/itemmodels/qstandarditemmodel.cpp +++ b/src/gui/itemmodels/qstandarditemmodel.cpp @@ -2909,12 +2909,6 @@ void QStandardItemModel::sort(int column, Qt::SortOrder order) } /*! - \fn QObject *QStandardItemModel::parent() const - \internal -*/ - - -/*! \reimp */ QStringList QStandardItemModel::mimeTypes() const diff --git a/src/gui/itemmodels/qstandarditemmodel.h b/src/gui/itemmodels/qstandarditemmodel.h index 509d21263d..75e6a71a6c 100644 --- a/src/gui/itemmodels/qstandarditemmodel.h +++ b/src/gui/itemmodels/qstandarditemmodel.h @@ -346,11 +346,7 @@ public: void clear(); -#ifdef Q_NO_USING_KEYWORD - inline QObject *parent() const { return QObject::parent(); } -#else using QObject::parent; -#endif void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) Q_DECL_OVERRIDE; |