Format c++ sources with clang-format using clang format file aproxima…

…ting PEP 7 Based on https://github.com/closeio/ciso8601/blob/master/.clang-format
mhammond · mhammond · Nov 25, 2019 · Jan 26, 2018 · Mar 12, 2019 · Mar 12, 2019
commit d4b1068ed446bfda09550a51bb103f0907e3a857
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,21 @@
+# A clang-format style that approximates Python's PEP 7
+# Useful for IDE integration
+BasedOnStyle: Google
+AlwaysBreakAfterReturnType: All
+AllowShortIfStatementsOnASingleLine: false
+AlignAfterOpenBracket: Align
+BreakBeforeBraces: Stroustrup
+ColumnLimit: 120
+DerivePointerAlignment: false
+IndentWidth: 4
+Language: Cpp
+PointerAlignment: Right
+ReflowComments: true
+SpaceBeforeParens: ControlStatements
+SpacesInParentheses: false
+TabWidth: 4
+UseTab: Never
+# sorting includes breaks build
+SortIncludes: false
+# don't break after return type
+AlwaysBreakAfterReturnType: None
diff --git a/Pythonwin/Win32app.h b/Pythonwin/Win32app.h
@@ -3,31 +3,32 @@
 // Python Thread object
 //
 class PyCWinThread : public PyCCmdTarget {
-protected:
-	PyCWinThread();
-	~PyCWinThread();
-public:
-	static PyObject *create(PyObject *self, PyObject *args);
-	static ui_type_CObject type;
-	MAKE_PY_CTOR(PyCWinThread)
+   protected:
+    PyCWinThread();
+    ~PyCWinThread();
+
+   public:
+    static PyObject *create(PyObject *self, PyObject *args);
+    static ui_type_CObject type;
+    MAKE_PY_CTOR(PyCWinThread)
 };
 
 //
 // Application Object.
 //
 
 class PyCWinApp : public PyCWinThread {
-protected:
-	PyCWinApp();
-	~PyCWinApp();
-public:
-	static PyObject *pExistingAppObject;
+   protected:
+    PyCWinApp();
+    ~PyCWinApp();
 
-	static ui_type_CObject type;
-	MAKE_PY_CTOR(PyCWinApp)
-	virtual void cleanup();
-};
+   public:
+    static PyObject *pExistingAppObject;
 
+    static ui_type_CObject type;
+    MAKE_PY_CTOR(PyCWinApp)
+    virtual void cleanup();
+};
 
 /////////////////////////////////////////////////////////////////////
 //
@@ -37,47 +38,52 @@ class PyCWinApp : public PyCWinThread {
 // It is never instantiated.  Therefore, it must not have virtual
 // functions or data items.
 // It is used purely so C++ casts can override protection.
-class CProtectedDocManager : public CDocManager 
-{
-public:
-	CPtrList &GetTemplateList() {return m_templateList;}
+class CProtectedDocManager : public CDocManager {
+   public:
+    CPtrList &GetTemplateList() { return m_templateList; }
 };
 
 class PYW_EXPORT CProtectedWinApp : public CWinApp {
-public:
-	// how do I change from protected to public?
-	int GetRecentCount();
-	CString GetRecentFileName(int index);
-	void RemoveRecentFile(int index);
-	// Get main window - usually (but not always!) a CMDIFrameWnd
-	CWnd *GetMainFrame () {return m_pMainWnd;}
-	void SetMainFrame (CWnd *pWnd) {m_pMainWnd = pWnd;}
-	CDocument *FindOpenDocument (const TCHAR *lpszFileName);
+   public:
+    // how do I change from protected to public?
+    int GetRecentCount();
+    CString GetRecentFileName(int index);
+    void RemoveRecentFile(int index);
+    // Get main window - usually (but not always!) a CMDIFrameWnd
+    CWnd *GetMainFrame() { return m_pMainWnd; }
+    void SetMainFrame(CWnd *pWnd) { m_pMainWnd = pWnd; }
+    CDocument *FindOpenDocument(const TCHAR *lpszFileName);
 // warning C4996: 'xxx' was declared deprecated
-#pragma warning( disable : 4996 )
+#pragma warning(disable : 4996)
 #ifndef _AFX_NO_CTL3D_SUPPORT
-        // Not available on early SDK _Win64 builds.
-	BOOL Enable3dControls() {return CWinApp::Enable3dControls();}
+    // Not available on early SDK _Win64 builds.
+    BOOL Enable3dControls() { return CWinApp::Enable3dControls(); }
 #endif
-	void SetDialogBkColor(COLORREF clrCtlBk, COLORREF clrCtlText) { CWinApp::SetDialogBkColor(clrCtlBk, clrCtlText);}
-#pragma warning( default : 4996 )
-	BOOL HaveLoadStdProfileSettings() {return m_pRecentFileList!=NULL;}
-	void LoadStdProfileSettings(UINT max) {CWinApp::LoadStdProfileSettings(max);}
-	void SetRegistryKey(LPCTSTR key) {CWinApp::SetRegistryKey(key);}
-	void OnFileNew(void) {CWinApp::OnFileNew();}
-	void OnFileOpen(void) {CWinApp::OnFileOpen();}
-	CProtectedDocManager *GetDocManager();
-	PyObject *MakePyDocTemplateList(void);
+    void SetDialogBkColor(COLORREF clrCtlBk, COLORREF clrCtlText) { CWinApp::SetDialogBkColor(clrCtlBk, clrCtlText); }
+#pragma warning(default : 4996)
+    BOOL HaveLoadStdProfileSettings() { return m_pRecentFileList != NULL; }
+    void LoadStdProfileSettings(UINT max) { CWinApp::LoadStdProfileSettings(max); }
+    void SetRegistryKey(LPCTSTR key) { CWinApp::SetRegistryKey(key); }
+    void OnFileNew(void) { CWinApp::OnFileNew(); }
+    void OnFileOpen(void) { CWinApp::OnFileOpen(); }
+    CProtectedDocManager *GetDocManager();
+    PyObject *MakePyDocTemplateList(void);
 };
 
 class CProtectedWinThread : public CWinThread {
-public:
-	void PumpIdle();
-	bool PumpWaitingMessages(UINT firstMsg, UINT lastMsg);
-	void PumpMessages();
+   public:
+    void PumpIdle();
+    bool PumpWaitingMessages(UINT firstMsg, UINT lastMsg);
+    void PumpMessages();
 };
 
-inline CWinApp *GetApp() {CWinApp *ret = AfxGetApp(); if (ret==NULL) RETURN_ERR("There is no application object"); return ret;}
-inline CProtectedWinApp *GetProtectedApp() {return (CProtectedWinApp *)GetApp();}
-inline CProtectedWinThread *GetProtectedThread() {return (CProtectedWinThread *)GetApp();}
+inline CWinApp *GetApp()
+{
+    CWinApp *ret = AfxGetApp();
+    if (ret == NULL)
+        RETURN_ERR("There is no application object");
+    return ret;
+}
+inline CProtectedWinApp *GetProtectedApp() { return (CProtectedWinApp *)GetApp(); }
+inline CProtectedWinThread *GetProtectedThread() { return (CProtectedWinThread *)GetApp(); }
 //////////////////////////////////////////////////////////////////////