Fixed #5007 (Same include guard naming)

This commit is contained in:
Ettl Martin 2013-09-04 20:59:49 +02:00 committed by Daniel Marjamäki
parent 43b40b7465
commit 9ab6655d85
41 changed files with 120 additions and 107 deletions

View File

@ -16,8 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
//---------------------------------------------------------------------------
#ifndef checkH
#define checkH
//---------------------------------------------------------------------------
#include "config.h"
#include "token.h"
@ -154,5 +156,5 @@ inline Check::Check(const std::string &aname)
}
/// @}
#endif
//---------------------------------------------------------------------------
#endif // checkH

View File

@ -87,4 +87,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // check64bitH

View File

@ -18,8 +18,8 @@
//---------------------------------------------------------------------------
#ifndef CheckAssertH
#define CheckAssertH
#ifndef checkassertH
#define checkassertH
//---------------------------------------------------------------------------
#include "config.h"
@ -73,4 +73,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checkassertH

View File

@ -106,4 +106,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checkassignifH

View File

@ -18,8 +18,8 @@
//---------------------------------------------------------------------------
#ifndef CheckAutoVariablesH
#define CheckAutoVariablesH
#ifndef checkautovariablesH
#define checkautovariablesH
//---------------------------------------------------------------------------
#include "config.h"
@ -113,4 +113,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checkautovariablesH

View File

@ -18,8 +18,8 @@
//---------------------------------------------------------------------------
#ifndef CheckBoolH
#define CheckBoolH
#ifndef checkboolH
#define checkboolH
//---------------------------------------------------------------------------
#include "config.h"
@ -131,4 +131,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checkboolH

View File

@ -18,8 +18,8 @@
//---------------------------------------------------------------------------
#ifndef CHECKBOOST_H
#define CHECKBOOST_H
#ifndef checkboostH
#define checkboostH
//---------------------------------------------------------------------------
#include "config.h"
@ -75,4 +75,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checkboostH

View File

@ -18,8 +18,8 @@
//---------------------------------------------------------------------------
#ifndef CheckBufferOverrunH
#define CheckBufferOverrunH
#ifndef checkbufferoverrunH
#define checkbufferoverrunH
//---------------------------------------------------------------------------
#include "config.h"
@ -268,4 +268,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checkbufferoverrunH

View File

@ -17,8 +17,8 @@
*/
//---------------------------------------------------------------------------
#ifndef CheckClassH
#define CheckClassH
#ifndef checkclassH
#define checkclassH
//---------------------------------------------------------------------------
#include "config.h"
@ -292,4 +292,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checkclassH

View File

@ -125,4 +125,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checkexceptionsafetyH

View File

@ -18,8 +18,8 @@
//---------------------------------------------------------------------------
#ifndef CHECKINTERNAL_H
#define CHECKINTERNAL_H
#ifndef checkinternalH
#define checkinternalH
//---------------------------------------------------------------------------
#include "check.h"
@ -100,4 +100,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checkinternalH

View File

@ -17,8 +17,8 @@
*/
//---------------------------------------------------------------------------
#ifndef CheckIOH
#define CheckIOH
#ifndef checkioH
#define checkioH
//---------------------------------------------------------------------------
#include "check.h"
@ -161,4 +161,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checkioH

View File

@ -127,4 +127,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checkleakautovarH

View File

@ -16,8 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
//---------------------------------------------------------------------------
#ifndef checkmemoryleakH
#define checkmemoryleakH
@ -470,4 +468,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checkmemoryleakH

View File

@ -16,10 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
//---------------------------------------------------------------------------
#ifndef CheckNonReentrantFunctionsH
#define CheckNonReentrantFunctionsH
#ifndef checknonreentrantfunctionsH
#define checknonreentrantfunctionsH
//---------------------------------------------------------------------------
#include "config.h"
@ -107,4 +106,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checknonreentrantfunctionsH

View File

@ -167,4 +167,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checknullpointerH

View File

@ -18,8 +18,8 @@
//---------------------------------------------------------------------------
#ifndef CheckObsoleteFunctionsH
#define CheckObsoleteFunctionsH
#ifndef checkobsoletefunctionsH
#define checkobsoletefunctionsH
//---------------------------------------------------------------------------
#include "config.h"
@ -146,4 +146,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checkobsoletefunctionsH

View File

@ -18,8 +18,8 @@
//---------------------------------------------------------------------------
#ifndef CheckOtherH
#define CheckOtherH
#ifndef checkotherH
#define checkotherH
//---------------------------------------------------------------------------
#include "config.h"
@ -467,4 +467,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checkotherH

View File

@ -18,8 +18,8 @@
//---------------------------------------------------------------------------
#ifndef CheckPostfixOperatorH
#define CheckPostfixOperatorH
#ifndef checkpostfixoperatorH
#define checkpostfixoperatorH
//---------------------------------------------------------------------------
#include "config.h"
@ -73,4 +73,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checkpostfixoperatorH

View File

@ -18,8 +18,8 @@
//---------------------------------------------------------------------------
#ifndef CheckSizeofH
#define CheckSizeofH
#ifndef checksizeofH
#define checksizeofH
//---------------------------------------------------------------------------
#include "config.h"
@ -132,4 +132,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checksizeofH

View File

@ -235,4 +235,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checkstlH

View File

@ -108,4 +108,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checkuninitvarH

View File

@ -92,4 +92,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checkunusedfunctionsH

View File

@ -16,10 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
//---------------------------------------------------------------------------
#ifndef CheckUnusedVarH
#define CheckUnusedVarH
#ifndef checkunusedvarH
#define checkunusedvarH
//---------------------------------------------------------------------------
#include <map>
@ -114,4 +113,4 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // checkunusedvarH

View File

@ -1,5 +1,5 @@
#ifndef CONFIG_H
#define CONFIG_H
#ifndef configH
#define configH
#ifdef _WIN32
# ifdef CPPCHECKLIB_EXPORT
@ -13,4 +13,4 @@
# define CPPCHECKLIB
#endif
#endif
#endif // configH

View File

@ -16,8 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CPPCHECK_H
#define CPPCHECK_H
//---------------------------------------------------------------------------
#ifndef cppcheckH
#define cppcheckH
//---------------------------------------------------------------------------
#include "config.h"
#include "settings.h"
@ -210,5 +212,5 @@ private:
};
/// @}
#endif // CPPCHECK_H
//---------------------------------------------------------------------------
#endif // cppcheckH

View File

@ -16,9 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
//---------------------------------------------------------------------------
#ifndef errorloggerH
#define errorloggerH
//---------------------------------------------------------------------------
#include <list>
#include <string>
@ -307,5 +308,5 @@ public:
};
/// @}
#endif
//---------------------------------------------------------------------------
#endif // errorloggerH

View File

@ -16,8 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
//---------------------------------------------------------------------------
#ifndef executionpathH
#define executionpathH
//---------------------------------------------------------------------------
#include <list>
#include "config.h"
@ -130,5 +132,5 @@ public:
void checkExecutionPaths(const SymbolDatabase *symbolDatabase, ExecutionPath *c);
#endif
//---------------------------------------------------------------------------
#endif // executionpathH

View File

@ -16,8 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
//---------------------------------------------------------------------------
#ifndef libraryH
#define libraryH
//---------------------------------------------------------------------------
#include "config.h"
#include <map>
@ -145,5 +147,5 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif // libraryH

View File

@ -16,9 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
//---------------------------------------------------------------------------
#ifndef mathlibH
#define mathlibH
//---------------------------------------------------------------------------
#include <string>
#include <sstream>
@ -72,5 +73,5 @@ public:
};
/// @}
#endif
//---------------------------------------------------------------------------
#endif // mathlibH

View File

@ -16,8 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PATH_H_INCLUDED
#define PATH_H_INCLUDED
//---------------------------------------------------------------------------
#ifndef pathH
#define pathH
//---------------------------------------------------------------------------
#include <string>
#include <vector>
@ -133,5 +135,5 @@ private:
};
/// @}
#endif // PATH_H_INCLUDED
//---------------------------------------------------------------------------
#endif // pathH

View File

@ -273,6 +273,5 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // preprocessorH

View File

@ -16,8 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
//---------------------------------------------------------------------------
#ifndef settingsH
#define settingsH
//---------------------------------------------------------------------------
#include <list>
#include <vector>
@ -241,5 +243,5 @@ public:
};
/// @}
#endif // SETTINGS_H
//---------------------------------------------------------------------------
#endif // settingsH

View File

@ -15,8 +15,11 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
//---------------------------------------------------------------------------
#ifndef standardsH
#define standardsH
//---------------------------------------------------------------------------
/// @addtogroup Core
/// @{
@ -41,5 +44,5 @@ struct Standards {
};
/// @}
//---------------------------------------------------------------------------
#endif // standardsH

View File

@ -15,9 +15,10 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef SUPPRESSIONS_H
#define SUPPRESSIONS_H
//---------------------------------------------------------------------------
#ifndef suppressionsH
#define suppressionsH
//---------------------------------------------------------------------------
#include <list>
#include <string>
@ -142,5 +143,5 @@ public:
};
/// @}
#endif // SUPPRESSIONS_H
//---------------------------------------------------------------------------
#endif // suppressionsH

View File

@ -17,8 +17,8 @@
*/
//---------------------------------------------------------------------------
#ifndef SymbolDatabaseH
#define SymbolDatabaseH
#ifndef symboldatabaseH
#define symboldatabaseH
//---------------------------------------------------------------------------
#include <string>
@ -758,5 +758,5 @@ private:
/** list for missing types */
std::list<Type> _blankTypes;
};
#endif
//---------------------------------------------------------------------------
#endif // symboldatabaseH

View File

@ -176,6 +176,5 @@ private:
};
/// @}
//---------------------------------------------------------------------------
#endif
#endif // templatesimplifierH

View File

@ -15,9 +15,10 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef TIMER_H
#define TIMER_H
//---------------------------------------------------------------------------
#ifndef timerH
#define timerH
//---------------------------------------------------------------------------
#include <string>
#include <map>
@ -80,5 +81,5 @@ private:
const unsigned int _showtimeMode;
bool _stopped;
};
#endif // TIMER_H
//---------------------------------------------------------------------------
#endif // timerH

View File

@ -16,8 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef TokenH
#define TokenH
//---------------------------------------------------------------------------
#ifndef tokenH
#define tokenH
//---------------------------------------------------------------------------
#include <string>
#include <vector>
@ -678,5 +680,5 @@ public:
};
/// @}
#endif // TokenH
//---------------------------------------------------------------------------
#endif // tokenH

View File

@ -16,7 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
//---------------------------------------------------------------------------
#ifndef tokenizeH
#define tokenizeH
@ -790,4 +789,4 @@ private:
/// @}
//---------------------------------------------------------------------------
#endif
#endif // tokenizeH

View File

@ -16,7 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
//---------------------------------------------------------------------------
#ifndef tokenlistH
#define tokenlistH
@ -130,4 +129,4 @@ private: /// private
/// @}
//---------------------------------------------------------------------------
#endif
#endif // tokenlistH