From d3e1e560c412e56d8a36f53254e6731777fb98f8 Mon Sep 17 00:00:00 2001 From: Le Tan Date: Mon, 31 Aug 2020 21:17:50 +0800 Subject: [PATCH] fix vSync --- src/main.cpp | 14 ++++---------- src/src.pro | 6 ++++-- src/utils/vSync.cpp | 2 +- src/vmainwindow.cpp | 4 ++-- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index b55a1516..53153deb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -195,14 +195,10 @@ int main(int argc, char *argv[]) vconfig.initialize(); g_config = &vconfig; - bool checkSSL = true; - #if defined(QT_NO_DEBUG) - checkSSL = false; for (int i = 1; i < argc; ++i) { if (!qstrcmp(argv[i], "-d")) { g_debugLog = true; - checkSSL = true; break; } } @@ -224,12 +220,10 @@ int main(int argc, char *argv[]) qDebug() << "files to open from arguments" << filePaths; // Check the openSSL. - if (checkSSL) { - qInfo() << "openGL" << QOpenGLContext::openGLModuleType(); - qInfo() << "openSSL" - << QSslSocket::sslLibraryBuildVersionString() - << QSslSocket::sslLibraryVersionNumber(); - } + qInfo() << "openGL" << QOpenGLContext::openGLModuleType(); + qInfo() << "openSSL" + << QSslSocket::sslLibraryBuildVersionString() + << QSslSocket::sslLibraryVersionNumber(); // Load missing translation for Qt (QTextEdit/QPlainTextEdit/QTextBrowser). QTranslator qtTranslator1; diff --git a/src/src.pro b/src/src.pro index b72417a5..c26f0ff4 100644 --- a/src/src.pro +++ b/src/src.pro @@ -165,7 +165,8 @@ SOURCES += main.cpp\ widgets/vcombobox.cpp \ vtablehelper.cpp \ vtable.cpp \ - dialog/vinserttabledialog.cpp + dialog/vinserttabledialog.cpp \ + utils/vSync.cpp HEADERS += vmainwindow.h \ vapplication.h \ @@ -313,7 +314,8 @@ HEADERS += vmainwindow.h \ widgets/vcombobox.h \ vtablehelper.h \ vtable.h \ - dialog/vinserttabledialog.h + dialog/vinserttabledialog.h \ + utils/vSync.h RESOURCES += \ vnote.qrc \ diff --git a/src/utils/vSync.cpp b/src/utils/vSync.cpp index abb4d86f..e22ad86a 100644 --- a/src/utils/vSync.cpp +++ b/src/utils/vSync.cpp @@ -214,4 +214,4 @@ void VSync::uploadFinish() m_type = VSync::SyncType::None; m_target = VSync::SyncTarget::None; emit this->uploadSuccess(); -} \ No newline at end of file +} diff --git a/src/vmainwindow.cpp b/src/vmainwindow.cpp index e6036d6a..485e3efd 100644 --- a/src/vmainwindow.cpp +++ b/src/vmainwindow.cpp @@ -52,7 +52,7 @@ #include "vlistue.h" #include "vtagexplorer.h" #include "vmdeditor.h" -#include "vSync.h" +#include "utils/vSync.h" extern VConfigManager *g_config; @@ -3746,4 +3746,4 @@ void VMainWindow::onDownloadSuccess() void VMainWindow::onUploadSuccess() { -} \ No newline at end of file +}