feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove ExtraCompilerFactoryObserver

Browse Source 
Was only used by PchManager.

Change-Id: I610c1d4215613eb494e48225329660c1e2680d49
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Eike Ziller
2021-06-28 11:57:08 +02:00
parent d97c10a42e
commit bb195a95c7
4 changed files with 1 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/projectexplorer/extracompiler.cpp
View File

@@ -53,7 +53,7 @@ namespace ProjectExplorer {
Q_GLOBAL_STATIC(QThreadPool, s_extraCompilerThreadPool); Q_GLOBAL_STATIC(QThreadPool, s_extraCompilerThreadPool);
Q_GLOBAL_STATIC(QList<ExtraCompilerFactory *>, factories); Q_GLOBAL_STATIC(QList<ExtraCompilerFactory *>, factories);
Q_GLOBAL_STATIC(QVector<ExtraCompilerFactoryObserver *>, observers);
class ExtraCompilerPrivate class ExtraCompilerPrivate
{ {
public: public:
@@ -322,14 +322,6 @@ ExtraCompilerFactory::~ExtraCompilerFactory()
factories->removeAll(this); factories->removeAll(this);
} }
void ExtraCompilerFactory::annouceCreation(const Project *project,
const Utils::FilePath &source,
const Utils::FilePaths &targets)
{
for (ExtraCompilerFactoryObserver *observer : qAsConst(*observers))
observer->newExtraCompiler(project, source, targets);
}
QList<ExtraCompilerFactory *> ExtraCompilerFactory::extraCompilerFactories() QList<ExtraCompilerFactory *> ExtraCompilerFactory::extraCompilerFactories()
{ {
return *factories(); return *factories();
@@ -465,14 +457,4 @@ void ProcessExtraCompiler::cleanUp()
setCompileTime(QDateTime::currentDateTime()); setCompileTime(QDateTime::currentDateTime());
} }
ExtraCompilerFactoryObserver::ExtraCompilerFactoryObserver()
{
observers->push_back(this);
}
ExtraCompilerFactoryObserver::~ExtraCompilerFactoryObserver()
{
observers->removeOne(this);
}
} // namespace ProjectExplorer } // namespace ProjectExplorer

18
src/plugins/projectexplorer/extracompiler.h
View File

@@ -143,20 +143,6 @@ private:
QFutureWatcher<FileNameToContentsHash> *m_watcher = nullptr; QFutureWatcher<FileNameToContentsHash> *m_watcher = nullptr;
}; };
class PROJECTEXPLORER_EXPORT ExtraCompilerFactoryObserver
{
friend class ExtraCompilerFactory;
protected:
ExtraCompilerFactoryObserver();
~ExtraCompilerFactoryObserver();
virtual void newExtraCompiler(const Project *project,
const Utils::FilePath &source,
const Utils::FilePaths &targets)
= 0;
};
class PROJECTEXPLORER_EXPORT ExtraCompilerFactory : public QObject class PROJECTEXPLORER_EXPORT ExtraCompilerFactory : public QObject
{ {
Q_OBJECT Q_OBJECT
@@ -172,10 +158,6 @@ public:
const Utils::FilePaths &targets) const Utils::FilePaths &targets)
= 0; = 0;
void annouceCreation(const Project *project,
const Utils::FilePath &source,
const Utils::FilePaths &targets);
static QList<ExtraCompilerFactory *> extraCompilerFactories(); static QList<ExtraCompilerFactory *> extraCompilerFactories();
}; };

2
src/plugins/qtsupport/qscxmlcgenerator.cpp
View File

@@ -146,8 +146,6 @@ ExtraCompiler *QScxmlcGeneratorFactory::create(
const Project *project, const Utils::FilePath &source, const Project *project, const Utils::FilePath &source,
const Utils::FilePaths &targets) const Utils::FilePaths &targets)
{ {
annouceCreation(project, source, targets);
return new QScxmlcGenerator(project, source, targets, this); return new QScxmlcGenerator(project, source, targets, this);
} }

2
src/plugins/qtsupport/uicgenerator.cpp
View File

@@ -107,8 +107,6 @@ ExtraCompiler *UicGeneratorFactory::create(const Project *project,
const Utils::FilePath &source, const Utils::FilePath &source,
const Utils::FilePaths &targets) const Utils::FilePaths &targets)
{ {
annouceCreation(project, source, targets);
return new UicGenerator(project, source, targets, this); return new UicGenerator(project, source, targets, this);
} }