aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/GpgFrontend.h.in7
-rw-r--r--src/core/model/GpgKeyTableModel.h7
-rw-r--r--src/core/model/GpgKeyTableProxyModel.cpp7
-rw-r--r--src/core/module/Event.cpp14
-rw-r--r--src/ui/UIModuleManager.cpp12
-rw-r--r--src/ui/dialog/controller/ModuleControllerDialog.cpp10
-rw-r--r--src/ui/dialog/settings/SettingsAppearance.cpp9
-rw-r--r--src/ui/dialog/settings/SettingsDialog.cpp7
8 files changed, 40 insertions, 33 deletions
diff --git a/src/GpgFrontend.h.in b/src/GpgFrontend.h.in
index d55235b5..e7a971d5 100644
--- a/src/GpgFrontend.h.in
+++ b/src/GpgFrontend.h.in
@@ -28,12 +28,15 @@
#pragma once
-#ifdef WINDOWS
+#if defined(_WIN32) || defined(WIN32)
#include <windows.h>
#include <winsock2.h>
#endif
-// build info
+// qt global
+#include <QtGlobal>
+
+// global build info
#define PROJECT_NAME "@CMAKE_PROJECT_NAME@"
#define OS_PLATFORM "@OS_PLATFORM@"
#define LOCALE_DIR "@LOCALE_DIR@"
diff --git a/src/core/model/GpgKeyTableModel.h b/src/core/model/GpgKeyTableModel.h
index 376af404..2c8ab9fa 100644
--- a/src/core/model/GpgKeyTableModel.h
+++ b/src/core/model/GpgKeyTableModel.h
@@ -206,10 +206,11 @@ class GPGFRONTEND_CORE_EXPORT GpgKeyTableModel : public QAbstractTableModel {
private:
GpgKeyList buffered_keys_;
QStringList column_headers_;
-#ifdef QT5_BUILD
- QVector<bool> key_check_state_;
-#else
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 4)
QList<bool> key_check_state_;
+#else
+ QVector<bool> key_check_state_;
#endif
};
diff --git a/src/core/model/GpgKeyTableProxyModel.cpp b/src/core/model/GpgKeyTableProxyModel.cpp
index 1fde6127..f1e715cd 100644
--- a/src/core/model/GpgKeyTableProxyModel.cpp
+++ b/src/core/model/GpgKeyTableProxyModel.cpp
@@ -169,10 +169,11 @@ void GpgKeyTableProxyModel::slot_update_favorites() {
void GpgKeyTableProxyModel::slot_update_column_type(
GpgKeyTableColumn filter_columns) {
filter_columns_ = filter_columns;
-#ifdef QT5_BUILD
- invalidateFilter();
-#else
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 4)
invalidateColumnsFilter();
+#else
+ invalidateFilter();
#endif
}
diff --git a/src/core/module/Event.cpp b/src/core/module/Event.cpp
index 221b6001..b6d31369 100644
--- a/src/core/module/Event.cpp
+++ b/src/core/module/Event.cpp
@@ -105,27 +105,27 @@ class Event::Impl {
int index = 0;
-#ifdef QT5_BUILD
- for (auto it = data_.keyValueBegin(); it != data_.keyValueEnd(); ++it) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
+ for (const auto& data : data_.asKeyValueRange()) {
p_param = static_cast<GFModuleEventParam*>(
SecureMalloc(sizeof(GFModuleEventParam)));
if (index++ == 0) event->params = p_param;
- p_param->name = GFStrDup(it->first);
- p_param->value = GFStrDup(it->second);
+ p_param->name = GFStrDup(data.first);
+ p_param->value = GFStrDup(data.second);
p_param->next = nullptr;
if (l_param != nullptr) l_param->next = p_param;
l_param = p_param;
}
#else
- for (const auto& data : data_.asKeyValueRange()) {
+ for (auto it = data_.keyValueBegin(); it != data_.keyValueEnd(); ++it) {
p_param = static_cast<GFModuleEventParam*>(
SecureMalloc(sizeof(GFModuleEventParam)));
if (index++ == 0) event->params = p_param;
- p_param->name = GFStrDup(data.first);
- p_param->value = GFStrDup(data.second);
+ p_param->name = GFStrDup(it->first);
+ p_param->value = GFStrDup(it->second);
p_param->next = nullptr;
if (l_param != nullptr) l_param->next = p_param;
diff --git a/src/ui/UIModuleManager.cpp b/src/ui/UIModuleManager.cpp
index 9dc519f3..4b2ce648 100644
--- a/src/ui/UIModuleManager.cpp
+++ b/src/ui/UIModuleManager.cpp
@@ -68,16 +68,16 @@ auto UIModuleManager::MountEntry(const QString& id,
MountedUIEntry m_entry;
m_entry.id_ = id;
-#ifdef QT5_BUILD
- for (auto it = meta_data.keyValueBegin(); it != meta_data.keyValueEnd();
- ++it) {
- meta_data[it->first] = QApplication::translate("GTrC", it->second.toUtf8());
- }
-#else
+#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
for (const auto& meta : meta_data.asKeyValueRange()) {
meta_data[meta.first] =
QApplication::translate("GTrC", meta.second.toUtf8());
}
+#else
+ for (auto it = meta_data.keyValueBegin(); it != meta_data.keyValueEnd();
+ ++it) {
+ meta_data[it->first] = QApplication::translate("GTrC", it->second.toUtf8());
+ }
#endif
m_entry.meta_data_ = std::move(meta_data);
diff --git a/src/ui/dialog/controller/ModuleControllerDialog.cpp b/src/ui/dialog/controller/ModuleControllerDialog.cpp
index 74351cfc..8bae2ccc 100644
--- a/src/ui/dialog/controller/ModuleControllerDialog.cpp
+++ b/src/ui/dialog/controller/ModuleControllerDialog.cpp
@@ -165,15 +165,15 @@ void ModuleControllerDialog::slot_load_module_details(
info << "# " << tr("METADATA") << Qt::endl << Qt::endl;
-#ifdef QT5_BUILD
+#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
+ for (const auto& metadata : module->GetModuleMetaData().asKeyValueRange()) {
+ info << " - " << metadata.first << ": " << metadata.second << "\n";
+ }
+#else
auto map = module->GetModuleMetaData();
for (auto it = map.keyValueBegin(); it != map.keyValueEnd(); ++it) {
info << " - " << it->first << ": " << it->second << "\n";
}
-#else
- for (const auto& metadata : module->GetModuleMetaData().asKeyValueRange()) {
- info << " - " << metadata.first << ": " << metadata.second << "\n";
- }
#endif
info << Qt::endl;
diff --git a/src/ui/dialog/settings/SettingsAppearance.cpp b/src/ui/dialog/settings/SettingsAppearance.cpp
index 06ea3aef..6b1eb076 100644
--- a/src/ui/dialog/settings/SettingsAppearance.cpp
+++ b/src/ui/dialog/settings/SettingsAppearance.cpp
@@ -140,12 +140,13 @@ void AppearanceTab::SetSettings() {
auto target_theme_index = ui_->themeComboBox->findText(theme);
if (theme.isEmpty() || target_theme_index == -1) {
-#ifdef QT5_BUILD
- ui_->themeComboBox->setCurrentIndex(ui_->themeComboBox->findText(
- QApplication::style()->metaObject()->className()));
-#else
+#if QT_VERSION >= QT_VERSION_CHECK(6, 1, 0)
ui_->themeComboBox->setCurrentIndex(
ui_->themeComboBox->findText(QApplication::style()->name()));
+#else
+ for (const auto& metadata : module->GetModuleMetaData().asKeyValueRange()) {
+ info << " - " << metadata.first << ": " << metadata.second << "\n";
+ }
#endif
} else {
ui_->themeComboBox->setCurrentIndex(target_theme_index);
diff --git a/src/ui/dialog/settings/SettingsDialog.cpp b/src/ui/dialog/settings/SettingsDialog.cpp
index 7480a03d..ca3071c2 100644
--- a/src/ui/dialog/settings/SettingsDialog.cpp
+++ b/src/ui/dialog/settings/SettingsDialog.cpp
@@ -130,10 +130,11 @@ auto SettingsDialog::ListLanguages() -> QHash<QString, QString> {
auto locale = file.mid(start, end - start);
QLocale const q_locale(locale);
-#ifdef QT5_BUILD
- if (q_locale.nativeCountryName().isEmpty()) continue;
-#else
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)
if (q_locale.nativeTerritoryName().isEmpty()) continue;
+#else
+ if (q_locale.nativeCountryName().isEmpty()) continue;
#endif
auto language = q_locale.nativeLanguageName() + " (" + locale + ")";
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-28 14:18:57 +0000