diff --git a/src/cpp/include/nodegui/QtGui/QApplication/qapplication_wrap.h b/src/cpp/include/nodegui/QtGui/QApplication/qapplication_wrap.h index 882d13b35..def3e87ef 100644 --- a/src/cpp/include/nodegui/QtGui/QApplication/qapplication_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QApplication/qapplication_wrap.h @@ -2,11 +2,11 @@ #include -#include "napplication.hpp" #include #include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" +#include "napplication.hpp" class DLL_EXPORT QApplicationWrap : public Napi::ObjectWrap { QOBJECT_WRAPPED_METHODS_DECLARATION diff --git a/src/cpp/include/nodegui/core/Integration/integration.h b/src/cpp/include/nodegui/core/Integration/integration.h index 377c6ce68..aa23f964d 100644 --- a/src/cpp/include/nodegui/core/Integration/integration.h +++ b/src/cpp/include/nodegui/core/Integration/integration.h @@ -1,4 +1,4 @@ #pragma once namespace qodeIntegration { - void integrate(); +void integrate(); } \ No newline at end of file diff --git a/src/cpp/include/nodegui/core/Integration/qode-api.h b/src/cpp/include/nodegui/core/Integration/qode-api.h index 39d04eefa..f0f7d9b81 100644 --- a/src/cpp/include/nodegui/core/Integration/qode-api.h +++ b/src/cpp/include/nodegui/core/Integration/qode-api.h @@ -1,8 +1,8 @@ #pragma once // From Qode headers namespace qode { - extern int qode_argc; - extern char **qode_argv; - typedef int (*QodeCustomRunLoopFunc)(); - extern void InjectCustomRunLoop(QodeCustomRunLoopFunc customRunLoop); +extern int qode_argc; +extern char **qode_argv; +typedef int (*QodeCustomRunLoopFunc)(); +extern void InjectCustomRunLoop(QodeCustomRunLoopFunc customRunLoop); } // namespace qode \ No newline at end of file diff --git a/src/cpp/lib/QtGui/QApplication/qapplication_wrap.cpp b/src/cpp/lib/QtGui/QApplication/qapplication_wrap.cpp index f96558670..67543b7d1 100644 --- a/src/cpp/lib/QtGui/QApplication/qapplication_wrap.cpp +++ b/src/cpp/lib/QtGui/QApplication/qapplication_wrap.cpp @@ -1,4 +1,5 @@ #include "QtGui/QApplication/qapplication_wrap.h" + #include "Extras/Utils/nutils.h" #include "QtGui/QClipboard/qclipboard_wrap.h" #include "QtGui/QStyle/qstyle_wrap.h" diff --git a/src/cpp/lib/core/Integration/integration.cpp b/src/cpp/lib/core/Integration/integration.cpp index 6b9cbf0f2..ade308e0c 100644 --- a/src/cpp/lib/core/Integration/integration.cpp +++ b/src/cpp/lib/core/Integration/integration.cpp @@ -1,29 +1,30 @@ +#include "core/Integration/integration.h" + #include -#include "core/Integration/integration.h" -#include "core/Integration/qode-api.h" #include "QtGui/QApplication/napplication.hpp" +#include "core/Integration/qode-api.h" namespace qodeIntegration { - static NApplication* app; +static NApplication* app; - int QtRunLoopWrapper() { - int exitCode = app->exec(); - // if(exitCode != 0){ - exit(exitCode); - // } - return 0; - } +int QtRunLoopWrapper() { + int exitCode = app->exec(); + // if(exitCode != 0){ + exit(exitCode); + // } + return 0; +} - void integrate() { - // Bootstrap Qt - app = new NApplication(qode::qode_argc, qode::qode_argv); - qode::InjectCustomRunLoop(&QtRunLoopWrapper); - // Other init settings - QFont f = QApplication::font(); - if (f.defaultFamily().isEmpty()) { - f.setFamily("Sans-Serif"); - QApplication::setFont(f); - } +void integrate() { + // Bootstrap Qt + app = new NApplication(qode::qode_argc, qode::qode_argv); + qode::InjectCustomRunLoop(&QtRunLoopWrapper); + // Other init settings + QFont f = QApplication::font(); + if (f.defaultFamily().isEmpty()) { + f.setFamily("Sans-Serif"); + QApplication::setFont(f); } +} } // namespace qodeIntegration \ No newline at end of file