diff --git a/src/Editor/NDolphinIntegration.cpp b/src/Editor/NDolphinIntegration.cpp index 186a2126..711686a6 100644 --- a/src/Editor/NDolphinIntegration.cpp +++ b/src/Editor/NDolphinIntegration.cpp @@ -26,13 +26,13 @@ const char* const gkDolPath = "sys/main.dol"; const char* const gkDolBackupPath = "sys/main.original.dol"; /** The user's path to the Dolphin exe */ -QString gDolphinPath; +static QString gDolphinPath; /** The current Dolphin quickplay process */ -QProcess* gpDolphinProcess = nullptr; +static QProcess* gpDolphinProcess = nullptr; /** The project that the current active quickplay session is running for */ -CGameProject* gpQuickplayProject = nullptr; +static CGameProject* gpQuickplayProject = nullptr; /** Quickplay relay implementation to detect when the active quickplay session closes */ void CQuickplayRelay::QuickplayStarted() @@ -52,9 +52,9 @@ void CQuickplayRelay::QuickplayFinished(int ReturnCode, QProcess::ExitStatus exi gpQuickplayProject = nullptr; } -CQuickplayRelay gQuickplayRelay; +static CQuickplayRelay gQuickplayRelay; -uint32 AssembleBranchInstruction(uint32 instructionAddress, uint32 branchTarget) +static uint32 AssembleBranchInstruction(uint32 instructionAddress, uint32 branchTarget) { int32 jumpOffset = ((int32)branchTarget - (int32)instructionAddress) / 4; if (jumpOffset < 0) @@ -64,7 +64,7 @@ uint32 AssembleBranchInstruction(uint32 instructionAddress, uint32 branchTarget) return (18 << 26) + (jumpOffset << 2); } -std::map LoadSymbols(const TString& mapContents) { +static std::map LoadSymbols(const TString& mapContents) { std::map result; for (auto& line : mapContents.Split("\n")) diff --git a/src/Editor/ResourceBrowser/CResourceDelegate.cpp b/src/Editor/ResourceBrowser/CResourceDelegate.cpp index 96a27574..42eaa327 100644 --- a/src/Editor/ResourceBrowser/CResourceDelegate.cpp +++ b/src/Editor/ResourceBrowser/CResourceDelegate.cpp @@ -17,7 +17,7 @@ struct SResDelegateGeometryInfo QRect NameStringRect; QRect InfoStringRect; }; -SResDelegateGeometryInfo GetGeometryInfo(const SDelegateFontInfo& rkFontInfo, const QStyleOptionViewItem& rkOption, bool IsDirectory) +static SResDelegateGeometryInfo GetGeometryInfo(const SDelegateFontInfo& rkFontInfo, const QStyleOptionViewItem& rkOption, bool IsDirectory) { SResDelegateGeometryInfo Info; diff --git a/src/Editor/main.cpp b/src/Editor/main.cpp index bc4af63e..64da8c10 100644 --- a/src/Editor/main.cpp +++ b/src/Editor/main.cpp @@ -14,7 +14,7 @@ #include // Redirect qDebug output to the log file -void QtLogRedirect(QtMsgType Type, const QMessageLogContext& /*rkContext*/, const QString& rkMessage) +static void QtLogRedirect(QtMsgType Type, const QMessageLogContext& /*rkContext*/, const QString& rkMessage) { switch (Type) {