diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-01-17 15:46:23 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-02-07 11:41:06 +0100 |
commit | 71d2d8c89b148c5d9d970c98d6d3bf39ba5c785d (patch) | |
tree | 11643b28fdecef0c7fcfc5c5637c3a813b3dca6e | |
parent | 93cf624dd5ce4e03f168248996849e346128044c (diff) |
unify include guards
Change-Id: I3d3f4b7971a77ebec09f462214848d378c3ebf06
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r-- | src/app/application.h | 6 | ||||
-rw-r--r-- | src/jomlib/commandexecutor.h | 6 | ||||
-rw-r--r-- | src/jomlib/dependencygraph.h | 6 | ||||
-rw-r--r-- | src/jomlib/exception.h | 6 | ||||
-rw-r--r-- | src/jomlib/fastfileinfo.h | 6 | ||||
-rw-r--r-- | src/jomlib/filetime.h | 5 | ||||
-rw-r--r-- | src/jomlib/helperfunctions.h | 5 | ||||
-rw-r--r-- | src/jomlib/macrotable.h | 6 | ||||
-rw-r--r-- | src/jomlib/makefile.h | 6 | ||||
-rw-r--r-- | src/jomlib/makefilefactory.h | 6 | ||||
-rw-r--r-- | src/jomlib/makefilelinereader.h | 5 | ||||
-rw-r--r-- | src/jomlib/options.h | 6 | ||||
-rw-r--r-- | src/jomlib/parser.h | 6 | ||||
-rw-r--r-- | src/jomlib/preprocessor.h | 6 | ||||
-rw-r--r-- | src/jomlib/targetexecutor.h | 6 | ||||
-rw-r--r-- | tests/tests.h | 6 |
16 files changed, 78 insertions, 15 deletions
diff --git a/src/app/application.h b/src/app/application.h index 7730075..8bb6b26 100644 --- a/src/app/application.h +++ b/src/app/application.h @@ -17,7 +17,9 @@ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ****************************************************************************/ -#pragma once + +#ifndef APPLICATION_H +#define APPLICATION_H #include <QtCore/QCoreApplication> @@ -40,3 +42,5 @@ private: }; } // namespace NMakeFile + +#endif // APPLICATION_H diff --git a/src/jomlib/commandexecutor.h b/src/jomlib/commandexecutor.h index 093a0ae..61be592 100644 --- a/src/jomlib/commandexecutor.h +++ b/src/jomlib/commandexecutor.h @@ -17,7 +17,9 @@ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ****************************************************************************/ -#pragma once + +#ifndef COMMANDEXECUTOR_H +#define COMMANDEXECUTOR_H #include "makefile.h" #include "process.h" @@ -91,3 +93,5 @@ private: }; } // namespace NMakeFile + +#endif // COMMANDEXECUTOR_H diff --git a/src/jomlib/dependencygraph.h b/src/jomlib/dependencygraph.h index 9f52d40..0c7f862 100644 --- a/src/jomlib/dependencygraph.h +++ b/src/jomlib/dependencygraph.h @@ -17,7 +17,9 @@ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ****************************************************************************/ -#pragma once + +#ifndef DEPENDENCYGRAPH_H +#define DEPENDENCYGRAPH_H #include <QtCore/QHash> #include <QtCore/QSet> @@ -71,3 +73,5 @@ private: }; } // namespace NMakeFile + +#endif // DEPENDENCYGRAPH_H diff --git a/src/jomlib/exception.h b/src/jomlib/exception.h index eaf7f9d..9419baf 100644 --- a/src/jomlib/exception.h +++ b/src/jomlib/exception.h @@ -17,7 +17,9 @@ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ****************************************************************************/ -#pragma once + +#ifndef EXCEPTION_H +#define EXCEPTION_H #include <QString> @@ -50,3 +52,5 @@ protected: }; } // namespace NMakeFile + +#endif // EXCEPTION_H diff --git a/src/jomlib/fastfileinfo.h b/src/jomlib/fastfileinfo.h index 002c7a1..f84ab34 100644 --- a/src/jomlib/fastfileinfo.h +++ b/src/jomlib/fastfileinfo.h @@ -17,7 +17,9 @@ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ****************************************************************************/ -#pragma once + +#ifndef FASTFILEINFO_H +#define FASTFILEINFO_H #include "filetime.h" @@ -43,3 +45,5 @@ private: }; } // NMakeFile + +#endif // FASTFILEINFO_H diff --git a/src/jomlib/filetime.h b/src/jomlib/filetime.h index 3239a1a..b2149ba 100644 --- a/src/jomlib/filetime.h +++ b/src/jomlib/filetime.h @@ -18,6 +18,9 @@ ** ****************************************************************************/ +#ifndef FILETIME_H +#define FILETIME_H + #include <QtGlobal> #include <QString> @@ -56,3 +59,5 @@ private: }; } // namespace NMakeFile + +#endif // FILETIME_H diff --git a/src/jomlib/helperfunctions.h b/src/jomlib/helperfunctions.h index 60933a9..dbf630e 100644 --- a/src/jomlib/helperfunctions.h +++ b/src/jomlib/helperfunctions.h @@ -18,7 +18,8 @@ ** ****************************************************************************/ -#pragma once +#ifndef HELPERFUNCTIONS_H +#define HELPERFUNCTIONS_H #include <QtCore/QString> #include <QtCore/QStringList> @@ -71,3 +72,5 @@ QString trimLeft(const QString &s); QString qGetEnvironmentVariable(const wchar_t *lpName); bool qSetEnvironmentVariable(const QString &name, const QString &value); + +#endif // HELPERFUNCTIONS_H diff --git a/src/jomlib/macrotable.h b/src/jomlib/macrotable.h index 1efbbe7..efd2ef3 100644 --- a/src/jomlib/macrotable.h +++ b/src/jomlib/macrotable.h @@ -17,7 +17,9 @@ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ****************************************************************************/ -#pragma once + +#ifndef MACROTABLE_H +#define MACROTABLE_H #include "processenvironment.h" @@ -79,3 +81,5 @@ private: }; } // namespace NMakeFile + +#endif // MACROTABLE_H diff --git a/src/jomlib/makefile.h b/src/jomlib/makefile.h index 4d9ddc3..b4bf330 100644 --- a/src/jomlib/makefile.h +++ b/src/jomlib/makefile.h @@ -17,7 +17,9 @@ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ****************************************************************************/ -#pragma once + +#ifndef MAKEFILE_H +#define MAKEFILE_H #include "fastfileinfo.h" #include "macrotable.h" @@ -217,3 +219,5 @@ private: }; } // namespace NMakeFile + +#endif // MAKEFILE_H diff --git a/src/jomlib/makefilefactory.h b/src/jomlib/makefilefactory.h index b6e13b6..5d29107 100644 --- a/src/jomlib/makefilefactory.h +++ b/src/jomlib/makefilefactory.h @@ -17,7 +17,9 @@ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ****************************************************************************/ -#pragma once + +#ifndef MAKEFILEFACTORY_H +#define MAKEFILEFACTORY_H #include "processenvironment.h" #include <QtCore/QStringList> @@ -58,3 +60,5 @@ private: }; } // namespace NMakeFile + +#endif // MAKEFILEFACTORY_H diff --git a/src/jomlib/makefilelinereader.h b/src/jomlib/makefilelinereader.h index e5bf5a4..8b3aecd 100644 --- a/src/jomlib/makefilelinereader.h +++ b/src/jomlib/makefilelinereader.h @@ -18,7 +18,8 @@ ** ****************************************************************************/ -#pragma once +#ifndef MAKEFILELINEREADER_H +#define MAKEFILELINEREADER_H #include <QtCore/QFile> #include <QtCore/QTextStream> @@ -55,3 +56,5 @@ private: }; } // namespace NMakeFile + +#endif // MAKEFILELINEREADER_H diff --git a/src/jomlib/options.h b/src/jomlib/options.h index df95324..8ec4d06 100644 --- a/src/jomlib/options.h +++ b/src/jomlib/options.h @@ -17,7 +17,9 @@ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ****************************************************************************/ -#pragma once + +#ifndef OPTIONS_H +#define OPTIONS_H #include <QtCore/QStringList> #include <QtCore/QSharedPointer> @@ -77,3 +79,5 @@ public: extern GlobalOptions g_options; } // namespace NMakeFile + +#endif // OPTIONS_H diff --git a/src/jomlib/parser.h b/src/jomlib/parser.h index 5065066..042b439 100644 --- a/src/jomlib/parser.h +++ b/src/jomlib/parser.h @@ -17,7 +17,9 @@ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ****************************************************************************/ -#pragma once + +#ifndef PARSER_H +#define PARSER_H #include <QRegExp> #include <QHash> @@ -79,3 +81,5 @@ private: }; } // namespace NMakeFile + +#endif // PARSER_H diff --git a/src/jomlib/preprocessor.h b/src/jomlib/preprocessor.h index 7ebd276..0b4cd42 100644 --- a/src/jomlib/preprocessor.h +++ b/src/jomlib/preprocessor.h @@ -17,7 +17,9 @@ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ****************************************************************************/ -#pragma once + +#ifndef PREPROCESSOR_H +#define PREPROCESSOR_H #include <QRegExp> #include <QStack> @@ -92,3 +94,5 @@ private: }; } //namespace NMakeFile + +#endif // PREPROCESSOR_H diff --git a/src/jomlib/targetexecutor.h b/src/jomlib/targetexecutor.h index e9fe16c..e601a1e 100644 --- a/src/jomlib/targetexecutor.h +++ b/src/jomlib/targetexecutor.h @@ -17,7 +17,9 @@ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ****************************************************************************/ -#pragma once + +#ifndef TARGETEXECUTOR_H +#define TARGETEXECUTOR_H #include "makefile.h" #include <QEvent> @@ -68,3 +70,5 @@ private: }; } //namespace NMakeFile + +#endif // TARGETEXECUTOR_H diff --git a/tests/tests.h b/tests/tests.h index 636b376..6b1f10d 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -17,7 +17,9 @@ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ****************************************************************************/ -#pragma once + +#ifndef TESTS_H +#define TESTS_H #include <QtCore/QObject> #include <QtCore/QString> @@ -93,3 +95,5 @@ private: NMakeFile::MakefileFactory* m_makefileFactory; QProcess *m_jomProcess; }; + +#endif // TESTS_H |