feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppEditor: Proliferate use of FilePath a bit

Browse Source 
Change-Id: I7e314d73a427bf40c10f3ca6c4c5804e31482f88
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2023-07-25 12:54:45 +02:00
parent cecf9c9136
commit 8423d2b5e5
7 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libs/cplusplus/cppmodelmanagerbase.cpp
View File

@@ -3,29 +3,32 @@
#include "cppmodelmanagerbase.h"
#include <utils/filepath.h>
#include <utils/qtcassert.h>
using namespace Utils;
namespace CPlusPlus::CppModelManagerBase {
static bool (*setExtraDiagnosticsCallback)
(const QString &, const QString &, const QList<Document::DiagnosticMessage> &) = nullptr;
(const FilePath &, const QString &, const QList<Document::DiagnosticMessage> &) = nullptr;
static CPlusPlus::Snapshot (*snapshotCallback)() = nullptr;
bool trySetExtraDiagnostics(const QString &fileName, const QString &kind,
bool trySetExtraDiagnostics(const FilePath &filePath, const QString &kind,
const QList<Document::DiagnosticMessage> &diagnostics)
{
if (!setExtraDiagnosticsCallback)
return false;
return setExtraDiagnosticsCallback(fileName, kind, diagnostics);
return setExtraDiagnosticsCallback(filePath, kind, diagnostics);
}
bool setExtraDiagnostics(const QString &fileName, const QString &kind,
const QList<Document::DiagnosticMessage> &diagnostics)
bool setExtraDiagnostics(const FilePath &filePath, const QString &kind,
const QList<Document::DiagnosticMessage> &diagnostics)
{
QTC_ASSERT(setExtraDiagnosticsCallback, return false);
return setExtraDiagnosticsCallback(fileName, kind, diagnostics);
return setExtraDiagnosticsCallback(filePath, kind, diagnostics);
}
Snapshot snapshot()
@@ -42,7 +45,7 @@ bool hasSnapshots()
// Installation
void registerSetExtraDiagnosticsCallback(
bool (*callback)(const QString &, const QString &, const QList<Document::DiagnosticMessage> &))
bool (*callback)(const FilePath &, const QString &, const QList<Document::DiagnosticMessage> &))
{
QTC_ASSERT(callback, return);
QTC_CHECK(!setExtraDiagnosticsCallback); // bark when used twice

8
src/libs/cplusplus/cppmodelmanagerbase.h
View File

@@ -5,13 +5,15 @@
#include <cplusplus/CppDocument.h>
namespace Utils { class FilePath; }
namespace CPlusPlus::CppModelManagerBase {
CPLUSPLUS_EXPORT bool trySetExtraDiagnostics
(const QString &, const QString &, const QList<Document::DiagnosticMessage> &);
(const Utils::FilePath &filePath, const QString &, const QList<Document::DiagnosticMessage> &);
CPLUSPLUS_EXPORT bool setSetExtraDiagnostics
(const QString &, const QString &, const QList<Document::DiagnosticMessage> &);
(const Utils::FilePath &, const QString &, const QList<Document::DiagnosticMessage> &);
CPLUSPLUS_EXPORT bool hasSnapshots();
@@ -23,6 +25,6 @@ CPLUSPLUS_EXPORT CPlusPlus::Snapshot snapshot();
CPLUSPLUS_EXPORT void registerSnapshotCallback(CPlusPlus::Snapshot (*)(void));
CPLUSPLUS_EXPORT void registerSetExtraDiagnosticsCallback(
bool(*)(const QString &, const QString &, const QList<Document::DiagnosticMessage> &));
bool(*)(const Utils::FilePath &, const QString &, const QList<Document::DiagnosticMessage> &));
} // CPlusPlus::CppModelManagerBase