re-ran clang-tidy and clang-format

Author: janwilmans

CobaltFusion/Throttle.cpp

@@ -16,7 +16,7 @@ namespace fusion {
 using namespace std::chrono_literals;
 
 Throttle::Throttle(IExecutor& executor, int callsPerSecond, std::function<void()> fn) :
-    m_delta(std::chrono::milliseconds(1000 / callsPerSecond)),
+    m_delta(1000ms / callsPerSecond),
     m_callPending(false),
     m_fn(std::move(fn)),
     m_executor(executor)

DebugView++/AboutDlg.cpp

@@ -20,7 +20,7 @@ BOOL CAboutDlg::OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/)
     CenterWindow(GetParent());
     m_srclink.SubclassWindow(GetDlgItem(IDC_DEBUGVIEW_SRC_URL));
     m_link.SubclassWindow(GetDlgItem(IDC_DEBUGVIEW_URL));
-    int version[4] = {VERSION};
+    std::array<int, 4> version = {VERSION};
     SetDlgItemText(IDC_VERSION, WStr(wstringbuilder() << L"DebugView++ V" << version[0] << L"." << version[1] << L"." << version[2] << L"." << version[3]));
     SetDlgItemText(IDC_DATE, _T(__DATE__));
     return TRUE;

DebugView++/CLogViewTabItem2.cpp

@@ -41,11 +41,17 @@ void Add(const ViewPort& viewport, gdi::Line& line, gdi::Artifact a)
 std::wstring FormatDuration(Duration d)
 {
     if (d >= 1s)
+    {
         return wstringbuilder() << d.count() / 1e9 << L" s";
+    }
     if (d >= 1ms)
+    {
         return wstringbuilder() << d.count() / 1e6 << L" ms";
+    }
     if (d >= 1us)
+    {
         return wstringbuilder() << d.count() / 1e3 << L" us";
+    }
     return wstringbuilder() << d.count() << L" ns";
 }
 
@@ -103,19 +109,27 @@ Duration Increase(Duration d)
 {
     Duration temp = d;
     while (temp > 10ns)
+    {
         temp /= 10;
+    }
     if (temp == 2ns)
+    {
         return (d * 2) + (d / 2);
+    }
     return d * 2;
 }
 
 Duration Decrease(Duration d)
 {
     Duration temp = d;
     while (temp > 10ns)
+    {
         temp /= 10;
+    }
     if (temp == 5ns)
+    {
         return (d - (d / 5)) / 2;
+    }
     return std::max(1ns, d / 2);
 }
 

DebugView++/CLogViewTabItem2.h

@@ -63,7 +63,7 @@ using Duration = std::chrono::steady_clock::duration;
 class ViewPort
 {
 public:
-    ViewPort() {}
+    ViewPort() = default;
     ViewPort(TimePoint begin, TimePoint end, Duration timeUnitPerPixel);
     bool Contains(TimePoint p) const;
     gdi::Pixel ToPx(TimePoint p) const;
@@ -88,7 +88,7 @@ class ViewPort
 class CLogViewTabItem2 : public CTabViewTabItem
 {
 public:
-    ~CLogViewTabItem2();
+    ~CLogViewTabItem2() override;
     void SetView(std::shared_ptr<CLogView> pView);
     CLogView& GetView();
 

DebugView++/DebugView++.cpp

@@ -35,7 +35,9 @@ class CAppModuleInitialization
     {
         HRESULT hr = m_module.Init(nullptr, hInstance);
         if (FAILED(hr))
+        {
             Win32::ThrowWin32Error(hr, "CAppModule::Init");
+        }
     }
 
     ~CAppModuleInitialization()
@@ -110,16 +112,19 @@ int Main(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, LPWSTR /*lpstrCmdLine
     CAppModuleInitialization moduleInit(_Module, hInstance);
 
     HANDLE hStdIn = GetStdHandle(STD_INPUT_HANDLE);
-    HANDLE hFile = nullptr, hPipe = nullptr;
+    HANDLE hFile = nullptr;
+    HANDLE hPipe = nullptr;
     switch (GetFileType(hStdIn))
     {
     case FILE_TYPE_DISK: hFile = hStdIn; break;
     case FILE_TYPE_PIPE: hPipe = hStdIn; break;
     default: break;
     }
 
-    if (hPipe && IsDBWinViewerActive())
+    if ((hPipe != nullptr) && IsDBWinViewerActive())
+    {
         return ForwardMessagesFromPipe(hPipe);
+    }
 
     CMainFrame wndMain;
     MessageLoop theLoop(_Module);
@@ -141,23 +146,35 @@ int Main(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, LPWSTR /*lpstrCmdLine
         else if (args[i][0] != '/')
         {
             if (!fileName.empty())
+            {
                 throw std::runtime_error("multiple filenames specified on commandline");
+            }
             fileName = args[i];
         }
     }
 
     if (wndMain.CreateEx() == nullptr)
+    {
         Win32::ThrowLastError(L"Main window creation failed!");
+    }
 
     wndMain.ShowWindow(cmdShow);
     if (boost::algorithm::iends_with(fileName, ".dbconf"))
+    {
         wndMain.LoadConfiguration(fileName);
+    }
     else if (!fileName.empty())
+    {
         wndMain.Load(fileName, false);
-    else if (hFile)
+    }
+    else if (hFile != nullptr)
+    {
         wndMain.Load(hFile);
-    else if (hPipe)
+    }
+    else if (hPipe != nullptr)
+    {
         wndMain.CapturePipe(hPipe);
+    }
 
     return theLoop.Run();
 }

DebugView++/DropTargetSupport.cpp

@@ -18,8 +18,8 @@ namespace debugviewpp {
  * https://www.codeproject.com/Articles/840/How-to-Implement-Drag-and-Drop-Between-Your-Progra
  */
 
-DropTargetSupport::DropTargetSupport() :
-    m_hwnd(nullptr)
+DropTargetSupport::DropTargetSupport()
+
 {
 }
 
@@ -39,7 +39,7 @@ bool QueryDataObject(IDataObject* pDataObject, CLIPFORMAT format)
     FORMATETC fmtetc = {format, nullptr, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
 
     // does the data object support CF_TEXT using a HGLOBAL?
-    return pDataObject->QueryGetData(&fmtetc) == S_OK ? true : false;
+    return pDataObject->QueryGetData(&fmtetc) == S_OK;
 }
 
 STDMETHODIMP DropTargetSupport::DragEnter(IDataObject* pDataObject, DWORD /*grfKeyState*/, POINTL /*pt*/, DWORD* pdwEffect)
@@ -98,7 +98,9 @@ std::wstring GetCF_HDROP(IDataObject* pDataObject)
         {
             std::vector<wchar_t> filename(DragQueryFile(hDropInfo, 0, nullptr, 0) + 1);
             if (DragQueryFile(hDropInfo, 0, filename.data(), static_cast<UINT>(filename.size())))
+            {
                 result = std::wstring(filename.data());
+            }
         }
         GlobalUnlock(stgmed.hGlobal);
 

DebugView++/DropTargetSupport.h

@@ -34,11 +34,11 @@ class ATL_NO_VTABLE DropTargetSupport : public CComObjectRootEx<CComSingleThread
     STDMETHOD(Drop)
     (IDataObject* pDataObject, DWORD grfKeyState, POINTL pt, DWORD* pdwEffect) override;
 
-    typedef boost::signals2::signal<void(const std::wstring& uri)> DroppedSignal;
+    using DroppedSignal = boost::signals2::signal<void(const std::wstring&)>;
     boost::signals2::connection SubscribeToDropped(DroppedSignal::slot_type slot);
 
 private:
-    HWND m_hwnd;
+    HWND m_hwnd = nullptr;
     DroppedSignal m_onDropped;
 };