using instead of typedef and renamed Resource.h -> resource.h

janwilmans · janwilmans · commit 9f5e562d2fc0 · 2019-12-24T16:30:44.000+01:00
diff --git a/DbgMsgSrc/dbgstream.h b/DbgMsgSrc/dbgstream.h
@@ -43,7 +43,7 @@ class basic_debugbuf : public std::basic_streambuf<Elem, Tr>
         return 0;
     }
 
-    using int_type = std::basic_streambuf<Elem, Tr>::int_type;
+    using int_type = typename std::basic_streambuf<Elem, Tr>::int_type;
     int_type overflow(int_type c) override
     {
         if (c == std::basic_streambuf<Elem, Tr>::traits_type::eof())
@@ -100,11 +100,11 @@ class basic_nullstream : public std::basic_ostream<Elem, Tr>
     basic_nullbuf<Elem, Tr> buf;
 };
 
-typedef basic_nullstream<char> nullstream;
-typedef basic_nullstream<wchar_t> wnullstream;
+using nullstream = basic_nullstream<char>;
+using wnullstream = basic_nullstream<wchar_t>;
 
-typedef basic_dbgstream<char> dbgstream;
-typedef basic_dbgstream<wchar_t> wdbgstream;
+using dbgstream = basic_dbgstream<char>;
+using wdbgstream = basic_dbgstream<wchar_t>;
 
 } // namespace dbgstream
 
diff --git a/DebugView++/AboutDlg.h b/DebugView++/AboutDlg.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "CobaltFusion/AtlWinExt.h"
-#include "Resource.h"
+#include "resource.h"
 
 namespace fusion {
 namespace debugviewpp {
diff --git a/DebugView++/FilterDlg.cpp b/DebugView++/FilterDlg.cpp
@@ -14,7 +14,7 @@
 #include "Win32/Utilities.h"
 #include "CobaltFusion/Str.h"
 #include "DebugView++Lib/LogFilter.h"
-#include "Resource.h"
+#include "resource.h"
 #include "FilterDlg.h"
 
 namespace fusion {
diff --git a/DebugView++/FilterDlg.h b/DebugView++/FilterDlg.h
@@ -12,7 +12,7 @@
 #include "FilterPage.h"
 #include "PropertyColorItem.h"
 #include "RegExDlg.h"
-#include "Resource.h"
+#include "resource.h"
 #include "Filter.h"
 
 namespace fusion {
diff --git a/DebugView++/FilterPage.cpp b/DebugView++/FilterPage.cpp
@@ -11,7 +11,7 @@
 #include "CobaltFusion/fusionassert.h"
 #include "CobaltFusion/Str.h"
 #include "Win32/Utilities.h"
-#include "Resource.h"
+#include "resource.h"
 #include "FilterPage.h"
 
 #include <memory>
diff --git a/DebugView++/FilterPage.h b/DebugView++/FilterPage.h
@@ -14,7 +14,7 @@
 #include "DebugView++Lib/FilterType.h"
 #include "DebugView++Lib/Filter.h"
 #include "Grid.h"
-#include "Resource.h"
+#include "resource.h"
 
 namespace fusion {
 namespace debugviewpp {
diff --git a/DebugView++/FindDlg.h b/DebugView++/FindDlg.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "CobaltFusion/AtlWinExt.h"
-#include "Resource.h"
+#include "resource.h"
 
 namespace fusion {
 namespace debugviewpp {
diff --git a/DebugView++/HistoryDlg.h b/DebugView++/HistoryDlg.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "CobaltFusion/AtlWinExt.h"
-#include "Resource.h"
+#include "resource.h"
 
 namespace fusion {
 namespace debugviewpp {
diff --git a/DebugView++/LogView.cpp b/DebugView++/LogView.cpp
@@ -21,7 +21,7 @@
 #include "Win32/Registry.h"
 #include "DebugView++Lib/Conversions.h"
 #include "DebugView++Lib/FileIO.h"
-#include "Resource.h"
+#include "resource.h"
 #include "MainFrame.h"
 #include "LogView.h"
 #include "RenameProcessDlg.h"
diff --git a/DebugView++/MainFrame.cpp b/DebugView++/MainFrame.cpp
@@ -27,7 +27,7 @@
 #include "DebugView++Lib/FileReader.h"
 #include "DebugView++Lib/FileIO.h"
 #include "DebugView++Lib/LogFilter.h"
-#include "Resource.h"
+#include "resource.h"
 #include "RunDlg.h"
 #include "HistoryDlg.h"
 #include "FilterDlg.h"
diff --git a/DebugView++/PropertyColorItem.h b/DebugView++/PropertyColorItem.h
@@ -121,7 +121,7 @@ class CPropertyColorItem : public CPropertyItem
             if (m_dlg.DoModal(m_hWndOwner) == IDOK)
             {
                 // Let control owner know
-                NMPROPERTYITEM nmh = {m_hWndOwner, static_cast<UINT_PTR>(::GetDlgCtrlID(m_hWndOwner)), PIN_ITEMCHANGED, this};
+                NMPROPERTYITEM nmh = {{m_hWndOwner, static_cast<UINT_PTR>(::GetDlgCtrlID(m_hWndOwner)), PIN_ITEMCHANGED}, this};
                 ::SendMessage(::GetParent(m_hWndOwner), WM_NOTIFY, nmh.hdr.idFrom, reinterpret_cast<LPARAM>(&nmh));
             }
             break;
diff --git a/DebugView++/RegExDlg.h b/DebugView++/RegExDlg.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "CobaltFusion/AtlWinExt.h"
-#include "Resource.h"
+#include "resource.h"
 
 namespace fusion {
 namespace debugviewpp {
diff --git a/DebugView++/RenameProcessDlg.h b/DebugView++/RenameProcessDlg.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "CobaltFusion/AtlWinExt.h"
-#include "Resource.h"
+#include "resource.h"
 
 namespace fusion {
 namespace debugviewpp {
diff --git a/DebugView++/RunDlg.h b/DebugView++/RunDlg.h
@@ -9,7 +9,7 @@
 
 #include <string>
 #include "CobaltFusion/AtlWinExt.h"
-#include "Resource.h"
+#include "resource.h"
 
 namespace fusion {
 namespace debugviewpp {
diff --git a/DebugView++/SourceDlg.h b/DebugView++/SourceDlg.h
@@ -10,7 +10,7 @@
 #include <vector>
 #include "CobaltFusion/AtlWinExt.h"
 #include "DebugView++Lib/LogSource.h"
-#include "Resource.h"
+#include "resource.h"
 
 namespace fusion {
 namespace debugviewpp {
diff --git a/DebugView++/SourcesDlg.cpp b/DebugView++/SourcesDlg.cpp
@@ -15,7 +15,7 @@
 #include "CobaltFusion/fusionassert.h"
 #include "DebugView++Lib/LogFilter.h"
 #include "DebugView++Lib/LogSource.h"
-#include "Resource.h"
+#include "resource.h"
 #include "SourceDlg.h"
 #include "SourcesDlg.h"
 
diff --git a/DebugView++/SourcesDlg.h b/DebugView++/SourcesDlg.h
@@ -12,7 +12,7 @@
 #include "DebugView++Lib/LogSources.h"
 #include "Grid.h"
 #include "PropertyColorItem.h"
-#include "Resource.h"
+#include "resource.h"
 #include "Filter.h"
 
 namespace fusion {
diff --git a/GDIGraphicsPOC/resource.h b/GDIGraphicsPOC/resource.h
diff --git a/GDIGraphicsPOC/resource.rc b/GDIGraphicsPOC/resource.rc
diff --git a/_clang-format b/_clang-format
@@ -65,7 +65,6 @@ SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: ControlStatements
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
-SpacesInContainerLiterals: false
 SpacesInAngles: false
 SpacesInContainerLiterals: false
 SpacesInCStyleCastParentheses: false
@@ -74,3 +73,4 @@ SpacesInSquareBrackets: false
 Standard: Cpp11
 TabWidth: 4
 UseTab: Never
+...
diff --git a/include/CobaltFusion/Executor.h b/include/CobaltFusion/Executor.h
@@ -70,9 +70,9 @@ class ScopedScheduledCall
 class TimedCalls
 {
 public:
-    typedef std::chrono::steady_clock Clock;
-    typedef Clock::time_point TimePoint;
-    typedef Clock::duration Duration;
+    using Clock = std::chrono::steady_clock;
+    using TimePoint = Clock::time_point;
+    using Duration = Clock::duration;
 
     struct CallData
     {
@@ -145,9 +145,9 @@ class TimedExecutor : private ExecutorBase,
                       public Executor
 {
 public:
-    typedef TimedCalls::Clock Clock;
-    typedef TimedCalls::TimePoint TimePoint;
-    typedef TimedCalls::Duration Duration;
+    using Clock = TimedCalls::Clock;
+    using TimePoint = TimedCalls::TimePoint;
+    using Duration = TimedCalls::Duration;
 
     ScheduledCall CallAt(const TimePoint& at, std::function<void()> fn);
     ScheduledCall CallAfter(const Duration& interval, std::function<void()> fn);
@@ -158,7 +158,7 @@ class TimedExecutor : private ExecutorBase,
     void RunOne() override;
 
 private:
-    typedef TimedCalls::CallData CallData;
+    using CallData = TimedCalls::CallData;
 
     TimedCalls m_scheduledCalls;
 };
diff --git a/include/CobaltFusion/ExecutorClient.h b/include/CobaltFusion/ExecutorClient.h
@@ -16,8 +16,7 @@ namespace fusion {
 class IExecutor
 {
 public:
-    virtual ~IExecutor() = default;
-    typedef std::chrono::steady_clock Clock;
+    using Clock = std::chrono::steady_clock;
     virtual void Call(std::function<void()> fn) = 0;
     virtual void CallAsync(std::function<void()> fn) = 0;
     virtual ScheduledCall CallAfter(const Clock::duration& interval, std::function<void()> fn) = 0;
@@ -27,6 +26,8 @@ class IExecutor
 
     // shall cancel all scheduled calls that are not in progress
     virtual void Cancel() = 0;
+
+    virtual ~IExecutor() = default;
 };
 
 class GuiExecutor;
diff --git a/include/CobaltFusion/GuiExecutor.h b/include/CobaltFusion/GuiExecutor.h
@@ -84,9 +84,9 @@ class GuiExecutor : private ExecutorBase,
                     private GuiExecutorBase
 {
 public:
-    typedef std::chrono::steady_clock Clock;
-    typedef Clock::time_point TimePoint;
-    typedef Clock::duration Duration;
+    using Clock = std::chrono::steady_clock;
+    using TimePoint = Clock::time_point;
+    using Duration = Clock::duration;
 
     GuiExecutor();
     ~GuiExecutor() override;
@@ -95,7 +95,7 @@ class GuiExecutor : private ExecutorBase,
     auto Call(Fn fn)
     {
         assert(!IsExecutorThread());
-        typedef decltype(fn()) R;
+        using R = decltype(fn());
         std::packaged_task<R()> task(fn);
         m_q.Push([&task]() { task(); });
         m_wnd.Notify();
@@ -105,7 +105,7 @@ class GuiExecutor : private ExecutorBase,
     template <typename Fn>
     auto CallAsync(Fn fn)
     {
-        typedef decltype(fn()) R;
+        using R = decltype(fn());
         auto pTask = std::make_shared<std::packaged_task<R()>>(fn);
         m_q.Push([pTask]() { (*pTask)(); });
         m_wnd.Notify();
@@ -123,7 +123,7 @@ class GuiExecutor : private ExecutorBase,
     void Synchronize();
 
 private:
-    typedef TimedCalls::CallData CallData;
+    using CallData = TimedCalls::CallData;
 
     void OnMessage() override;
     void OnTimer() override;
diff --git a/include/CobaltFusion/dbgstream.h b/include/CobaltFusion/dbgstream.h
@@ -102,11 +102,11 @@ class basic_nullstream : public std::basic_ostream<Elem, Tr>
     basic_nullbuf<Elem, Tr> buf;
 };
 
-typedef basic_nullstream<char> nullstream;
-typedef basic_nullstream<wchar_t> wnullstream;
+using nullstream = basic_nullstream<char>;
+using wnullstream = basic_nullstream<wchar_t>;
 
-typedef basic_dbgstream<char> dbgstream;
-typedef basic_dbgstream<wchar_t> wdbgstream;
+using dbgstream = basic_dbgstream<char>;
+using wdbgstream = basic_dbgstream<wchar_t>;
 
 } // namespace dbgstream
 
diff --git a/include/CobaltFusion/hstream.h b/include/CobaltFusion/hstream.h
@@ -100,7 +100,7 @@ class basic_handlestream : public std::basic_iostream<Elem, Tr>
     basic_handlebuf<Elem, Tr> m_buf;
 };
 
-typedef basic_handlestream<char> hstream;
-typedef basic_handlestream<wchar_t> whstream;
+using hstream = basic_handlestream<char>;
+using whstream = basic_handlestream<wchar_t>;
 
 } // namespace fusion
diff --git a/include/DebugView++Lib/FileReader.h b/include/DebugView++Lib/FileReader.h
@@ -25,7 +25,7 @@ class FileReader : public LogSource
     ~FileReader() override;
 
     void Initialize() override;
-    typedef boost::signals2::signal<void()> UpdateSignal;
+    using UpdateSignal = boost::signals2::signal<void()>;
     boost::signals2::connection SubscribeToUpdate(UpdateSignal::slot_type slot);
 
     void Abort() override;
diff --git a/include/DebugView++Lib/Line.h b/include/DebugView++Lib/Line.h
@@ -35,7 +35,7 @@ struct Line
     const LogSource* pLogSource;
 };
 
-typedef std::vector<Line> Lines;
+using Lines = std::vector<Line>;
 
 } // namespace debugviewpp
 } // namespace fusion
diff --git a/include/DebugView++Lib/LogSources.h b/include/DebugView++Lib/LogSources.h
@@ -33,7 +33,7 @@ class Loopback;
 class DbgviewReader;
 class SocketReader;
 
-typedef std::vector<HANDLE> LogSourceHandles;
+using LogSourceHandles = std::vector<HANDLE>;
 
 template <typename T>
 void EraseElements(std::vector<std::unique_ptr<T>>& v, const std::vector<T*>& e)
@@ -55,7 +55,7 @@ void EraseElements(std::vector<std::unique_ptr<T>>& v, const std::vector<T*>& e)
 class LogSources
 {
 public:
-    typedef boost::signals2::signal<bool()> UpdateSignal;
+    using UpdateSignal = boost::signals2::signal<bool()>;
 
     LogSources(IExecutor& executor, bool startListening = true);
     virtual ~LogSources();
diff --git a/include/DebugView++Lib/ProcessMonitor.h b/include/DebugView++Lib/ProcessMonitor.h
@@ -21,7 +21,7 @@ typedef std::unordered_map<DWORD, Win32::Handle> PidMap;
 class ProcessMonitor
 {
 public:
-    typedef boost::signals2::signal<void(DWORD, HANDLE)> ProcessEnded;
+    using ProcessEnded = boost::signals2::signal<void(DWORD, HANDLE)>;
 
     ProcessMonitor();
     ~ProcessMonitor();
diff --git a/include/DebugView++Lib/VectorLineBuffer.h b/include/DebugView++Lib/VectorLineBuffer.h
@@ -28,7 +28,7 @@ class VectorLineBuffer : public ILineBuffer
     Lines m_backingBuffer;
 };
 
-typedef VectorLineBuffer LineBuffer;
+using LineBuffer = VectorLineBuffer;
 
 } // namespace debugviewpp
 } // namespace fusion
diff --git a/include/Win32/Socket.h b/include/Win32/Socket.h
@@ -25,7 +25,7 @@ void WSAThrowLastError(const std::string& what);
 
 struct SocketDeleter
 {
-    typedef SOCKET pointer;
+    using pointer = SOCKET;
 
     void operator()(pointer p) const;
 };
diff --git a/include/Win32/Win32Lib.h b/include/Win32/Win32Lib.h
