Reformat repo to clang-format 7.0 rules

Ben754 · May 6, 2019 · ff972e3 · ff972e3
1 parent d347867
commit ff972e3
Show file tree

Hide file tree

Showing 208 changed files with 312 additions and 310 deletions.
diff --git a/Source/Android/jni/ButtonManager.cpp b/Source/Android/jni/ButtonManager.cpp
@@ -730,4 +730,4 @@ float InputDevice::AxisValue(int padID, ButtonType axis)
   else
     return _buttons[binding->second->_buttontype] == BUTTON_PRESSED ? 1.0f : 0.0f;
 }
-}
+}  // namespace ButtonManager
diff --git a/Source/Android/jni/ButtonManager.h b/Source/Android/jni/ButtonManager.h
@@ -256,4 +256,4 @@ float GetAxisValue(int padID, ButtonType axis);
 bool GamepadEvent(const std::string& dev, int button, int action);
 void GamepadAxisEvent(const std::string& dev, int axis, float value);
 void Shutdown();
-}
+}  // namespace ButtonManager
diff --git a/Source/Core/AudioCommon/AudioCommon.h b/Source/Core/AudioCommon/AudioCommon.h
@@ -31,4 +31,4 @@ void StopAudioDump();
 void IncreaseVolume(unsigned short offset);
 void DecreaseVolume(unsigned short offset);
 void ToggleMuteVolume();
-}
+}  // namespace AudioCommon
diff --git a/Source/Core/AudioCommon/AudioStretcher.h b/Source/Core/AudioCommon/AudioStretcher.h
@@ -25,4 +25,4 @@ class AudioStretcher
   double m_stretch_ratio = 1.0;
 };
 
-}  // AudioCommon
+}  // namespace AudioCommon
diff --git a/Source/Core/AudioCommon/SurroundDecoder.h b/Source/Core/AudioCommon/SurroundDecoder.h
@@ -33,4 +33,4 @@ class SurroundDecoder
   FixedSizeQueue<float, 32768> m_decoded_fifo;
 };
 
-}  // AudioCommon
+}  // namespace AudioCommon
diff --git a/Source/Core/Common/Arm64Emitter.cpp b/Source/Core/Common/Arm64Emitter.cpp
@@ -4380,4 +4380,4 @@ void ARM64FloatEmitter::MOVI2FDUP(ARM64Reg Rd, float value, ARM64Reg scratch)
   DUP(32, Rd, Rd, 0);
 }
 
-}  // namespace
+}  // namespace Arm64Gen
diff --git a/Source/Core/Common/Arm64Emitter.h b/Source/Core/Common/Arm64Emitter.h
@@ -1143,4 +1143,4 @@ class ARM64CodeBlock : public Common::CodeBlock<ARM64XEmitter>
     }
   }
 };
-}
+}  // namespace Arm64Gen
diff --git a/Source/Core/Common/Atomic_GCC.h b/Source/Core/Common/Atomic_GCC.h
@@ -83,4 +83,4 @@ inline T* AtomicExchangeAcquire(T* volatile& loc, U newval)
 {
   return __atomic_exchange_n(&loc, newval, __ATOMIC_ACQ_REL);
 }
-}
+}  // namespace Common
diff --git a/Source/Core/Common/Atomic_Win32.h b/Source/Core/Common/Atomic_Win32.h
@@ -91,4 +91,4 @@ inline T* AtomicExchangeAcquire(T* volatile& loc, U newval)
 {
   return (T*)_InterlockedExchangePointer_acq((void* volatile*)&loc, (void*)newval);
 }
-}
+}  // namespace Common
diff --git a/Source/Core/Common/BlockingLoop.h b/Source/Core/Common/BlockingLoop.h
@@ -253,4 +253,4 @@ class BlockingLoop
   Flag m_may_sleep;  // If this is set, we fall back from the busy loop to an event based
                      // synchronization.
 };
-}
+}  // namespace Common
diff --git a/Source/Core/Common/Config/ConfigInfo.cpp b/Source/Core/Common/Config/ConfigInfo.cpp
@@ -32,4 +32,4 @@ bool ConfigLocation::operator<(const ConfigLocation& other) const
   const int key_compare = strcasecmp(key.c_str(), other.key.c_str());
   return key_compare < 0;
 }
-}
+}  // namespace Config
diff --git a/Source/Core/Common/Config/ConfigInfo.h b/Source/Core/Common/Config/ConfigInfo.h
@@ -50,4 +50,4 @@ struct ConfigInfo
   ConfigLocation location;
   T default_value;
 };
-}
+}  // namespace Config
diff --git a/Source/Core/Common/Config/Enums.h b/Source/Core/Common/Config/Enums.h
@@ -41,4 +41,4 @@ constexpr std::array<LayerType, 7> SEARCH_ORDER{{
     LayerType::GlobalGame,
     LayerType::Base,
 }};
-}
+}  // namespace Config
diff --git a/Source/Core/Common/Config/Layer.cpp b/Source/Core/Common/Config/Layer.cpp
@@ -97,4 +97,4 @@ const LayerMap& Layer::GetLayerMap() const
 {
   return m_map;
 }
-}
+}  // namespace Config
diff --git a/Source/Core/Common/Config/Layer.h b/Source/Core/Common/Config/Layer.h
@@ -42,7 +42,7 @@ inline std::optional<std::string> TryParse(const std::string& str_value)
 {
   return str_value;
 }
-}
+}  // namespace detail
 
 template <typename T>
 struct ConfigInfo;
@@ -154,4 +154,4 @@ class Layer
   const LayerType m_layer;
   std::unique_ptr<ConfigLayerLoader> m_loader;
 };
-}
+}  // namespace Config
diff --git a/Source/Core/Common/ENetUtil.cpp b/Source/Core/Common/ENetUtil.cpp
@@ -36,4 +36,4 @@ int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event)
   }
   return 0;
 }
-}
+}  // namespace ENetUtil
diff --git a/Source/Core/Common/ENetUtil.h b/Source/Core/Common/ENetUtil.h
@@ -10,4 +10,4 @@ namespace ENetUtil
 {
 void WakeupThread(ENetHost* host);
 int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event);
-}
+}  // namespace ENetUtil
diff --git a/Source/Core/Common/FPURoundMode.h b/Source/Core/Common/FPURoundMode.h
@@ -43,4 +43,4 @@ void SetSIMDMode(int rounding_mode, bool non_ieee_mode);
 void SaveSIMDState();
 void LoadSIMDState();
 void LoadDefaultSIMDState();
-}
+}  // namespace FPURoundMode
diff --git a/Source/Core/Common/GL/GLInterface/AGL.mm b/Source/Core/Common/GL/GLInterface/AGL.mm
@@ -106,8 +106,8 @@ static bool AttachContextToView(NSOpenGLContext* context, NSView* view, u32* wid
 
 std::unique_ptr<GLContext> GLContextAGL::CreateSharedContext()
 {
-  NSOpenGLContext* new_agl_context =
-      [[NSOpenGLContext alloc] initWithFormat:m_pixel_format shareContext:m_context];
+  NSOpenGLContext* new_agl_context = [[NSOpenGLContext alloc] initWithFormat:m_pixel_format
+                                                                shareContext:m_context];
   if (new_agl_context == nil)
   {
     ERROR_LOG(VIDEO, "failed to create shared context");

diff --git a/Source/Core/Common/GekkoDisassembler.cpp b/Source/Core/Common/GekkoDisassembler.cpp
@@ -969,7 +969,7 @@ void GekkoDisassembler::mtfsb(u32 in, int n)
   }
 }
 
-  // Paired instructions
+// Paired instructions
 
 #define RA ((inst >> 16) & 0x1f)
 #define RB ((inst >> 11) & 0x1f)

diff --git a/Source/Core/Common/GenericFPURoundMode.cpp b/Source/Core/Common/GenericFPURoundMode.cpp
@@ -26,4 +26,4 @@ void LoadSIMDState()
 void LoadDefaultSIMDState()
 {
 }
-}
+}  // namespace FPURoundMode
diff --git a/Source/Core/Common/JitRegister.cpp b/Source/Core/Common/JitRegister.cpp
@@ -110,4 +110,4 @@ void RegisterV(const void* base_address, u32 code_size, const char* format, va_l
     s_perf_map_file.WriteBytes(entry.data(), entry.size());
   }
 }
-}
+}  // namespace JitRegister
diff --git a/Source/Core/Common/JitRegister.h b/Source/Core/Common/JitRegister.h
@@ -30,4 +30,4 @@ inline void Register(const void* start, const void* end, const char* format, ...
   RegisterV(start, code_size, format, args);
   va_end(args);
 }
-}
+}  // namespace JitRegister
diff --git a/Source/Core/Common/Lazy.h b/Source/Core/Common/Lazy.h
@@ -46,4 +46,4 @@ class Lazy
 
   mutable std::variant<T, std::function<T()>> m_value;
 };
-}
+}  // namespace Common
diff --git a/Source/Core/Common/Logging/Log.h b/Source/Core/Common/Logging/Log.h
@@ -72,7 +72,7 @@ enum LOG_LEVELS
 
 static const char LOG_LEVEL_TO_CHAR[7] = "-NEWID";
 
-}  // namespace
+}  // namespace LogTypes
 
 void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line,
                 const char* fmt, ...)

diff --git a/Source/Core/Common/MD5.cpp b/Source/Core/Common/MD5.cpp
@@ -49,4 +49,4 @@ std::string MD5Sum(const std::string& file_path, std::function<bool(int)> report
 
   return output_string;
 }
-}
+}  // namespace MD5
diff --git a/Source/Core/Common/Profiler.cpp b/Source/Core/Common/Profiler.cpp
@@ -161,4 +161,4 @@ std::string Profiler::Read()
 
   return buffer.str();
 }
-}
+}  // namespace Common
diff --git a/Source/Core/Common/Profiler.h b/Source/Core/Common/Profiler.h
@@ -55,7 +55,7 @@ class ProfilerExecuter
 private:
   Profiler* m_p;
 };
-};
+};  // namespace Common
 
 // Warning: This profiler isn't thread safe. Only profile functions which doesn't run simultaneously
 #define PROFILE(name)                                                                              \

diff --git a/Source/Core/Common/SPSCQueue.h b/Source/Core/Common/SPSCQueue.h
@@ -107,4 +107,4 @@ class SPSCQueue
   ElementPtr* m_read_ptr;
   std::atomic<u32> m_size;
 };
-}
+}  // namespace Common
diff --git a/Source/Core/Common/TraversalServer.cpp b/Source/Core/Common/TraversalServer.cpp
@@ -112,7 +112,7 @@ struct hash<TraversalHostId>
     return p[0] ^ ((p[1] << 13) | (p[1] >> 19));
   }
 };
-}
+}  // namespace std
 
 static int sock;
 static std::unordered_map<TraversalRequestId, OutgoingPacketInfo> outgoingPackets;

diff --git a/Source/Core/Common/UPnP.h b/Source/Core/Common/UPnP.h
@@ -12,6 +12,6 @@ namespace UPnP
 {
 void TryPortmapping(u16 port);
 void StopPortmapping();
-}
+}  // namespace UPnP
 
 #endif
diff --git a/Source/Core/Common/x64Emitter.cpp b/Source/Core/Common/x64Emitter.cpp
@@ -3389,4 +3389,4 @@ void XEmitter::RDTSC()
   Write8(0x0F);
   Write8(0x31);
 }
-}
+}  // namespace Gen
diff --git a/Source/Core/Common/x64Emitter.h b/Source/Core/Common/x64Emitter.h
@@ -1177,4 +1177,4 @@ class X64CodeBlock : public Common::CodeBlock<XEmitter>
   }
 };
 
-}  // namespace
+}  // namespace Gen
diff --git a/Source/Core/Common/x64FPURoundMode.cpp b/Source/Core/Common/x64FPURoundMode.cpp
@@ -61,4 +61,4 @@ void LoadDefaultSIMDState()
 {
   _mm_setcsr(default_sse_state);
 }
-}
+}  // namespace FPURoundMode
diff --git a/Source/Core/Core/ARDecrypt.h b/Source/Core/Core/ARDecrypt.h
@@ -14,4 +14,4 @@ namespace ActionReplay
 {
 void DecryptARCode(std::vector<std::string> vCodes, std::vector<AREntry>* ops);
 
-}  // namespace
+}  // namespace ActionReplay
diff --git a/Source/Core/Core/ActionReplay.h b/Source/Core/Core/ActionReplay.h
@@ -48,4 +48,4 @@ void EnableSelfLogging(bool enable);
 std::vector<std::string> GetSelfLog();
 void ClearSelfLog();
 bool IsSelfLogging();
-}  // namespace
+}  // namespace ActionReplay
diff --git a/Source/Core/Core/ConfigLoaders/BaseConfigLoader.h b/Source/Core/Core/ConfigLoaders/BaseConfigLoader.h
@@ -10,10 +10,10 @@ namespace Config
 {
 class ConfigLayerLoader;
 enum class LayerType;
-}
+}  // namespace Config
 
 namespace ConfigLoaders
 {
 void SaveToSYSCONF(Config::LayerType layer);
 std::unique_ptr<Config::ConfigLayerLoader> GenerateBaseConfigLoader();
-}
+}  // namespace ConfigLoaders
diff --git a/Source/Core/Core/ConfigLoaders/GameConfigLoader.h b/Source/Core/Core/ConfigLoaders/GameConfigLoader.h
@@ -25,4 +25,4 @@ std::unique_ptr<Config::ConfigLayerLoader> GenerateGlobalGameConfigLoader(const
                                                                           u16 revision);
 std::unique_ptr<Config::ConfigLayerLoader> GenerateLocalGameConfigLoader(const std::string& id,
                                                                          u16 revision);
-}
+}  // namespace ConfigLoaders
diff --git a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.h b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.h
@@ -15,4 +15,4 @@ namespace ConfigLoaders
 // systems to co-exist without trampling on each other while saving.
 // This function shall be removed when the old configuration system retires.
 bool IsSettingSaveable(const Config::ConfigLocation& config_location);
-}  // namespace ConfigLoader
+}  // namespace ConfigLoaders
diff --git a/Source/Core/Core/ConfigLoaders/MovieConfigLoader.h b/Source/Core/Core/ConfigLoaders/MovieConfigLoader.h
@@ -32,4 +32,4 @@ class MovieConfigLayerLoader final : public Config::ConfigLayerLoader
 
 void SaveToDTM(Movie::DTMHeader* header);
 std::unique_ptr<Config::ConfigLayerLoader> GenerateMovieConfigLoader(Movie::DTMHeader* header);
-}
+}  // namespace ConfigLoaders
diff --git a/Source/Core/Core/CoreTiming.cpp b/Source/Core/Core/CoreTiming.cpp
@@ -442,4 +442,4 @@ void SetFakeTBStartTicks(u64 val)
   g.fake_TB_start_ticks = val;
 }
 
-}  // namespace
+}  // namespace CoreTiming
diff --git a/Source/Core/Core/CoreTiming.h b/Source/Core/Core/CoreTiming.h
@@ -108,4 +108,4 @@ void SetFakeTBStartTicks(u64 val);
 
 void ForceExceptionCheck(s64 cycles);
 
-}  // end of namespace
+}  // namespace CoreTiming
diff --git a/Source/Core/Core/DSP/Interpreter/DSPIntExtOps.cpp b/Source/Core/Core/DSP/Interpreter/DSPIntExtOps.cpp
@@ -495,7 +495,7 @@ void nop(const UDSPInstruction opc)
 }
 
 }  // namespace Ext
-}  // namespace Interpeter
+}  // namespace Interpreter
 
 // The ext ops are calculated in parallel with the actual op. That means that
 // both the main op and the ext op see the same register state as input. The

diff --git a/Source/Core/Core/DSP/Interpreter/DSPIntExtOps.h b/Source/Core/Core/DSP/Interpreter/DSPIntExtOps.h
@@ -44,5 +44,5 @@ void nr(UDSPInstruction opc);
 void nop(UDSPInstruction opc);
 
 }  // namespace Ext
-}  // namespace Interpeter
+}  // namespace Interpreter
 }  // namespace DSP
diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp
@@ -159,4 +159,4 @@ void PrintDataBuffer(LogTypes::LOG_TYPE type, const u8* data, size_t size, const
   }
 }
 
-}  // end of namespace Debugger
+}  // namespace Dolphin_Debugger
diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.h b/Source/Core/Core/Debugger/Debugger_SymbolMap.h
@@ -25,4 +25,4 @@ void PrintDataBuffer(LogTypes::LOG_TYPE type, const u8* data, size_t size,
                      const std::string& title);
 void AddAutoBreakpoints();
 
-}  // end of namespace Debugger
+}  // namespace Dolphin_Debugger
diff --git a/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp
@@ -290,4 +290,4 @@ void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory& cpMe
     vtxDescHex >>= 2;
   }
 }
-}
+}  // namespace FifoAnalyzer
diff --git a/Source/Core/Core/FifoPlayer/FifoAnalyzer.h b/Source/Core/Core/FifoPlayer/FifoAnalyzer.h
@@ -38,4 +38,4 @@ void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory& cpMe
 
 extern bool s_DrawingObject;
 extern FifoAnalyzer::CPMemory s_CpMem;
-}
+}  // namespace FifoAnalyzer
diff --git a/Source/Core/Core/GeckoCodeConfig.cpp b/Source/Core/Core/GeckoCodeConfig.cpp
@@ -253,4 +253,4 @@ void SaveCodes(IniFile& inifile, const std::vector<GeckoCode>& gcodes)
   inifile.SetLines("Gecko", lines);
   inifile.SetLines("Gecko_Enabled", enabledLines);
 }
-}
+}  // namespace Gecko
diff --git a/Source/Core/Core/GeckoCodeConfig.h b/Source/Core/Core/GeckoCodeConfig.h
@@ -15,4 +15,4 @@ namespace Gecko
 std::vector<GeckoCode> LoadCodes(const IniFile& globalIni, const IniFile& localIni);
 std::vector<GeckoCode> DownloadCodes(std::string gametdb_id, bool* succeeded);
 void SaveCodes(IniFile& inifile, const std::vector<GeckoCode>& gcodes);
-}
+}  // namespace Gecko
diff --git a/Source/Core/Core/HLE/HLE_Misc.cpp b/Source/Core/Core/HLE/HLE_Misc.cpp
@@ -68,4 +68,4 @@ void GeckoReturnTrampoline()
                    PowerPC::HostRead_U64(SP + 24 + (2 * i + 1) * sizeof(u64)));
   }
 }
-}
+}  // namespace HLE_Misc
diff --git a/Source/Core/Core/HLE/HLE_Misc.h b/Source/Core/Core/HLE/HLE_Misc.h
@@ -10,4 +10,4 @@ void UnimplementedFunction();
 void HBReload();
 void GeckoCodeHandlerICacheFlush();
 void GeckoReturnTrampoline();
-}
+}  // namespace HLE_Misc
diff --git a/Source/Core/Core/HLE/HLE_OS.h b/Source/Core/Core/HLE/HLE_OS.h
@@ -14,4 +14,4 @@ void HLE_LogDPrint();
 void HLE_LogVDPrint();
 void HLE_LogFPrint();
 void HLE_LogVFPrint();
-}
+}  // namespace HLE_OS
diff --git a/Source/Core/Core/HW/AudioInterface.h b/Source/Core/Core/HW/AudioInterface.h
@@ -28,4 +28,4 @@ unsigned int GetAIDSampleRate();
 
 void GenerateAISInterrupt();
 
-}  // namespace
+}  // namespace AudioInterface
diff --git a/Source/Core/Core/HW/CPU.cpp b/Source/Core/Core/HW/CPU.cpp
@@ -328,4 +328,4 @@ bool PauseAndLock(bool do_lock, bool unpause_on_unlock, bool control_adjacent)
   }
   return was_unpaused;
 }
-}
+}  // namespace CPU
diff --git a/Source/Core/Core/HW/CPU.h b/Source/Core/Core/HW/CPU.h
@@ -74,4 +74,4 @@ const State* GetStatePtr();
 // "control_adjacent" causes PauseAndLock to behave like EnableStepping by modifying the
 //   state of the Audio and FIFO subsystems as well.
 bool PauseAndLock(bool do_lock, bool unpause_on_unlock = true, bool control_adjacent = false);
-}
+}  // namespace CPU
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h b/Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h
@@ -460,8 +460,8 @@ void ProcessVoice(PB_TYPE& pb, const AXBuffers& buffers, u16 count, AXMixControl
     pb.lpf.yn1 = LowPassFilter(samples, count, pb.lpf.yn1, pb.lpf.a0, pb.lpf.b0);
   }
 
-    // Mix LRS, AUXA and AUXB depending on mixer_control
-    // TODO: Handle DPL2 on AUXB.
+  // Mix LRS, AUXA and AUXB depending on mixer_control
+  // TODO: Handle DPL2 on AUXB.
 
 #define MIX_ON(C) (0 != (mctrl & MIX_##C))
 #define RAMP_ON(C) (0 != (mctrl & MIX_##C##_RAMP))

diff --git a/Source/Core/Core/HW/DVD/DVDInterface.h b/Source/Core/Core/HW/DVD/DVDInterface.h
@@ -16,7 +16,7 @@ namespace DiscIO
 {
 class Volume;
 struct Partition;
-}
+}  // namespace DiscIO
 namespace MMIO
 {
 class Mapping;
-Original file line number
+Diff line change
@@ Expand Up / @@ -730,4 +730,4 @@ float InputDevice::AxisValue(int padID, ButtonType axis) @@
       else
         return _buttons[binding->second->_buttontype] == BUTTON_PRESSED ? 1.0f : 0.0f;
     }
-    }
+    }  // namespace ButtonManager
Original file line number	Diff line number	Diff line change
Expand Up		@@ -108,4 +108,4 @@ void SetFakeTBStartTicks(u64 val);

		void ForceExceptionCheck(s64 cycles);

		} // end of namespace
		} // namespace CoreTiming
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,4 +28,4 @@ unsigned int GetAIDSampleRate();

		void GenerateAISInterrupt();

		} // namespace
		} // namespace AudioInterface