Pack nested namespaces together

src/openrct2-ui/CursorData.cpp

@@ -17,7 +17,7 @@
 #include <openrct2/interface/Cursors.h>
 #include "CursorRepository.h"
 
-namespace OpenRCT2 { namespace Ui
+namespace OpenRCT2::Ui
 {
     static constexpr const CursorData BlankCursorData =
     {
@@ -664,4 +664,4 @@ namespace OpenRCT2 { namespace Ui
         }
         return result;
     }
-} }
+}

src/openrct2-ui/CursorRepository.h

@@ -23,9 +23,7 @@
 
 struct SDL_Cursor;
 
-namespace OpenRCT2
+namespace OpenRCT2::Ui
-{
-    namespace Ui
 {
     class CursorRepository
     {
@@ -78,4 +76,3 @@ namespace OpenRCT2
         static const CursorData * GetCursorData(CURSOR_ID cursorId);
     };
 }
-}

src/openrct2-ui/TextComposition.h

@@ -20,9 +20,7 @@
 
 union SDL_Event;
 
-namespace OpenRCT2
+namespace OpenRCT2::Ui
-{
-    namespace Ui
 {
     /**
      * Represents a
@@ -55,4 +53,3 @@ namespace OpenRCT2
         void RecalculateLength();
     };
 }
-}

src/openrct2-ui/UiContext.Android.cpp

@@ -26,7 +26,7 @@
 
 #include <SDL.h>
 
-namespace OpenRCT2 { namespace Ui
+namespace OpenRCT2::Ui
 {
 
     class AndroidContext final : public IPlatformUiContext
@@ -74,6 +74,6 @@ namespace OpenRCT2 { namespace Ui
     {
         return new AndroidContext();
     }
-    } }
+}
 
 #endif // __ANDROID__

src/openrct2-ui/UiContext.Linux.cpp

@@ -29,7 +29,7 @@
 
 #include <SDL.h>
 
-namespace OpenRCT2 { namespace Ui
+namespace OpenRCT2::Ui
 {
     enum class DIALOG_TYPE
     {
@@ -385,6 +385,6 @@ namespace OpenRCT2 { namespace Ui
     {
         return new LinuxContext();
     }
-} }
+}
 
 #endif // __linux__ || __OpenBSD__

src/openrct2-ui/UiContext.Win32.cpp

@@ -54,7 +54,7 @@ static std::wstring SHGetPathFromIDListLongPath(LPCITEMIDLIST pidl)
     return pszPath;
 }
 
-namespace OpenRCT2 { namespace Ui
+namespace OpenRCT2::Ui
 {
     class Win32Context : public IPlatformUiContext
     {
@@ -224,6 +224,6 @@ namespace OpenRCT2 { namespace Ui
     {
         return new Win32Context();
     }
-} }
+}
 
 #endif // _WIN32

src/openrct2-ui/UiContext.macOS.mm

@@ -27,7 +27,7 @@
 
 #include <SDL.h>
 
-namespace OpenRCT2 { namespace Ui
+namespace OpenRCT2::Ui
 {
     class macOSContext final : public IPlatformUiContext
     {
@@ -182,6 +182,6 @@ namespace OpenRCT2 { namespace Ui
     {
         return new macOSContext();
     }
-} }
+}
 
 #endif // __APPLE__ && __MACH__

src/openrct2-ui/WindowManager.h

@@ -16,9 +16,9 @@
 
 #include <openrct2/common.h>
 
-namespace OpenRCT2 { namespace Ui
+namespace OpenRCT2::Ui
 {
     interface IWindowManager;
 
     IWindowManager * CreateWindowManager();
-} }
+}

src/openrct2-ui/audio/AudioChannel.cpp

@@ -24,7 +24,7 @@
 #include "AudioContext.h"
 #include "AudioFormat.h"
 
-namespace OpenRCT2 { namespace Audio
+namespace OpenRCT2::Audio
 {
     class AudioChannelImpl : public ISDLAudioChannel
     {
@@ -295,4 +295,4 @@ namespace OpenRCT2 { namespace Audio
     {
         return new (std::nothrow) AudioChannelImpl();
     }
-} }
+}

src/openrct2-ui/audio/AudioContext.cpp

@@ -21,7 +21,7 @@
 #include "../SDLException.h"
 #include "AudioContext.h"
 
-namespace OpenRCT2 { namespace Audio
+namespace OpenRCT2::Audio
 {
     class AudioContext : public IAudioContext
     {
@@ -98,4 +98,4 @@ namespace OpenRCT2 { namespace Audio
     {
         return new AudioContext();
     }
-} }
+}

src/openrct2-ui/audio/AudioContext.h

@@ -9,7 +9,7 @@
 struct SDL_RWops;
 using SpeexResamplerState = struct SpeexResamplerState_;
 
-namespace OpenRCT2 { namespace Audio
+namespace OpenRCT2::Audio
 {
     struct      AudioFormat;
     interface   IAudioContext;
@@ -70,4 +70,4 @@ namespace OpenRCT2 { namespace Audio
     }
 
     IAudioContext * CreateAudioContext();
-} }
+}

src/openrct2-ui/audio/AudioFormat.h

@@ -19,7 +19,7 @@
 #include <openrct2/common.h>
 #include <SDL2/SDL.h>
 
-namespace OpenRCT2 { namespace Audio
+namespace OpenRCT2::Audio
 {
     /**
      * Represents the size, frequency and number of channels for
@@ -53,4 +53,4 @@ namespace OpenRCT2 { namespace Audio
     {
         return !(lhs == rhs);
     }
-} }
+}

src/openrct2-ui/audio/AudioMixer.cpp

@@ -36,7 +36,7 @@
 #include <openrct2/OpenRCT2.h>
 #include <openrct2/platform/platform.h>
 
-namespace OpenRCT2 { namespace Audio
+namespace OpenRCT2::Audio
 {
     class AudioMixerImpl final : public IAudioMixer
     {
@@ -513,4 +513,4 @@ namespace OpenRCT2 { namespace Audio
     {
         return new AudioMixerImpl();
     }
-} }
+}

src/openrct2-ui/audio/FileAudioSource.cpp

@@ -21,7 +21,7 @@
 #include "AudioContext.h"
 #include "AudioFormat.h"
 
-namespace OpenRCT2 { namespace Audio
+namespace OpenRCT2::Audio
 {
     /**
      * An audio source where raw PCM data is streamed directly from
@@ -207,4 +207,4 @@ namespace OpenRCT2 { namespace Audio
         }
         return source;
     }
-} }
+}

src/openrct2-ui/audio/MemoryAudioSource.cpp

@@ -24,7 +24,7 @@
 #include "AudioContext.h"
 #include "AudioFormat.h"
 
-namespace OpenRCT2 { namespace Audio
+namespace OpenRCT2::Audio
 {
     /**
      * An audio source where raw PCM data is initially loaded into RAM from
@@ -243,4 +243,4 @@ namespace OpenRCT2 { namespace Audio
         }
         return source;
     }
-} }
+}

src/openrct2-ui/interface/InGameConsole.h

@@ -1,6 +1,6 @@
 #include <openrct2/interface/Console.h>
 
-namespace OpenRCT2 { namespace Ui
+namespace OpenRCT2::Ui
 {
     class InGameConsole final : public InteractiveConsole
     {
@@ -53,4 +53,4 @@ namespace OpenRCT2 { namespace Ui
         void Invalidate() const;
         sint32 GetNumVisibleLines() const;
     };
-} }
+}

src/openrct2/audio/AudioChannel.h

@@ -18,7 +18,7 @@
 
 #include "../common.h"
 
-namespace OpenRCT2 { namespace Audio
+namespace OpenRCT2::Audio
 {
     interface IAudioSource;
 
@@ -73,4 +73,4 @@ namespace OpenRCT2 { namespace Audio
 
         virtual size_t Read(void * dst, size_t len) abstract;
     };
-} }
+}

src/openrct2/audio/AudioContext.h

@@ -20,9 +20,7 @@
 #include <vector>
 #include "../common.h"
 
-namespace OpenRCT2
+namespace OpenRCT2::Audio
-{
-    namespace Audio
 {
     interface IAudioChannel;
     interface IAudioMixer;
@@ -63,4 +61,3 @@ namespace OpenRCT2
 
     IAudioContext * CreateDummyAudioContext();
 }
-}

src/openrct2/audio/AudioMixer.h

@@ -29,7 +29,7 @@ enum MIXER_GROUP
     MIXER_GROUP_TITLE_MUSIC,
 };
 
-namespace OpenRCT2 { namespace Audio
+namespace OpenRCT2::Audio
 {
     interface IAudioSource;
     interface IAudioChannel;
@@ -53,7 +53,7 @@ namespace OpenRCT2 { namespace Audio
         virtual IAudioSource * GetSoundSource(sint32 id) abstract;
         virtual IAudioSource * GetMusicSource(sint32 id) abstract;
     };
-} }
+}
 
 #ifndef DSBPAN_LEFT
 #define DSBPAN_LEFT -10000

src/openrct2/audio/AudioSource.h

@@ -19,7 +19,7 @@
 #include "../common.h"
 #include "AudioMixer.h"
 
-namespace OpenRCT2 { namespace Audio
+namespace OpenRCT2::Audio
 {
     /**
      * Represents a readable source of audio PCM data.
@@ -37,4 +37,4 @@ namespace OpenRCT2 { namespace Audio
     {
         IAudioSource * CreateNull();
     }
-} }
+}

src/openrct2/audio/DummyAudioContext.cpp

@@ -16,7 +16,7 @@
 
 #include "AudioContext.h"
 
-namespace OpenRCT2 { namespace Audio
+namespace OpenRCT2::Audio
 {
     class DummyAudioContext final : public IAudioContext
     {
@@ -49,4 +49,4 @@ namespace OpenRCT2 { namespace Audio
     {
         return new DummyAudioContext();
     }
-} }
+}

src/openrct2/audio/NullAudioSource.cpp

@@ -16,7 +16,7 @@
 
 #include "AudioSource.h"
 
-namespace OpenRCT2 { namespace Audio
+namespace OpenRCT2::Audio
 {
     /**
      * An audio source representing silence.
@@ -39,4 +39,4 @@ namespace OpenRCT2 { namespace Audio
     {
         return new NullAudioSource();
     }
-} }
+}

src/openrct2/drawing/IDrawingContext.h

@@ -20,7 +20,7 @@
 
 #include "Drawing.h"
 
-namespace OpenRCT2 { namespace Drawing
+namespace OpenRCT2::Drawing
 {
     interface IDrawingEngine;
 
@@ -39,4 +39,4 @@ namespace OpenRCT2 { namespace Drawing
         virtual void DrawSpriteSolid(uint32 image, sint32 x, sint32 y, uint8 colour)                          abstract;
         virtual void DrawGlyph(uint32 image, sint32 x, sint32 y, uint8 * palette)                             abstract;
     };
-} }
+}

src/openrct2/drawing/IDrawingEngine.h

@@ -40,7 +40,7 @@ enum DRAWING_ENGINE_FLAGS
 struct rct_drawpixelinfo;
 struct rct_palette_entry;
 
-namespace OpenRCT2 { namespace Drawing
+namespace OpenRCT2::Drawing
 {
     interface IDrawingContext;
 
@@ -80,4 +80,4 @@ namespace OpenRCT2 { namespace Drawing
             sint32 xStart,
             sint32 yStart) abstract;
     };
-} }
+}

src/openrct2/drawing/Rain.h

@@ -20,9 +20,9 @@
 
 struct rct_drawpixelinfo;
 
-namespace OpenRCT2 { namespace Drawing
+namespace OpenRCT2::Drawing
 {
     interface IRainDrawer;
-} }
+}
 
 void DrawRain(rct_drawpixelinfo * dpi, OpenRCT2::Drawing::IRainDrawer * rainDrawer);

src/openrct2/interface/Cursors.h

@@ -51,7 +51,7 @@ enum CURSOR_ID
     CURSOR_COUNT,
 };
 
-namespace OpenRCT2 { namespace Ui
+namespace OpenRCT2::Ui
 {
     constexpr size_t CURSOR_BIT_WIDTH = 32;
     constexpr size_t CURSOR_HEIGHT    = 4;
@@ -65,4 +65,4 @@ namespace OpenRCT2 { namespace Ui
         uint8 Data[CURSOR_BIT_WIDTH * CURSOR_HEIGHT];
         uint8 Mask[CURSOR_BIT_WIDTH * CURSOR_HEIGHT];
     };
-} }
+}

src/openrct2/ui/DummyUiContext.cpp

@@ -20,7 +20,7 @@
 
 using namespace OpenRCT2::Drawing;
 
-namespace OpenRCT2 { namespace Ui
+namespace OpenRCT2::Ui
 {
     /**
     * Represents the window or screen that OpenRCT2 is presented on.
@@ -96,4 +96,4 @@ namespace OpenRCT2 { namespace Ui
     {
         return new DummyUiContext();
     }
-} }
+}

src/openrct2/ui/DummyWindowManager.cpp

@@ -16,7 +16,7 @@
 
 #include "WindowManager.h"
 
-namespace OpenRCT2 { namespace Ui
+namespace OpenRCT2::Ui
 {
     class DummyWindowManager final : public IWindowManager
     {
@@ -38,4 +38,4 @@ namespace OpenRCT2 { namespace Ui
     {
         return new DummyWindowManager();
     }
-} }
+}

src/openrct2/ui/WindowManager.h

@@ -22,9 +22,7 @@
 
 #include "../interface/Window.h"
 
-namespace OpenRCT2
+namespace OpenRCT2::Ui
-{
-    namespace Ui
 {
     /**
      * Manager of in-game windows and widgets.
@@ -48,4 +46,3 @@ namespace OpenRCT2
 
     IWindowManager * CreateDummyWindowManager();
 }
-}