fixed headers in cpp/hpp, added script to validate them

FarGroup · Aug 22, 2016 · c164f3f · c164f3f
1 parent ad8b655
commit c164f3f
Show file tree

Hide file tree

Showing 78 changed files with 466 additions and 163 deletions.
diff --git a/far/DlgBuilder.hpp b/far/DlgBuilder.hpp
@@ -2,19 +2,11 @@
 #define DLGBUILDER_HPP_E8B6F5CA_37A9_403A_A3F0_9ED7271B2BA7
 #pragma once
 
-#ifndef FAR_USE_INTERNALS
-#define FAR_USE_INTERNALS
-#endif // END FAR_USE_INTERNALS
-#ifndef __cplusplus
-#error C++ only
-#endif
-
 /*
-  DlgBuilder.hpp
+DlgBuilder.hpp
 
-  Dynamic construction of dialogs for FAR Manager <%VERSION%>
+Dynamic construction of dialogs for FAR Manager <%VERSION%>
 */
-
 /*
 Copyright © 2009 Far Group
 All rights reserved.
@@ -40,8 +32,20 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+EXCEPTION:
+Far Manager plugins that use this header file can be distributed under any
+other possible license with no implications from the above license on them.
 */
 
+#ifndef FAR_USE_INTERNALS
+#define FAR_USE_INTERNALS
+#endif // END FAR_USE_INTERNALS
+
+#ifndef __cplusplus
+#error C++ only
+#endif
+
 // Элемент выпадающего списка в диалоге.
 struct DialogBuilderListItem
 {

diff --git a/far/PluginA.cpp b/far/PluginA.cpp
@@ -1,4 +1,7 @@
 /*
+PluginA.cpp
+*/
+/*
 Copyright © 1996 Eugene Roshal
 Copyright © 2000 Far Group
 All rights reserved.

diff --git a/far/PluginA.hpp b/far/PluginA.hpp
@@ -2,6 +2,9 @@
 #define PLUGINA_HPP_174AA538_EA2A_43CC_B242_146456B477DB
 #pragma once
 
+/*
+PluginA.hpp
+*/
 /*
 Copyright © 1996 Eugene Roshal
 Copyright © 2000 Far Group

diff --git a/far/RegExp.hpp b/far/RegExp.hpp
@@ -1,6 +1,7 @@
 #ifndef REGEXP_HPP_18B41BD7_69F8_461A_8A81_069B447D5554
 #define REGEXP_HPP_18B41BD7_69F8_461A_8A81_069B447D5554
 #pragma once
+
 /*
 RegExp.hpp
 

diff --git a/far/TaskBar.hpp b/far/TaskBar.hpp
@@ -1,7 +1,6 @@
 #ifndef TASKBAR_HPP_2522B9DF_D677_4AA9_8777_B5A1F588D4C1
 #define TASKBAR_HPP_2522B9DF_D677_4AA9_8777_B5A1F588D4C1
 #pragma once
-#include "farwinapi.hpp"
 
 /*
 TaskBar.hpp
@@ -35,6 +34,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include "farwinapi.hpp"
+
 class taskbar: noncopyable
 {
 public:

diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,9 @@
+drkns 22.08.2016 11:43:23 +0200
+
+1. Приведены в порядок шапки во всех cpp/hpp.
+
+2. Добавлен скрипт для валидации п. 1.
+
 drkns 20.08.2016 14:01:57 +0200 - build 4764
 
 1. Уточнение 4757.1.

diff --git a/far/codepage_selection.cpp b/far/codepage_selection.cpp
@@ -1,5 +1,5 @@
 /*
-codepage_selection.hpp
+codepage_selection.cpp
 */
 /*
 Copyright © 1996 Eugene Roshal
@@ -10,12 +10,12 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
+   notice, this list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
 3. The name of the authors may not be used to endorse or promote products
-derived from this software without specific prior written permission.
+   derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

diff --git a/far/codepage_selection.hpp b/far/codepage_selection.hpp
@@ -14,12 +14,12 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
+   notice, this list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
 3. The name of the authors may not be used to endorse or promote products
-derived from this software without specific prior written permission.
+   derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

diff --git a/far/colormix.hpp b/far/colormix.hpp
@@ -34,7 +34,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "colors.hpp"
+#include "farcolor.hpp"
 
 namespace colors
 {

diff --git a/far/common/algorithm.hpp b/far/common/algorithm.hpp
@@ -1,5 +1,4 @@
-
-#ifndef ALGORITHM_HPP_BBD588C0_4752_46B2_AAB9_65450622FFF0
+#ifndef ALGORITHM_HPP_BBD588C0_4752_46B2_AAB9_65450622FFF0
 #define ALGORITHM_HPP_BBD588C0_4752_46B2_AAB9_65450622FFF0
 #pragma once
 

diff --git a/far/common/blob_view.hpp b/far/common/blob_view.hpp
@@ -1,24 +1,24 @@
-#ifndef BLOB_VIEW_HPP_3707377A_7C4B_4B2E_89EC_6411A1988FB3
+#ifndef BLOB_VIEW_HPP_3707377A_7C4B_4B2E_89EC_6411A1988FB3
 #define BLOB_VIEW_HPP_3707377A_7C4B_4B2E_89EC_6411A1988FB3
 #pragma once
 
 /*
 blob_view.hpp
 */
 /*
-Copyright © 2016 Far Group
+Copyright © 2016 Far Group
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
+   notice, this list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
 3. The name of the authors may not be used to endorse or promote products
-derived from this software without specific prior written permission.
+   derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

diff --git a/far/common/compiler.hpp b/far/common/compiler.hpp
@@ -15,12 +15,12 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
+   notice, this list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
 3. The name of the authors may not be used to endorse or promote products
-derived from this software without specific prior written permission.
+   derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

diff --git a/far/common/exception.hpp b/far/common/exception.hpp
@@ -1,24 +1,24 @@
-#ifndef EXCEPTION_HPP_2CD5B7D1_D39C_4CAF_858A_62496C9221DF
+#ifndef EXCEPTION_HPP_2CD5B7D1_D39C_4CAF_858A_62496C9221DF
 #define EXCEPTION_HPP_2CD5B7D1_D39C_4CAF_858A_62496C9221DF
 #pragma once
 
 /*
 exception.hpp
 */
 /*
-Copyright © 2016 Far Group
+Copyright © 2016 Far Group
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
+   notice, this list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
 3. The name of the authors may not be used to endorse or promote products
-derived from this software without specific prior written permission.
+   derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

diff --git a/far/common/rel_ops.hpp b/far/common/rel_ops.hpp
@@ -13,12 +13,12 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
+   notice, this list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
 3. The name of the authors may not be used to endorse or promote products
-derived from this software without specific prior written permission.
+   derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

diff --git a/far/common/string_literal.hpp b/far/common/string_literal.hpp
@@ -1,25 +1,24 @@
-
-#ifndef STRING_LITERAL_HPP_102EA19D_CDD6_433E_ACD2_6D6E4022C273
+#ifndef STRING_LITERAL_HPP_102EA19D_CDD6_433E_ACD2_6D6E4022C273
 #define STRING_LITERAL_HPP_102EA19D_CDD6_433E_ACD2_6D6E4022C273
 #pragma once
 
 /*
 string_literal.hpp
 */
 /*
-Copyright © 2016 Far Group
+Copyright © 2016 Far Group
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
+   notice, this list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
 3. The name of the authors may not be used to endorse or promote products
-derived from this software without specific prior written permission.
+   derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

diff --git a/far/common/zip_view.hpp b/far/common/zip_view.hpp
@@ -13,12 +13,12 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
+   notice, this list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
 3. The name of the authors may not be used to endorse or promote products
-derived from this software without specific prior written permission.
+   derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

diff --git a/far/console.cpp b/far/console.cpp
@@ -1,5 +1,5 @@
 /*
-Console.cpp
+console.cpp
 
 Console functions
 */

diff --git a/far/copy_progress.cpp b/far/copy_progress.cpp
@@ -9,12 +9,12 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
+   notice, this list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
 3. The name of the authors may not be used to endorse or promote products
-derived from this software without specific prior written permission.
+   derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

diff --git a/far/copy_progress.hpp b/far/copy_progress.hpp
@@ -13,12 +13,12 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
+   notice, this list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
 3. The name of the authors may not be used to endorse or promote products
-derived from this software without specific prior written permission.
+   derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

diff --git a/far/disable_warnings_in_std_begin.hpp b/far/disable_warnings_in_std_begin.hpp
@@ -1,4 +1,8 @@
-/*
+// validator: no-include-guards
+/*
+disable_warnings_in_std_begin.hpp
+*/
+/*
 Copyright © 2015 Far Group
 All rights reserved.
 

diff --git a/far/disable_warnings_in_std_end.hpp b/far/disable_warnings_in_std_end.hpp
@@ -1,4 +1,8 @@
-/*
+// validator: no-include-guards
+/*
+disable_warnings_in_std_end.hpp
+*/
+/*
 Copyright © 2015 Far Group
 All rights reserved.
 

diff --git a/far/disabled_warnings.hpp b/far/disabled_warnings.hpp
@@ -1,4 +1,8 @@
-/*
+// validator: no-include-guards
+/*
+disabled_warnings.hpp
+*/
+/*
 Copyright © 2015 Far Group
 All rights reserved.
 

diff --git a/far/diskmenu.hpp b/far/diskmenu.hpp
@@ -3,7 +3,7 @@
 #pragma once
 
 /*
-diskmenu.cpp
+diskmenu.hpp
 */
 /*
 Copyright © 2016 Far Group

diff --git a/far/editcontrol.hpp b/far/editcontrol.hpp
@@ -37,7 +37,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "edit.hpp"
-#include "colors.hpp"
+#include "farcolor.hpp"
 
 class History;
 class VMenu2;

diff --git a/far/elevation.cpp b/far/elevation.cpp
@@ -37,7 +37,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "config.hpp"
 #include "language.hpp"
 #include "dialog.hpp"
-#include "colors.hpp"
+#include "farcolor.hpp"
 #include "colormix.hpp"
 #include "lasterror.hpp"
 #include "privilege.hpp"