From 4496c441fe57aa96a376b2c62cbd244ba4fa55bf Mon Sep 17 00:00:00 2001 From: Le Tan Date: Wed, 16 Dec 2020 06:29:28 -0800 Subject: [PATCH] fix compilation error (#1600) --- libs/vtextedit | 2 +- src/core/clipboarddata.cpp | 5 +++-- src/core/global.h | 9 +++++---- src/core/notebook/node.cpp | 8 ++++---- src/core/notebookconfigmgr/nodecontentmediautils.cpp | 4 ++++ src/core/notebookconfigmgr/vxnotebookconfigmgr.cpp | 4 ++-- src/core/viewerresource.h | 8 ++++---- src/widgets/dialogs/imageinsertdialog.cpp | 2 +- src/widgets/dialogs/legacynotebookutils.cpp | 12 ++++++------ src/widgets/editors/markdownviewer.cpp | 2 +- src/widgets/editors/previewhelper.cpp | 4 ++-- src/widgets/navigationmodemgr.cpp | 1 - src/widgets/titlebar.cpp | 4 ++-- src/widgets/viewwindow.cpp | 10 ++++++++++ 14 files changed, 45 insertions(+), 30 deletions(-) diff --git a/libs/vtextedit b/libs/vtextedit index 86cf8e0e..1cb2cde9 160000 --- a/libs/vtextedit +++ b/libs/vtextedit @@ -1 +1 @@ -Subproject commit 86cf8e0e6d840b923dc30046d12ab3c6e634f6b9 +Subproject commit 1cb2cde9c95d6e93d089a98f8522547f76eb4661 diff --git a/src/core/clipboarddata.cpp b/src/core/clipboarddata.cpp index 93af6a4b..17eff270 100644 --- a/src/core/clipboarddata.cpp +++ b/src/core/clipboarddata.cpp @@ -83,9 +83,10 @@ void ClipboardData::fromJson(const QJsonObject &p_jobj) return; } - for (const auto &item : p_jobj[c_data].toArray()) { + const auto itemArr = p_jobj[c_data].toArray(); + for (size_t i = 0; i < itemArr.size(); ++i) { auto dataItem = createClipboardDataItem(m_action); - dataItem->fromJson(item.toObject()); + dataItem->fromJson(itemArr[i].toObject()); m_data.push_back(dataItem); } } diff --git a/src/core/global.h b/src/core/global.h index bcd13888..1c9962a3 100644 --- a/src/core/global.h +++ b/src/core/global.h @@ -10,14 +10,14 @@ namespace vnotex { typedef quint64 ID; - static QPair stringToID(const QString &p_str) + inline QPair stringToID(const QString &p_str) { bool ok; ID id = p_str.toULongLong(&ok); return qMakePair(ok, id); } - static QString IDToString(ID p_id) + inline QString IDToString(ID p_id) { return QString::number(p_id); } @@ -42,7 +42,8 @@ namespace vnotex enum { CONTENTS_MARGIN = 2 }; - static QString QJsonObjectToString(const QJsonObject &p_obj) { + inline QString QJsonObjectToString(const QJsonObject &p_obj) + { QString str = "{"; auto keys = p_obj.keys(); @@ -54,7 +55,7 @@ namespace vnotex return str; } - static QDebug operator<<(QDebug p_debug, const QJsonObject &p_obj) + inline QDebug operator<<(QDebug p_debug, const QJsonObject &p_obj) { QDebugStateSaver saver(p_debug); p_debug << QJsonObjectToString(p_obj); diff --git a/src/core/notebook/node.cpp b/src/core/notebook/node.cpp index d48693c3..97f5a2ad 100644 --- a/src/core/notebook/node.cpp +++ b/src/core/notebook/node.cpp @@ -16,12 +16,12 @@ Node::Node(Type p_type, const QDateTime &p_createdTimeUtc, Notebook *p_notebook, Node *p_parent) - : m_type(p_type), + : m_notebook(p_notebook), + m_type(p_type), m_id(p_id), m_name(p_name), m_createdTimeUtc(p_createdTimeUtc), m_loaded(true), - m_notebook(p_notebook), m_parent(p_parent) { if (m_notebook) { @@ -34,9 +34,9 @@ Node::Node(Type p_type, const QString &p_name, Notebook *p_notebook, Node *p_parent) - : m_type(p_type), + : m_notebook(p_notebook), + m_type(p_type), m_name(p_name), - m_notebook(p_notebook), m_parent(p_parent) { if (m_notebook) { diff --git a/src/core/notebookconfigmgr/nodecontentmediautils.cpp b/src/core/notebookconfigmgr/nodecontentmediautils.cpp index 3fac4232..2e28a888 100644 --- a/src/core/notebookconfigmgr/nodecontentmediautils.cpp +++ b/src/core/notebookconfigmgr/nodecontentmediautils.cpp @@ -174,4 +174,8 @@ void NodeContentMediaUtils::fixMarkdownLinks(const QString &p_srcFolderPath, const QString &p_destFolderPath) { // TODO. + Q_UNUSED(p_srcFolderPath); + Q_UNUSED(p_backend); + Q_UNUSED(p_destFilePath); + Q_UNUSED(p_destFolderPath); } diff --git a/src/core/notebookconfigmgr/vxnotebookconfigmgr.cpp b/src/core/notebookconfigmgr/vxnotebookconfigmgr.cpp index e1304602..0383e0fb 100644 --- a/src/core/notebookconfigmgr/vxnotebookconfigmgr.cpp +++ b/src/core/notebookconfigmgr/vxnotebookconfigmgr.cpp @@ -71,8 +71,8 @@ void VXNotebookConfigMgr::NodeFileConfig::fromJson(const QJsonObject &p_jobj) { auto arr = p_jobj[NodeConfig::c_tags].toArray(); - for (const auto &tag : arr) { - m_tags << tag.toString(); + for (size_t i = 0; i < arr.size(); ++i) { + m_tags << arr[i].toString(); } } } diff --git a/src/core/viewerresource.h b/src/core/viewerresource.h index 535e199e..ea05d658 100644 --- a/src/core/viewerresource.h +++ b/src/core/viewerresource.h @@ -20,14 +20,14 @@ namespace vnotex m_styles.clear(); auto stylesArray = p_obj[QStringLiteral("styles")].toArray(); - for (const auto &ele : stylesArray) { - m_styles << ele.toString(); + for (size_t i = 0; i < stylesArray.size(); ++i) { + m_styles << stylesArray[i].toString(); } m_scripts.clear(); auto scriptsArray = p_obj[QStringLiteral("scripts")].toArray(); - for (const auto &ele : scriptsArray) { - m_scripts << ele.toString(); + for (size_t i = 0; i < scriptsArray.size(); ++i) { + m_scripts << scriptsArray[i].toString(); } } diff --git a/src/widgets/dialogs/imageinsertdialog.cpp b/src/widgets/dialogs/imageinsertdialog.cpp index 9bcc4e2b..fe036816 100644 --- a/src/widgets/dialogs/imageinsertdialog.cpp +++ b/src/widgets/dialogs/imageinsertdialog.cpp @@ -203,7 +203,7 @@ void ImageInsertDialog::browseFile() QString filePath = QFileDialog::getOpenFileName(this, tr("Select Image To Insert"), bpath, - tr("Images (*.png *.xpm *.jpg *.bmp *.gif *.svg);;All (*.*)")); + tr("Images (*.png *.xpm *.jpg *.bmp *.gif *.svg *.webp);;All (*.*)")); if (filePath.isEmpty()) { return; } diff --git a/src/widgets/dialogs/legacynotebookutils.cpp b/src/widgets/dialogs/legacynotebookutils.cpp index d3403b0a..b9687218 100644 --- a/src/widgets/dialogs/legacynotebookutils.cpp +++ b/src/widgets/dialogs/legacynotebookutils.cpp @@ -65,8 +65,8 @@ void LegacyNotebookUtils::removeFolderConfigFile(const QString &p_folderPath) void LegacyNotebookUtils::forEachFolder(const QJsonObject &p_config, std::function p_func) { auto folderArray = p_config.value(QStringLiteral("sub_directories")).toArray(); - for (const auto &folder : folderArray) { - const auto name = folder.toObject().value(QStringLiteral("name")).toString(); + for (size_t i = 0; i < folderArray.size(); ++i) { + const auto name = folderArray[i].toObject().value(QStringLiteral("name")).toString(); p_func(name); } } @@ -74,8 +74,8 @@ void LegacyNotebookUtils::forEachFolder(const QJsonObject &p_config, std::functi void LegacyNotebookUtils::forEachFile(const QJsonObject &p_config, std::function p_func) { auto fileArray = p_config.value(QStringLiteral("files")).toArray(); - for (const auto &file : fileArray) { - const auto obj = file.toObject(); + for (size_t i = 0; i < fileArray.size(); ++i) { + const auto obj = fileArray[i].toObject(); FileInfo info; info.m_name = obj.value(QStringLiteral("name")).toString(); { @@ -89,8 +89,8 @@ void LegacyNotebookUtils::forEachFile(const QJsonObject &p_config, std::function info.m_attachmentFolder = obj.value(QStringLiteral("attachment_folder")).toString(); { auto arr = obj.value(QStringLiteral("tags")).toArray(); - for (const auto &tag : arr) { - info.m_tags << tag.toString(); + for (size_t i = 0; i < arr.size(); ++i) { + info.m_tags << arr[i].toString(); } } p_func(info); diff --git a/src/widgets/editors/markdownviewer.cpp b/src/widgets/editors/markdownviewer.cpp index 68c6f42d..b606c682 100644 --- a/src/widgets/editors/markdownviewer.cpp +++ b/src/widgets/editors/markdownviewer.cpp @@ -60,7 +60,7 @@ MarkdownViewer::MarkdownViewer(MarkdownViewerAdapter *p_adapter, }); connect(m_adapter, &MarkdownViewerAdapter::crossCopyReady, - this, [this](quint64 p_id, quint64 p_timeStamp, const QString &p_html) { + this, [](quint64 p_id, quint64 p_timeStamp, const QString &p_html) { Q_UNUSED(p_id); Q_UNUSED(p_timeStamp); std::unique_ptr mimeData(new QMimeData()); diff --git a/src/widgets/editors/previewhelper.cpp b/src/widgets/editors/previewhelper.cpp index 2a187f6c..b0671391 100644 --- a/src/widgets/editors/previewhelper.cpp +++ b/src/widgets/editors/previewhelper.cpp @@ -236,7 +236,7 @@ void PreviewHelper::handleGraphPreviewData(const MarkdownViewerAdapter::PreviewD if (p_data.m_timeStamp != m_codeBlockTimeStamp) { return; } - if (p_data.m_id >= m_codeBlocksData.size() || p_data.m_data.isEmpty()) { + if (p_data.m_id >= static_cast(m_codeBlocksData.size()) || p_data.m_data.isEmpty()) { updateEditorInplacePreviewCodeBlock(); return; } @@ -384,7 +384,7 @@ void PreviewHelper::handleMathPreviewData(const MarkdownViewerAdapter::PreviewDa if (p_data.m_timeStamp != m_mathBlockTimeStamp) { return; } - if (p_data.m_id >= m_mathBlocksData.size() || p_data.m_data.isEmpty()) { + if (p_data.m_id >= static_cast(m_mathBlocksData.size()) || p_data.m_data.isEmpty()) { updateEditorInplacePreviewMathBlock(); return; } diff --git a/src/widgets/navigationmodemgr.cpp b/src/widgets/navigationmodemgr.cpp index 7949e3e7..f6fc8f16 100644 --- a/src/widgets/navigationmodemgr.cpp +++ b/src/widgets/navigationmodemgr.cpp @@ -123,7 +123,6 @@ bool NavigationModeMgr::eventFilter(QObject *p_obj, QEvent *p_event) bool NavigationModeMgr::handleKeyPress(QKeyEvent *p_event) { int key = p_event->key(); - auto modifiers = p_event->modifiers(); if (WidgetUtils::isMetaKey(key)) { return false; diff --git a/src/widgets/titlebar.cpp b/src/widgets/titlebar.cpp index 37531695..54b36b27 100644 --- a/src/widgets/titlebar.cpp +++ b/src/widgets/titlebar.cpp @@ -82,8 +82,8 @@ void TitleBar::setupActionButtons(TitleBar::Actions p_actionFlags) if (p_actionFlags & Action::Settings) { auto btn = newActionButton("settings.svg", tr("Settings"), this); connect(btn, &QToolButton::triggered, - this, [this]() { - + this, []() { + // TODO. }); m_actionButtons.push_back(btn); } diff --git a/src/widgets/viewwindow.cpp b/src/widgets/viewwindow.cpp index a0a100d3..7ace76f1 100644 --- a/src/widgets/viewwindow.cpp +++ b/src/widgets/viewwindow.cpp @@ -928,18 +928,28 @@ bool ViewWindow::findAndReplaceWidgetVisible() const void ViewWindow::handleFindTextChanged(const QString &p_text, FindOptions p_options) { + Q_UNUSED(p_text); + Q_UNUSED(p_options); } void ViewWindow::handleFindNext(const QString &p_text, FindOptions p_options) { + Q_UNUSED(p_text); + Q_UNUSED(p_options); } void ViewWindow::handleReplace(const QString &p_text, FindOptions p_options, const QString &p_replaceText) { + Q_UNUSED(p_text); + Q_UNUSED(p_options); + Q_UNUSED(p_replaceText); } void ViewWindow::handleReplaceAll(const QString &p_text, FindOptions p_options, const QString &p_replaceText) { + Q_UNUSED(p_text); + Q_UNUSED(p_options); + Q_UNUSED(p_replaceText); } void ViewWindow::handleFindAndReplaceWidgetClosed()