Merge topic 'drop-double-underscores'

111be180 Rename header guards to not start with double underscore

Source/CursesDialog/cmCursesBoolWidget.h

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesBoolWidget_h
+#ifndef cmCursesBoolWidget_h
-#define __cmCursesBoolWidget_h
+#define cmCursesBoolWidget_h
 
 #include "cmCursesWidget.h"
 class cmCursesMainForm;
@@ -37,4 +37,4 @@ protected:
 
 };
 
-#endif // __cmCursesBoolWidget_h
+#endif // cmCursesBoolWidget_h

Source/CursesDialog/cmCursesCacheEntryComposite.h

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesCacheEntryComposite_h
+#ifndef cmCursesCacheEntryComposite_h
-#define __cmCursesCacheEntryComposite_h
+#define cmCursesCacheEntryComposite_h
 
 #include "../cmCacheManager.h"
 #include "cmCursesLabelWidget.h"
@@ -40,4 +40,4 @@ protected:
   int EntryWidth;
 };
 
-#endif // __cmCursesCacheEntryComposite_h
+#endif // cmCursesCacheEntryComposite_h

Source/CursesDialog/cmCursesDummyWidget.h

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesDummyWidget_h
+#ifndef cmCursesDummyWidget_h
-#define __cmCursesDummyWidget_h
+#define cmCursesDummyWidget_h
 
 #include "cmCursesWidget.h"
 
@@ -33,4 +33,4 @@ protected:
 
 };
 
-#endif // __cmCursesDummyWidget_h
+#endif // cmCursesDummyWidget_h

Source/CursesDialog/cmCursesFilePathWidget.h

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesFilePathWidget_h
+#ifndef cmCursesFilePathWidget_h
-#define __cmCursesFilePathWidget_h
+#define cmCursesFilePathWidget_h
 
 #include "cmCursesPathWidget.h"
 
@@ -25,4 +25,4 @@ protected:
 
 };
 
-#endif // __cmCursesFilePathWidget_h
+#endif // cmCursesFilePathWidget_h

Source/CursesDialog/cmCursesForm.h

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesForm_h
+#ifndef cmCursesForm_h
-#define __cmCursesForm_h
+#define cmCursesForm_h
 
 #include "../cmStandardIncludes.h"
 #include "cmCursesStandardIncludes.h"
@@ -73,4 +73,4 @@ protected:
   FORM* Form;
 };
 
-#endif // __cmCursesForm_h
+#endif // cmCursesForm_h

Source/CursesDialog/cmCursesLabelWidget.h

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesLabelWidget_h
+#ifndef cmCursesLabelWidget_h
-#define __cmCursesLabelWidget_h
+#define cmCursesLabelWidget_h
 
 #include "cmCursesWidget.h"
 #include "cmCursesStandardIncludes.h"
@@ -35,4 +35,4 @@ protected:
   void operator=(const cmCursesLabelWidget&);
 };
 
-#endif // __cmCursesLabelWidget_h
+#endif // cmCursesLabelWidget_h

Source/CursesDialog/cmCursesLongMessageForm.h

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesLongMessageForm_h
+#ifndef cmCursesLongMessageForm_h
-#define __cmCursesLongMessageForm_h
+#define cmCursesLongMessageForm_h
 
 #include "../cmStandardIncludes.h"
 #include "cmCursesForm.h"
@@ -55,4 +55,4 @@ protected:
 
 };
 
-#endif // __cmCursesLongMessageForm_h
+#endif // cmCursesLongMessageForm_h

Source/CursesDialog/cmCursesMainForm.h

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesMainForm_h
+#ifndef cmCursesMainForm_h
-#define __cmCursesMainForm_h
+#define cmCursesMainForm_h
 
 #include "../cmStandardIncludes.h"
 #include "cmCursesForm.h"
@@ -161,4 +161,4 @@ protected:
   bool SearchMode;
 };
 
-#endif // __cmCursesMainForm_h
+#endif // cmCursesMainForm_h

Source/CursesDialog/cmCursesOptionsWidget.h

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesOptionsWidget_h
+#ifndef cmCursesOptionsWidget_h
-#define __cmCursesOptionsWidget_h
+#define cmCursesOptionsWidget_h
 
 #include "cmCursesWidget.h"
 class cmCursesMainForm;
@@ -36,4 +36,4 @@ protected:
   std::vector<std::string>::size_type CurrentOption;
 };
 
-#endif // __cmCursesOptionsWidget_h
+#endif // cmCursesOptionsWidget_h

Source/CursesDialog/cmCursesPathWidget.h

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesPathWidget_h
+#ifndef cmCursesPathWidget_h
-#define __cmCursesPathWidget_h
+#define cmCursesPathWidget_h
 
 #include "cmCursesStringWidget.h"
 
@@ -37,4 +37,4 @@ protected:
   std::string::size_type CurrentIndex;
 };
 
-#endif // __cmCursesPathWidget_h
+#endif // cmCursesPathWidget_h

Source/CursesDialog/cmCursesStringWidget.h

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesStringWidget_h
+#ifndef cmCursesStringWidget_h
-#define __cmCursesStringWidget_h
+#define cmCursesStringWidget_h
 
 #include "cmCursesWidget.h"
 
@@ -73,4 +73,4 @@ protected:
   bool Done;
 };
 
-#endif // __cmCursesStringWidget_h
+#endif // cmCursesStringWidget_h

Source/CursesDialog/cmCursesWidget.h

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmCursesWidget_h
+#ifndef cmCursesWidget_h
-#define __cmCursesWidget_h
+#define cmCursesWidget_h
 
 #include "../cmCacheManager.h"
 #include "cmCursesStandardIncludes.h"
@@ -84,4 +84,4 @@ protected:
   int Page;
 };
 
-#endif // __cmCursesWidget_h
+#endif // cmCursesWidget_h

Source/QtDialog/QCMake.h

@@ -10,8 +10,8 @@
   See the License for more information.
 ============================================================================*/
 
-#ifndef __QCMake_h
+#ifndef QCMake_h
-#define __QCMake_h
+#define QCMake_h
 #ifdef _MSC_VER
 #pragma warning ( disable : 4127 )
 #pragma warning ( disable : 4512 )
@@ -152,5 +152,5 @@ protected:
   QAtomicInt InterruptFlag;
 };
 
-#endif // __QCMake_h
+#endif // QCMake_h
 

Source/cmDynamicLoader.h

@@ -15,8 +15,8 @@
 // libraries into a process.
 
 
-#ifndef __cmDynamicLoader_h
+#ifndef cmDynamicLoader_h
-#define __cmDynamicLoader_h
+#define cmDynamicLoader_h
 
 #include "cmStandardIncludes.h"
 

Utilities/cmThirdParty.h.in

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmThirdParty_h
+#ifndef cmThirdParty_h
-#define __cmThirdParty_h
+#define cmThirdParty_h
 
 /* Whether CMake is using its own utility libraries.  */
 #cmakedefine CMAKE_USE_SYSTEM_CURL

Utilities/cm_bzlib.h

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cm_bzlib_h
+#ifndef cm_bzlib_h
-#define __cm_bzlib_h
+#define cm_bzlib_h
 
 /* Use the bzip2 library configured for CMake.  */
 #include "cmThirdParty.h"

Utilities/cm_curl.h

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cm_curl_h
+#ifndef cm_curl_h
-#define __cm_curl_h
+#define cm_curl_h
 
 /* Use the curl library configured for CMake.  */
 #include "cmThirdParty.h"

Utilities/cm_expat.h

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cm_expat_h
+#ifndef cm_expat_h
-#define __cm_expat_h
+#define cm_expat_h
 
 /* Use the expat library configured for CMake.  */
 #include "cmThirdParty.h"

Utilities/cm_libarchive.h

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cm_libarchive_h
+#ifndef cm_libarchive_h
-#define __cm_libarchive_h
+#define cm_libarchive_h
 
 /* Use the libarchive configured for CMake.  */
 #include "cmThirdParty.h"

Utilities/cm_lzma.h

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cm_lzma_h
+#ifndef cm_lzma_h
-#define __cm_lzma_h
+#define cm_lzma_h
 
 /* Use the liblzma configured for CMake.  */
 #include "cmThirdParty.h"

Utilities/cm_xmlrpc.h

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cm_xmlrpc_h
+#ifndef cm_xmlrpc_h
-#define __cm_xmlrpc_h
+#define cm_xmlrpc_h
 
 /* Use the xmlrpc library configured for CMake.  */
 #include "cmThirdParty.h"

Utilities/cm_zlib.h

@@ -9,8 +9,8 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cm_zlib_h
+#ifndef cm_zlib_h
-#define __cm_zlib_h
+#define cm_zlib_h
 
 /* Use the zlib library configured for CMake.  */
 #include "cmThirdParty.h"

Utilities/cmcompress/cmcompress.h

@@ -35,8 +35,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef __cmcompress__h_
+#ifndef cmcompress__h_
-#define __cmcompress__h_
+#define cmcompress__h_
 
 #include <stdio.h>
 
@@ -192,4 +192,4 @@ extern "C"
 #endif
 
 
-#endif /* __cmcompress__h_ */
+#endif /* cmcompress__h_ */