[libcalamares] Simplify includes

- CalamaresVersion used by the job, not the API presented to Python.
 - Untangle Qt includes from there.
This commit is contained in:
Adriaan de Groot 2020-02-12 10:48:19 +01:00
parent f3e7fe5eb4
commit d42e757576
2 changed files with 7 additions and 3 deletions

View File

@ -19,6 +19,7 @@
#include "PythonJob.h" #include "PythonJob.h"
#include "CalamaresVersion.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "PythonHelper.h" #include "PythonHelper.h"

View File

@ -20,9 +20,7 @@
#ifndef PYTHONJOBAPI_H #ifndef PYTHONJOBAPI_H
#define PYTHONJOBAPI_H #define PYTHONJOBAPI_H
#include "CalamaresVersion.h" #include "qglobal.h" // For qreal
#include "PythonJob.h"
#undef slots #undef slots
#include "utils/boost-warnings.h" #include "utils/boost-warnings.h"
@ -32,6 +30,11 @@
#pragma clang diagnostic pop #pragma clang diagnostic pop
#endif #endif
namespace Calamares
{
class PythonJob;
}
namespace CalamaresPython namespace CalamaresPython
{ {