Skip to content

FinceptTerminal is a modern finance application offering advanced market analytics, investment research, and economic data tools, designed for interactive exploration and data-driven decision-making in a user-friendly environment.

compilation fixes for c--15.2and qt-6.11

Florian Gothb5ed12b719d9
diff --git a/fincept-qt/src/screens/agent_config/CreateAgentPanel.cpp b/fincept-qt/src/screens/agent_config/CreateAgentPanel.cpp
index e5232661f..b16e90103 100644
--- a/fincept-qt/src/screens/agent_config/CreateAgentPanel.cpp
+++ b/fincept-qt/src/screens/agent_config/CreateAgentPanel.cpp
@@ -28,14 +28,14 @@ using namespace fincept::ui::colors;
static QString input_style() {
return QString("background:%1;color:%2;border:1px solid %3;padding:3px 6px;font-size:12px;")
- .arg(BG_RAISED, TEXT_PRIMARY, BORDER_MED);
+ .arg(BG_RAISED(), TEXT_PRIMARY(), BORDER_MED());
}
static QString combo_style() {
return QString("QComboBox{background:%1;color:%2;border:1px solid %3;padding:3px 6px;font-size:12px;}"
"QComboBox::drop-down{border:none;}"
"QComboBox QAbstractItemView{background:%1;color:%2;selection-background-color:%4;}")
- .arg(BG_RAISED, TEXT_PRIMARY, BORDER_MED, AMBER_DIM);
+ .arg(BG_RAISED(), TEXT_PRIMARY(), BORDER_MED(), AMBER_DIM());
}
static QString list_style() {
@@ -43,20 +43,20 @@ static QString list_style() {
"QListWidget::item{padding:3px 6px;border-bottom:1px solid %2;}"
"QListWidget::item:selected{background:%4;color:%3;}"
"QListWidget::item:hover{background:%5;}")
- .arg(BG_BASE, BORDER_DIM, TEXT_PRIMARY, AMBER_DIM, BG_HOVER);
+ .arg(BG_BASE(), BORDER_DIM(), TEXT_PRIMARY(), AMBER_DIM(), BG_HOVER());
}
static QLabel* section_label(const QString& text) {
auto* l = new QLabel(text);
l->setStyleSheet(QString("color:%1;font-size:10px;font-weight:700;letter-spacing:1px;"
"padding:8px 0 3px 0;border-bottom:1px solid %2;margin-bottom:2px;")
- .arg(AMBER, BORDER_DIM));
+ .arg(AMBER(), BORDER_DIM()));
return l;
}
static QLabel* field_lbl(const QString& text) {
auto* l = new QLabel(text);
- l->setStyleSheet(QString("color:%1;font-size:10px;min-width:80px;").arg(TEXT_SECONDARY));
+ l->setStyleSheet(QString("color:%1;font-size:10px;min-width:80px;").arg(TEXT_SECONDARY()));
return l;
}
diff --git a/fincept-qt/src/screens/maritime/MaritimeScreen.cpp b/fincept-qt/src/screens/maritime/MaritimeScreen.cpp
index dc0cbbc91..2c2a2f0d3 100644
--- a/fincept-qt/src/screens/maritime/MaritimeScreen.cpp
+++ b/fincept-qt/src/screens/maritime/MaritimeScreen.cpp
@@ -201,7 +201,7 @@ void MaritimeScreen::set_status(const QString& text, const ui::ColorToken& color
return;
status_label_->setText(text);
status_label_->setStyleSheet(
- QString("color:%1; font-size:8px; font-weight:700; font-family:%2;").arg(color).arg(ui::fonts::DATA_FAMILY));
+ QString("color:%1; font-size:8px; font-weight:700; font-family:%2;").arg(C(color) ).arg(ui::fonts::DATA_FAMILY));
}
// ── Build UI ─────────────────────────────────────────────────────────────────
@@ -296,7 +296,7 @@ QWidget* MaritimeScreen::build_left_panel() {
.arg(ui::fonts::DATA_FAMILY));
auto* val = new QLabel(value, box);
val->setStyleSheet(QString("color:%1; font-size:12px; font-weight:700; font-family:%2;")
- .arg(val_color)
+ .arg(C(val_color))
.arg(ui::fonts::DATA_FAMILY));
val->setObjectName(label);
bvl->addWidget(lbl);
diff --git a/fincept-qt/src/screens/notes/NotesScreen.cpp b/fincept-qt/src/screens/notes/NotesScreen.cpp
index bfc0bc3eb..d681367ac 100644
--- a/fincept-qt/src/screens/notes/NotesScreen.cpp
+++ b/fincept-qt/src/screens/notes/NotesScreen.cpp
@@ -124,7 +124,7 @@ static QString sentiment_color(const QString& s) {
// ── Constructor ──────────────────────────────────────────────────────────────
NotesScreen::NotesScreen(QWidget* parent) : QWidget(parent) {
- setStyleSheet(QString("background: %1;").arg(BG_BASE));
+ setStyleSheet(QString("background: %1;").arg(BG_BASE()));
build_ui();
load_notes();
}
@@ -151,7 +151,7 @@ void NotesScreen::build_ui() {
QWidget* NotesScreen::build_category_sidebar() {
auto* panel = new QWidget(this);
panel->setFixedWidth(200);
- panel->setStyleSheet(QString("background: %1; border-right: 1px solid %2;").arg(BG_SURFACE, BORDER_DIM));
+ panel->setStyleSheet(QString("background: %1; border-right: 1px solid %2;").arg(BG_SURFACE(), BORDER_DIM()));
auto* lay = new QVBoxLayout(panel);
lay->setContentsMargins(0, 0, 0, 0);
@@ -163,7 +163,7 @@ QWidget* NotesScreen::build_category_sidebar() {
header->setStyleSheet(QString("background: %1; color: %2; font-size: 12px; font-weight: 700; "
"letter-spacing: 0.5px; border-bottom: 1px solid %3; padding-left: 12px; "
"font-family: 'Consolas','Courier New',monospace;")
- .arg(BG_RAISED, AMBER, BORDER_DIM));
+ .arg(BG_RAISED(), AMBER(), BORDER_DIM()));
lay->addWidget(header);
// Category list
@@ -182,7 +182,7 @@ QWidget* NotesScreen::build_category_sidebar() {
stats_label_->setAlignment(Qt::AlignCenter);
stats_label_->setStyleSheet(QString("background: %1; color: %2; font-size: 11px; border-top: 1px solid %3; "
"font-family: 'Consolas','Courier New',monospace;")
- .arg(BG_SURFACE, TEXT_SECONDARY, BORDER_DIM));
+ .arg(BG_SURFACE(), TEXT_SECONDARY(), BORDER_DIM()));
lay->addWidget(stats_label_);
return panel;
@@ -193,7 +193,7 @@ QWidget* NotesScreen::build_category_sidebar() {
QWidget* NotesScreen::build_notes_list_panel() {
auto* panel = new QWidget(this);
panel->setMinimumWidth(280);
- panel->setStyleSheet(QString("background: %1;").arg(BG_SURFACE));
+ panel->setStyleSheet(QString("background: %1;").arg(BG_SURFACE()));
auto* lay = new QVBoxLayout(panel);
lay->setContentsMargins(0, 0, 0, 0);
@@ -202,7 +202,7 @@ QWidget* NotesScreen::build_notes_list_panel() {
// Header with search + new button
auto* toolbar = new QWidget(this);
toolbar->setFixedHeight(34);
- toolbar->setStyleSheet(QString("background: %1; border-bottom: 1px solid %2;").arg(BG_RAISED, BORDER_DIM));
+ toolbar->setStyleSheet(QString("background: %1; border-bottom: 1px solid %2;").arg(BG_RAISED(), BORDER_DIM()));
auto* tl = new QHBoxLayout(toolbar);
tl->setContentsMargins(8, 0, 8, 0);
tl->setSpacing(6);
@@ -234,7 +234,7 @@ QWidget* NotesScreen::build_notes_list_panel() {
count_label_->setAlignment(Qt::AlignCenter);
count_label_->setStyleSheet(QString("background: %1; color: %2; font-size: 11px; border-top: 1px solid %3; "
"font-family: 'Consolas','Courier New',monospace;")
- .arg(BG_SURFACE, TEXT_TERTIARY, BORDER_DIM));
+ .arg(BG_SURFACE(), TEXT_TERTIARY(), BORDER_DIM()));
lay->addWidget(count_label_);
return panel;
@@ -247,18 +247,18 @@ QWidget* NotesScreen::build_editor_panel() {
// ── Page 0: Empty state ──────────────────────────────────────────────────
auto* empty = new QWidget(this);
- empty->setStyleSheet(QString("background: %1;").arg(BG_BASE));
+ empty->setStyleSheet(QString("background: %1;").arg(BG_BASE()));
auto* el = new QVBoxLayout(empty);
el->setAlignment(Qt::AlignCenter);
auto* empty_label = new QLabel("Select a note or create a new one");
empty_label->setStyleSheet(
- QString("color: %1; font-size: 14px; font-family: 'Consolas','Courier New',monospace;").arg(TEXT_TERTIARY));
+ QString("color: %1; font-size: 14px; font-family: 'Consolas','Courier New',monospace;").arg(TEXT_TERTIARY()));
el->addWidget(empty_label, 0, Qt::AlignCenter);
right_stack_->addWidget(empty); // index 0
// ── Page 1: View mode ────────────────────────────────────────────────────
auto* view_page = new QWidget(this);
- view_page->setStyleSheet(QString("background: %1;").arg(BG_BASE));
+ view_page->setStyleSheet(QString("background: %1;").arg(BG_BASE() ));
auto* vl = new QVBoxLayout(view_page);
vl->setContentsMargins(14, 14, 14, 14);
vl->setSpacing(10);
@@ -291,19 +291,19 @@ QWidget* NotesScreen::build_editor_panel() {
view_title_ = new QLabel;
view_title_->setStyleSheet(
QString("color: %1; font-size: 20px; font-weight: bold; font-family: 'Consolas','Courier New',monospace;")
- .arg(TEXT_PRIMARY));
+ .arg(TEXT_PRIMARY()));
view_title_->setWordWrap(true);
vl->addWidget(view_title_);
view_meta_ = new QLabel;
view_meta_->setStyleSheet(
- QString("color: %1; font-size: 11px; font-family: 'Consolas','Courier New',monospace;").arg(TEXT_SECONDARY));
+ QString("color: %1; font-size: 11px; font-family: 'Consolas','Courier New',monospace;").arg(TEXT_SECONDARY()));
view_meta_->setWordWrap(true);
vl->addWidget(view_meta_);
auto* sep = new QFrame;
sep->setFrameShape(QFrame::HLine);
- sep->setStyleSheet(QString("color: %1;").arg(BORDER_DIM));
+ sep->setStyleSheet(QString("color: %1;").arg(BORDER_DIM()));
vl->addWidget(sep);
// Scroll area for content
@@ -313,7 +313,7 @@ QWidget* NotesScreen::build_editor_panel() {
view_content_ = new QLabel;
view_content_->setStyleSheet(QString("color: %1; font-size: 14px; font-family: 'Consolas','Courier New',monospace; "
"line-height: 1.6; background: transparent; padding: 4px;")
- .arg(TEXT_PRIMARY));
+ .arg(TEXT_PRIMARY()));
view_content_->setWordWrap(true);
view_content_->setTextFormat(Qt::PlainText);
view_content_->setAlignment(Qt::AlignTop | Qt::AlignLeft);
@@ -324,7 +324,7 @@ QWidget* NotesScreen::build_editor_panel() {
// ── Page 2: Edit mode ────────────────────────────────────────────────────
auto* edit_page = new QWidget(this);
- edit_page->setStyleSheet(QString("background: %1;").arg(BG_BASE));
+ edit_page->setStyleSheet(QString("background: %1;").arg(BG_BASE()));
auto* edl = new QVBoxLayout(edit_page);
edl->setContentsMargins(14, 14, 14, 14);
edl->setSpacing(10);
@@ -371,7 +371,7 @@ QWidget* NotesScreen::build_editor_panel() {
auto make_label = [](const QString& text) {
auto* l = new QLabel(text);
l->setStyleSheet(QString("color: %1; font-size: 11px; font-family: 'Consolas','Courier New',monospace;")
- .arg(TEXT_SECONDARY));
+ .arg(TEXT_SECONDARY()));
return l;
};