mirror of https://github.com/vitalif/openscad
Use QCoreApplication - reduce Qt dependency
parent
d8ee4bdb2f
commit
8061a36dd1
|
@ -40,7 +40,7 @@
|
|||
#include "PolySetCGALEvaluator.h"
|
||||
#include "CGALCache.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QCoreApplication>
|
||||
#ifndef _MSC_VER
|
||||
#include <getopt.h>
|
||||
#endif
|
||||
|
@ -133,12 +133,12 @@ int main(int argc, char **argv)
|
|||
|
||||
Builtins::instance()->initialize();
|
||||
|
||||
QApplication app(argc, argv, false);
|
||||
QCoreApplication app(argc, argv);
|
||||
fs::path original_path = fs::current_path();
|
||||
|
||||
currentdir = boosty::stringy( fs::current_path() );
|
||||
|
||||
parser_init(QApplication::instance()->applicationDirPath().toStdString());
|
||||
parser_init(QCoreApplication::instance()->applicationDirPath().toStdString());
|
||||
|
||||
Context root_ctx;
|
||||
register_builtin(root_ctx);
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
#include "cgal.h"
|
||||
#include "OffscreenView.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QCoreApplication>
|
||||
#ifndef _MSC_VER
|
||||
#include <getopt.h>
|
||||
#endif
|
||||
|
@ -106,12 +106,12 @@ int main(int argc, char **argv)
|
|||
#endif
|
||||
Builtins::instance()->initialize();
|
||||
|
||||
QApplication app(argc, argv, false);
|
||||
QCoreApplication app(argc, argv);
|
||||
fs::path original_path = fs::current_path();
|
||||
|
||||
currentdir = boosty::stringy( fs::current_path() );
|
||||
|
||||
parser_init(QApplication::instance()->applicationDirPath().toStdString());
|
||||
parser_init(QCoreApplication::instance()->applicationDirPath().toStdString());
|
||||
|
||||
Context root_ctx;
|
||||
register_builtin(root_ctx);
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
#include "CGALEvaluator.h"
|
||||
#include "PolySetCGALEvaluator.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QCoreApplication>
|
||||
#include <QFile>
|
||||
#include <QDir>
|
||||
#include <QSet>
|
||||
|
@ -92,12 +92,12 @@ int main(int argc, char **argv)
|
|||
|
||||
Builtins::instance()->initialize();
|
||||
|
||||
QApplication app(argc, argv, false);
|
||||
QCoreApplication app(argc, argv);
|
||||
fs::path original_path = fs::current_path();
|
||||
|
||||
currentdir = boosty::stringy( fs::current_path() );
|
||||
|
||||
parser_init(QApplication::instance()->applicationDirPath().toStdString());
|
||||
parser_init(QCoreApplication::instance()->applicationDirPath().toStdString());
|
||||
|
||||
Context root_ctx;
|
||||
register_builtin(root_ctx);
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
#include "CGALEvaluator.h"
|
||||
#include "PolySetCGALEvaluator.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QCoreApplication>
|
||||
#ifndef _MSC_VER
|
||||
#include <getopt.h>
|
||||
#endif
|
||||
|
@ -85,12 +85,12 @@ int main(int argc, char **argv)
|
|||
|
||||
Builtins::instance()->initialize();
|
||||
|
||||
QApplication app(argc, argv, false);
|
||||
QCoreApplication app(argc, argv);
|
||||
fs::path original_path = fs::current_path();
|
||||
|
||||
currentdir = boosty::stringy( fs::current_path() );
|
||||
|
||||
parser_init(QApplication::instance()->applicationDirPath().toStdString());
|
||||
parser_init(QCoreApplication::instance()->applicationDirPath().toStdString());
|
||||
|
||||
Context root_ctx;
|
||||
register_builtin(root_ctx);
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
#include "Tree.h"
|
||||
#include "csgterm.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QCoreApplication>
|
||||
#ifndef _MSC_VER
|
||||
#include <getopt.h>
|
||||
#endif
|
||||
|
@ -71,12 +71,12 @@ int main(int argc, char **argv)
|
|||
|
||||
Builtins::instance()->initialize();
|
||||
|
||||
QApplication app(argc, argv, false);
|
||||
QCoreApplication app(argc, argv);
|
||||
fs::path original_path = fs::current_path();
|
||||
|
||||
currentdir = boosty::stringy( fs::current_path() );
|
||||
|
||||
parser_init(QApplication::instance()->applicationDirPath().toStdString());
|
||||
parser_init(QCoreApplication::instance()->applicationDirPath().toStdString());
|
||||
|
||||
Context root_ctx;
|
||||
register_builtin(root_ctx);
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include "csgtermnormalizer.h"
|
||||
#include "OffscreenView.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QCoreApplication>
|
||||
#include <QTimer>
|
||||
|
||||
#include <sstream>
|
||||
|
@ -251,13 +251,13 @@ int csgtestcore(int argc, char *argv[], test_type_e test_type)
|
|||
|
||||
Builtins::instance()->initialize();
|
||||
|
||||
QApplication app(argc, argv, false);
|
||||
QCoreApplication app(argc, argv);
|
||||
|
||||
fs::path original_path = fs::current_path();
|
||||
|
||||
std::string currentdir = boosty::stringy( fs::current_path() );
|
||||
|
||||
parser_init(QApplication::instance()->applicationDirPath().toStdString());
|
||||
parser_init(QCoreApplication::instance()->applicationDirPath().toStdString());
|
||||
|
||||
Context root_ctx;
|
||||
register_builtin(root_ctx);
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
#include "builtin.h"
|
||||
#include "Tree.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QCoreApplication>
|
||||
#ifndef _MSC_VER
|
||||
#include <getopt.h>
|
||||
#endif
|
||||
|
@ -75,12 +75,12 @@ int main(int argc, char **argv)
|
|||
|
||||
Builtins::instance()->initialize();
|
||||
|
||||
QApplication app(argc, argv, false);
|
||||
QCoreApplication app(argc, argv);
|
||||
fs::path original_path = fs::current_path();
|
||||
|
||||
currentdir = boosty::stringy( fs::current_path() );
|
||||
|
||||
parser_init(QApplication::instance()->applicationDirPath().toStdString());
|
||||
parser_init(QCoreApplication::instance()->applicationDirPath().toStdString());
|
||||
|
||||
Context root_ctx;
|
||||
register_builtin(root_ctx);
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include "builtin.h"
|
||||
#include "Tree.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QCoreApplication>
|
||||
#ifndef _MSC_VER
|
||||
#include <getopt.h>
|
||||
#endif
|
||||
|
@ -81,12 +81,12 @@ int main(int argc, char **argv)
|
|||
|
||||
Builtins::instance()->initialize();
|
||||
|
||||
QApplication app(argc, argv, false);
|
||||
QCoreApplication app(argc, argv);
|
||||
fs::path original_path = fs::current_path();
|
||||
|
||||
currentdir = boosty::stringy( fs::current_path() );
|
||||
|
||||
parser_init(QApplication::instance()->applicationDirPath().toStdString());
|
||||
parser_init(QCoreApplication::instance()->applicationDirPath().toStdString());
|
||||
|
||||
Context root_ctx;
|
||||
register_builtin(root_ctx);
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
#include "builtin.h"
|
||||
#include "printutils.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QCoreApplication>
|
||||
#ifndef _MSC_VER
|
||||
#include <getopt.h>
|
||||
#endif
|
||||
|
@ -83,12 +83,12 @@ int main(int argc, char **argv)
|
|||
|
||||
Builtins::instance()->initialize();
|
||||
|
||||
QApplication app(argc, argv, false);
|
||||
QCoreApplication app(argc, argv);
|
||||
fs::path original_path = fs::current_path();
|
||||
|
||||
currentdir = boosty::stringy( fs::current_path() );
|
||||
|
||||
parser_init(QApplication::instance()->applicationDirPath().toStdString());
|
||||
parser_init(QCoreApplication::instance()->applicationDirPath().toStdString());
|
||||
|
||||
Context root_ctx;
|
||||
register_builtin(root_ctx);
|
||||
|
|
Loading…
Reference in New Issue