From e2108131568ffd8e99bc2f52f8317bbe886d62c7 Mon Sep 17 00:00:00 2001
From: Phil Olynyk <phil@pholynyk.ca>
Date: Fri, 21 Jun 2019 11:02:35 -0400
Subject: [PATCH] Remove Q_WS_X11 from main.cpp and change it to Q_OS_LINUX in
reports.cpp
---
oscar/main.cpp | 8 --------
oscar/reports.cpp | 5 ++---
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/oscar/main.cpp b/oscar/main.cpp
index 6afdb308..f3ac0de9 100644
--- a/oscar/main.cpp
+++ b/oscar/main.cpp
@@ -42,11 +42,6 @@
#include "SleepLib/loader_plugins/icon_loader.h"
#include "SleepLib/loader_plugins/weinmann_loader.h"
-
-#ifdef Q_WS_X11
-#include <X11/Xlib.h>
-#endif
-
MainWindow *mainwin = nullptr;
int compareVersion(QString version);
@@ -257,9 +252,6 @@ int main(int argc, char* argv[])
#else
int main(int argc, char *argv[]) {
-#ifdef Q_WS_X11
- XInitThreads();
-#endif
QString homeDocs = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)+"/";
QCoreApplication::setApplicationName(getAppName());
diff --git a/oscar/reports.cpp b/oscar/reports.cpp
index 26ee75dc..424ab983 100644
--- a/oscar/reports.cpp
+++ b/oscar/reports.cpp
@@ -39,8 +39,6 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
return;
}
- //QString username = p_profile->Get(QString("_{") + QString(STR_UI_UserName) + "}_");
-
bool print_bookmarks = false;
if (name == STR_TR_Daily) {
@@ -69,7 +67,8 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
printer = new QPrinter(QPrinter::HighResolution);
-#ifdef Q_WS_X11
+#ifdef Q_OS_LINUX
+ QString username = p_profile->Get(QString("_{") + QString(STR_UI_UserName) + "}_");
printer->setPrinterName("Print to File (PDF)");
printer->setOutputFormat(QPrinter::PdfFormat);
QString filename = p_pref->Get("{home}/") + name + username + date.toString(Qt::ISODate) + ".pdf";