From 6595a1bcb962fa4f16fdf653d6a93d023952b7b4 Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Fri, 25 Oct 2019 15:11:49 +1300 Subject: [PATCH] Make Clang-Tidy happy. --- .../src/filebrowserwindowplugin.h | 4 +-- .../src/fileorganiserwindowplugin.h | 4 +-- .../src/fileorganiserwindowwidget.cpp | 2 +- .../PMRWindow/src/pmrwindowplugin.h | 4 +-- .../src/pmrworkspaceswindowplugin.h | 4 +-- .../pmrworkspaceswindowsynchronizedialog.cpp | 26 +++++++++---------- .../src/pmrworkspaceswindowwidget.cpp | 20 +++++++------- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/plugins/organisation/FileBrowserWindow/src/filebrowserwindowplugin.h b/src/plugins/organisation/FileBrowserWindow/src/filebrowserwindowplugin.h index 65d3777cac..825aa77ef4 100644 --- a/src/plugins/organisation/FileBrowserWindow/src/filebrowserwindowplugin.h +++ b/src/plugins/organisation/FileBrowserWindow/src/filebrowserwindowplugin.h @@ -62,9 +62,9 @@ class FileBrowserWindowPlugin : public QObject, public I18nInterface, #include "windowinterface.inl" private: - QAction *mFileBrowserWindowAction; + QAction *mFileBrowserWindowAction = nullptr; - FileBrowserWindowWindow *mFileBrowserWindowWindow; + FileBrowserWindowWindow *mFileBrowserWindowWindow = nullptr; }; //============================================================================== diff --git a/src/plugins/organisation/FileOrganiserWindow/src/fileorganiserwindowplugin.h b/src/plugins/organisation/FileOrganiserWindow/src/fileorganiserwindowplugin.h index 9db6fb69c2..7333938996 100644 --- a/src/plugins/organisation/FileOrganiserWindow/src/fileorganiserwindowplugin.h +++ b/src/plugins/organisation/FileOrganiserWindow/src/fileorganiserwindowplugin.h @@ -62,9 +62,9 @@ class FileOrganiserWindowPlugin : public QObject, public I18nInterface, #include "windowinterface.inl" private: - QAction *mFileOrganiserWindowAction; + QAction *mFileOrganiserWindowAction = nullptr; - FileOrganiserWindowWindow *mFileOrganiserWindowWindow; + FileOrganiserWindowWindow *mFileOrganiserWindowWindow = nullptr; }; //============================================================================== diff --git a/src/plugins/organisation/FileOrganiserWindow/src/fileorganiserwindowwidget.cpp b/src/plugins/organisation/FileOrganiserWindow/src/fileorganiserwindowwidget.cpp index c2a90499d0..9175bc408f 100644 --- a/src/plugins/organisation/FileOrganiserWindow/src/fileorganiserwindowwidget.cpp +++ b/src/plugins/organisation/FileOrganiserWindow/src/fileorganiserwindowwidget.cpp @@ -397,7 +397,7 @@ void FileOrganiserWindowWidget::loadItemSettings(QSettings &pSettings, } else { // We are dealing with a file item - if (QFileInfo(textOrPath).exists()) { + if (QFileInfo::exists(textOrPath)) { pParentItem->appendRow(new FileOrganiserWindowItem(QFileIconProvider().icon(QFileIconProvider::File), textOrPath)); diff --git a/src/plugins/organisation/PMRWindow/src/pmrwindowplugin.h b/src/plugins/organisation/PMRWindow/src/pmrwindowplugin.h index eb8dce1533..ba2cd404b1 100644 --- a/src/plugins/organisation/PMRWindow/src/pmrwindowplugin.h +++ b/src/plugins/organisation/PMRWindow/src/pmrwindowplugin.h @@ -66,9 +66,9 @@ class PMRWindowPlugin : public QObject, public I18nInterface, #include "windowinterface.inl" private: - QAction *mPmrWindowAction; + QAction *mPmrWindowAction = nullptr; - PmrWindowWindow *mPmrWindowWindow; + PmrWindowWindow *mPmrWindowWindow = nullptr; }; //============================================================================== diff --git a/src/plugins/organisation/PMRWorkspacesWindow/src/pmrworkspaceswindowplugin.h b/src/plugins/organisation/PMRWorkspacesWindow/src/pmrworkspaceswindowplugin.h index 21d04c1238..ee44e0b09b 100644 --- a/src/plugins/organisation/PMRWorkspacesWindow/src/pmrworkspaceswindowplugin.h +++ b/src/plugins/organisation/PMRWorkspacesWindow/src/pmrworkspaceswindowplugin.h @@ -71,9 +71,9 @@ class PMRWorkspacesWindowPlugin : public QObject, public I18nInterface, #include "windowinterface.inl" private: - QAction *mPmrWorkspacesWindowAction; + QAction *mPmrWorkspacesWindowAction = nullptr; - PmrWorkspacesWindowWindow *mPmrWorkspacesWindowWindow; + PmrWorkspacesWindowWindow *mPmrWorkspacesWindowWindow = nullptr; }; //============================================================================== diff --git a/src/plugins/organisation/PMRWorkspacesWindow/src/pmrworkspaceswindowsynchronizedialog.cpp b/src/plugins/organisation/PMRWorkspacesWindow/src/pmrworkspaceswindowsynchronizedialog.cpp index 67e957ab73..09fb0c13cb 100644 --- a/src/plugins/organisation/PMRWorkspacesWindow/src/pmrworkspaceswindowsynchronizedialog.cpp +++ b/src/plugins/organisation/PMRWorkspacesWindow/src/pmrworkspaceswindowsynchronizedialog.cpp @@ -673,7 +673,7 @@ int xdiffCallback(void *data, mmbuffer_t *pBuffer, int pBufferSize) // Add the given buffer to the given data for (int i = 0; i < pBufferSize; ++i) { - *static_cast(data) += QString(pBuffer[i].ptr).left(int(pBuffer[i].size)); + *static_cast(data) += QString(pBuffer[i].ptr).leftRef(int(pBuffer[i].size)); } return 0; @@ -795,11 +795,11 @@ QString PmrWorkspacesWindowSynchronizeDialog::diffHtml(DifferencesData &pDiffere int removeLineNumber = -1; for (const auto &differenceData : pDifferencesData) { - html += QString(Row).arg(differenceData.operation) - .arg(differenceData.removeLineNumber) - .arg(differenceData.addLineNumber) - .arg(differenceData.tag) - .arg((differenceData.tag == '+')? + html += QString(Row).arg(differenceData.operation, + differenceData.removeLineNumber, + differenceData.addLineNumber, + differenceData.tag, + (differenceData.tag == '+')? newDiffStrings[++addLineNumber]: oldDiffStrings[++removeLineNumber]); } @@ -872,11 +872,11 @@ QString PmrWorkspacesWindowSynchronizeDialog::diffHtml(const QString &pOld, removeLineNumber = QString(difference).remove(BeforeRemoveLineNumberRegEx).remove(AfterLineNumberRegEx).toInt()-1; - html += QString(Row).arg("header") - .arg("...") - .arg("...") - .arg(QString()) - .arg(difference); + html += QString(Row).arg("header", + "...", + "...", + QString(), + difference); } else { QString diff = difference; QChar tag = diff[0]; @@ -910,8 +910,8 @@ QString PmrWorkspacesWindowSynchronizeDialog::diffHtml(const QString &pOld, "default") .arg(removeLineNumber) .arg(addLineNumber) - .arg(QString()) - .arg(cleanHtmlEscaped(diff)); + .arg(QString(), + cleanHtmlEscaped(diff)); } } } diff --git a/src/plugins/organisation/PMRWorkspacesWindow/src/pmrworkspaceswindowwidget.cpp b/src/plugins/organisation/PMRWorkspacesWindow/src/pmrworkspaceswindowwidget.cpp index 16bfe19e54..5447a60931 100644 --- a/src/plugins/organisation/PMRWorkspacesWindow/src/pmrworkspaceswindowwidget.cpp +++ b/src/plugins/organisation/PMRWorkspacesWindow/src/pmrworkspaceswindowwidget.cpp @@ -1407,9 +1407,9 @@ void PmrWorkspacesWindowWidget::duplicateCloneMessage(const QString &pUrl, // (since the message box would show up from nowhere)... if (mInitialized) { - emit warning(QString("Workspace '%1' is cloned into both '%2' and '%3'").arg(pUrl) - .arg(pPath1) - .arg(pPath2)); + emit warning(QString("Workspace '%1' is cloned into both '%2' and '%3'").arg(pUrl, + pPath1, + pPath2)); } } @@ -1662,17 +1662,17 @@ void PmrWorkspacesWindowWidget::aboutWorkspace() "\n"; if (!workspace->owner().isEmpty()) { - message += Entry.arg(tr("Owner:")) - .arg(workspace->owner()); + message += Entry.arg(tr("Owner:"), + workspace->owner()); } - message += Entry.arg(tr("PMR:")) - .arg(QString(R"(%1)").arg(workspace->url())); + message += Entry.arg(tr("PMR:"), + QString(R"(%1)").arg(workspace->url())); if (workspace->isLocal()) { - message += Entry.arg(tr("Path:")) - .arg(QString(R"(%2)").arg(QUrl::fromLocalFile(workspace->path()).url()) - .arg(workspace->path())); + message += Entry.arg(tr("Path:"), + QString(R"(%2)").arg(QUrl::fromLocalFile(workspace->path()).url(), + workspace->path())); } message += "
\n";