From ec963e106397d46e5c853e9adb3fbec1b27d9b04 Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Sat, 10 Oct 2015 10:16:32 +0200 Subject: Make QAspectThread private Change-Id: I1ca23ed346544e50a51ea6d2430b1e6f36a789a7 Task-number: QTBUG-48385 Reviewed-by: Sean Harmer --- src/core/aspects/aspects.pri | 4 +-- src/core/aspects/qaspectengine.cpp | 2 +- src/core/aspects/qaspectthread.cpp | 3 +- src/core/aspects/qaspectthread.h | 73 -------------------------------------- src/core/aspects/qaspectthread_p.h | 73 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 77 insertions(+), 78 deletions(-) delete mode 100644 src/core/aspects/qaspectthread.h create mode 100644 src/core/aspects/qaspectthread_p.h diff --git a/src/core/aspects/aspects.pri b/src/core/aspects/aspects.pri index 8153920e6..14d2f73f3 100644 --- a/src/core/aspects/aspects.pri +++ b/src/core/aspects/aspects.pri @@ -10,9 +10,9 @@ HEADERS += \ $$PWD/qabstractaspect.h \ $$PWD/qaspectengine.h \ $$PWD/qaspectfactory.h \ - $$PWD/qaspectthread.h \ $$PWD/qabstractaspect_p.h \ $$PWD/qaspectengine_p.h \ - $$PWD/qaspectmanager_p.h + $$PWD/qaspectmanager_p.h \ + $$PWD/qaspectthread_p.h INCLUDEPATH += $$PWD diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp index 9871f558d..7cccb9643 100644 --- a/src/core/aspects/qaspectengine.cpp +++ b/src/core/aspects/qaspectengine.cpp @@ -37,7 +37,7 @@ #include "qaspectengine.h" #include "qabstractaspect.h" -#include "qaspectthread.h" +#include "qaspectthread_p.h" #include "qaspectmanager_p.h" #include "qchangearbiter_p.h" #include "qabstractaspect.h" diff --git a/src/core/aspects/qaspectthread.cpp b/src/core/aspects/qaspectthread.cpp index 0b1a969d3..2a0e19e6f 100644 --- a/src/core/aspects/qaspectthread.cpp +++ b/src/core/aspects/qaspectthread.cpp @@ -34,8 +34,7 @@ ** ****************************************************************************/ -#include "qaspectthread.h" - +#include "qaspectthread_p.h" #include "qaspectmanager_p.h" #include diff --git a/src/core/aspects/qaspectthread.h b/src/core/aspects/qaspectthread.h deleted file mode 100644 index 8d32e28bd..000000000 --- a/src/core/aspects/qaspectthread.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3D_QASPECTTHREAD_H -#define QT3D_QASPECTTHREAD_H - -#include -#include - -#include - -QT_BEGIN_NAMESPACE - -namespace Qt3D { - -class QAspectManager; - -class QAspectThread : public QThread -{ - Q_OBJECT -public: - explicit QAspectThread(QObject *parent = 0); - - void waitForStart(Priority priority); - - QAspectManager *aspectManager() const { return m_aspectManager; } - -protected: - void run() Q_DECL_OVERRIDE; - -private: - QAspectManager *m_aspectManager; - QSemaphore m_semaphore; -}; - -} // namespace Qt3D - -QT_END_NAMESPACE - -#endif // QT3D_QASPECTTHREAD_H diff --git a/src/core/aspects/qaspectthread_p.h b/src/core/aspects/qaspectthread_p.h new file mode 100644 index 000000000..4437f4838 --- /dev/null +++ b/src/core/aspects/qaspectthread_p.h @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QT3D_QASPECTTHREAD_P_H +#define QT3D_QASPECTTHREAD_P_H + +#include +#include + +#include + +QT_BEGIN_NAMESPACE + +namespace Qt3D { + +class QAspectManager; + +class QAspectThread : public QThread +{ + Q_OBJECT +public: + explicit QAspectThread(QObject *parent = 0); + + void waitForStart(Priority priority); + + QAspectManager *aspectManager() const { return m_aspectManager; } + +protected: + void run() Q_DECL_OVERRIDE; + +private: + QAspectManager *m_aspectManager; + QSemaphore m_semaphore; +}; + +} // namespace Qt3D + +QT_END_NAMESPACE + +#endif // QT3D_QASPECTTHREAD_P_H -- cgit v1.2.3