Call into libtheterminal

theCheeseboard · Apr 13, 2024 · aeb3d19 · aeb3d19
1 parent 70328d5
commit aeb3d19
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 5 deletions.
diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt
@@ -57,7 +57,7 @@ cntp_defaults_file(theterminal
     DEFAULTS_FILE theterminal.conf)
 
 target_link_libraries(theterminal PUBLIC Qt::Widgets Qt::Quick Qt::QuickControls2 libcontemporary libtheterminal)
-target_include_directories(theterminal PUBLIC ../libtheterminal/common/)
+target_include_directories(theterminal PUBLIC ../libtheterminal/common/ ../libtheterminal)
 
 install(TARGETS theterminal
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

diff --git a/application/main.cpp b/application/main.cpp
@@ -5,6 +5,7 @@
 #include <QUrl>
 #include <abstractpty.h>
 #include <tapplication.h>
+#include <theterminal-init.h>
 #include <tlogger.h>
 #include <tsettings.h>
 #include <tstylemanager.h>
@@ -14,6 +15,8 @@ int main(int argc, char* argv[]) {
     a.setApplicationShareDir("theterminal");
     a.installTranslators();
 
+    theTerminal::init();
+
     a.setApplicationVersion("1.0");
     a.setGenericName(QApplication::translate("main", "Terminal"));
     a.setApplicationLicense(tApplication::Gpl3OrLater);
@@ -28,7 +31,7 @@ int main(int argc, char* argv[]) {
 #endif
 
     tSettings settings;
-    QObject::connect(&settings, &tSettings::settingChanged, [ = ](QString key, QVariant value) {
+    QObject::connect(&settings, &tSettings::settingChanged, [=](QString key, QVariant value) {
         if (key == "theme/mode") {
             tStyleManager::setOverrideStyleForApplication(value.toString() == "light" ? tStyleManager::ContemporaryLight : tStyleManager::ContemporaryDark);
         }
@@ -41,11 +44,11 @@ int main(int argc, char* argv[]) {
     QQmlApplicationEngine engine;
     const QUrl url(u"qrc:/qt/qml/com/vicr123/theterminal/Main.qml"_qs);
     QObject::connect(
-    &engine, &QQmlApplicationEngine::objectCreationFailed, &a, [](QUrl url) {
+        &engine, &QQmlApplicationEngine::objectCreationFailed, &a, [](QUrl url) {
         QCoreApplication::exit(-1);
     }, Qt::QueuedConnection);
     QObject::connect(
-    &engine, &QQmlApplicationEngine::warnings, &a, [](const QList<QQmlError>& warnings) {
+        &engine, &QQmlApplicationEngine::warnings, &a, [](const QList<QQmlError>& warnings) {
 
     }, Qt::QueuedConnection);
     engine.load(url);

diff --git a/application/translations/en_US.ts b/application/translations/en_US.ts
@@ -95,7 +95,7 @@
 <context>
     <name>main</name>
     <message>
-        <location filename="../main.cpp" line="18"/>
+        <location filename="../main.cpp" line="21"/>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/libtheterminal/CMakeLists.txt b/libtheterminal/CMakeLists.txt
@@ -7,10 +7,12 @@ find_package(libcontemporary REQUIRED)
 
 set(SOURCES
     qmlinit.cpp
+    theterminal-init.cpp
 )
 
 set(HEADERS
     libtheterminal_global.h
+    theterminal-init.h
 )
 
 set(PRIVATE_HEADERS

diff --git a/libtheterminal/theterminal-init.cpp b/libtheterminal/theterminal-init.cpp
@@ -0,0 +1,9 @@
+#include "theterminal-init.h"
+#include <QQmlExtensionPlugin>
+
+Q_IMPORT_QML_PLUGIN(com_vicr123_theterminal_libtheterminalPlugin)
+
+void theTerminal::init() {
+    const volatile auto i = 0;
+    Q_UNUSED(i)
+}
diff --git a/libtheterminal/theterminal-init.h b/libtheterminal/theterminal-init.h
@@ -0,0 +1,8 @@
+#ifndef THETERMINALINIT_H
+#define THETERMINALINIT_H
+
+namespace theTerminal {
+    void init();
+}
+
+#endif // THETERMINALINIT_H