Adds initial intermediate qt6 porting state

This commit is contained in:
torsten committed 2026-08-17 17:54:56 +02:00
1 parent 99136e9460
commit d176b5e0d7
11247 files changed
+1891537

No files matched your search

@@ -0,0 +1,17 @@
#
# $Id$
# $HeadURL$
# $Author$
# Created by Christian Ehrlicher, SLSE, 2016-02-29
#
NGL_ADD_LIBRARY(WS SmoCommon STATIC logger.cpp logger.h settings.cpp settings.h)
NGL_TARGET_LINK_LIBRARIES(SmoCommon
NGLLogger
nglsettings
ngltools
)
NGL_TARGET_INCLUDE_DIRECTORIES(SmoCommon
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
)
@@ -0,0 +1,33 @@
#include "logger.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
namespace ServiceMonitor
{
LOGGER_T getLogger(const char *name)
{
static const char ns[] = "SMO.";
std::string loggerName;
const size_t len = strlen(name);
loggerName.reserve(sizeof(ns) + len);
loggerName.append(ns, sizeof(ns) - 1);
loggerName.append(name, len);
try
{
return NGL::NGLLoggerBootstrap::getNGLRootLogger().
getNGLLogger(loggerName);
}
catch (const std::exception &ex)
{
fprintf(stderr, "Error retrieving logger: %s", ex.what());
abort();
}
}
}
@@ -0,0 +1,17 @@
#pragma once
#include <NGLLogger/INGLLogger.h>
namespace ServiceMonitor
{
using LOGGER_T = NGL::INGLLogger &;
LOGGER_T getLogger(const char *name);
inline LOGGER_T getLogger(const QString &loggerName)
{
return getLogger(loggerName.toUtf8().constData());
}
}
@@ -0,0 +1,39 @@
#include "settings.h"
#include <nglsettings/nglsettings_settings.h>
#include <ngltools/ngltools_filesystem.h>
#include <QSettings>
namespace ServiceMonitor
{
class NGLSettingsClass : public NGL::Settings
{
public:
NGLSettingsClass()
: NGL::Settings(s_iniFile.isEmpty() ? NGL::findProjectConfigFile() : s_iniFile)
{}
static void setIniFile(const QString &fn)
{
s_iniFile = fn;
}
static QString s_iniFile;
};
QString NGLSettingsClass::s_iniFile;
Q_GLOBAL_STATIC(NGLSettingsClass, s)
NGL::Settings *Settings::settings()
{
return s();
}
void Settings::setIniFile(const QString &ini)
{
NGLSettingsClass::setIniFile(ini);
}
}
@@ -0,0 +1,17 @@
#pragma once
#include <QString>
namespace NGL { class Settings; }
namespace ServiceMonitor
{
namespace Settings
{
NGL::Settings *settings();
void setIniFile(const QString &ini);
}
}