Removed '_' symbols in include guards

which are violating DCL51-CPP rule, closing #46
This commit is contained in:
Nikolaj Schlej 2016-04-09 12:47:19 +02:00
parent 1dddafd4b3
commit 80a2d57f62
28 changed files with 103 additions and 98 deletions

View File

@ -11,8 +11,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
*/ */
#ifndef __FFSDUMPER_H__ #ifndef FFSDUMPER_H
#define __FFSDUMPER_H__ #define FFSDUMPER_H
#include <QObject> #include <QObject>
#include <QDir> #include <QDir>
@ -38,4 +38,4 @@ private:
bool dumped; bool dumped;
}; };
#endif #endif // FFSDUMPER_H

View File

@ -11,8 +11,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
*/ */
#ifndef __UEFIFIND_H__ #ifndef UEFIFIND_H
#define __UEFIFIND_H__ #define UEFIFIND_H
#include <set> #include <set>
@ -47,4 +47,4 @@ private:
bool initDone; bool initDone;
}; };
#endif #endif // UEFIFIND_H

View File

@ -11,8 +11,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
*/ */
#ifndef __FFSFINDER_H__ #ifndef FFSFINDER_H
#define __FFSFINDER_H__ #define FFSFINDER_H
#include <vector> #include <vector>
@ -42,7 +42,7 @@ private:
const TreeModel* model; const TreeModel* model;
std::vector<std::pair<QString, QModelIndex> > messagesVector; std::vector<std::pair<QString, QModelIndex> > messagesVector;
void msg(const QString & message, const QModelIndex &index = QModelIndex()); void msg(const QString & message, const QModelIndex &index = QModelIndex());
}; };
#endif #endif // FFSFINDER_H

View File

@ -11,8 +11,8 @@
*/ */
#ifndef __GUIDLINEEDIT_H__ #ifndef GUIDLINEEDIT_H
#define __GUIDLINEEDIT_H__ #define GUIDLINEEDIT_H
#include <QLineEdit> #include <QLineEdit>
#include <QKeyEvent> #include <QKeyEvent>
@ -33,4 +33,4 @@ protected:
}; };
#endif #endif // GUIDLINEEDIT_H

View File

@ -11,8 +11,8 @@
*/ */
#ifndef __MESSAGELISTITEM_H__ #ifndef MESSAGELISTITEM_H
#define __MESSAGELISTITEM_H__ #define MESSAGELISTITEM_H
#include <QModelIndex> #include <QModelIndex>
#include <QListWidgetItem> #include <QListWidgetItem>
@ -34,4 +34,4 @@ private:
QModelIndex itemIndex; QModelIndex itemIndex;
}; };
#endif #endif // MESSAGELISTITEM_H

View File

@ -11,8 +11,8 @@
*/ */
#ifndef __SEARCHDIALOG_H__ #ifndef SEARCHDIALOG_H
#define __SEARCHDIALOG_H__ #define SEARCHDIALOG_H
#include <QDialog> #include <QDialog>
#include <QRegExpValidator> #include <QRegExpValidator>
@ -35,4 +35,4 @@ private:
QRegExpValidator guidValidator; QRegExpValidator guidValidator;
}; };
#endif #endif // SEARCHDIALOG_H

View File

@ -11,8 +11,8 @@
*/ */
#ifndef __UEFITOOL_H__ #ifndef UEFITOOL_H
#define __UEFITOOL_H__ #define UEFITOOL_H
#include <QMainWindow> #include <QMainWindow>
#include <QByteArray> #include <QByteArray>
@ -128,4 +128,4 @@ private:
void showBuilderMessages(); void showBuilderMessages();
}; };
#endif #endif // UEFITOOL_H

View File

@ -11,8 +11,8 @@
*/ */
#ifndef __LZMACOMPRESS_H__ #ifndef LZMACOMPRESS_H
#define __LZMACOMPRESS_H__ #define LZMACOMPRESS_H
#include "SDK/C/Types.h" #include "SDK/C/Types.h"
#include "../basetypes.h" #include "../basetypes.h"
@ -36,4 +36,5 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif
#endif // LZMACOMPRESS_H

View File

@ -11,8 +11,8 @@
*/ */
#ifndef __LZMADECOMPRESS_H__ #ifndef LZMADECOMPRESS_H
#define __LZMADECOMPRESS_H__ #define LZMADECOMPRESS_H
#include "../basetypes.h" #include "../basetypes.h"
#include "SDK/C/LzmaDec.h" #include "SDK/C/LzmaDec.h"
@ -95,4 +95,5 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif
#endif // LZMADECOMPRESS_H

View File

@ -20,8 +20,8 @@ Header file for compression routine.
*/ */
#ifndef __EFITIANOCOMPRESS_H__ #ifndef EFITIANOCOMPRESS_H
#define __EFITIANOCOMPRESS_H__ #define EFITIANOCOMPRESS_H
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@ -115,4 +115,4 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif // EFITIANOCOMPRESS_H

View File

@ -21,8 +21,8 @@ Providing both EFI and Tiano decompress algorithms.
--*/ --*/
#ifndef __EFITIANODECOMPRESS_H__ #ifndef EFITIANODECOMPRESS_H
#define __EFITIANODECOMPRESS_H__ #define EFITIANODECOMPRESS_H
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@ -135,4 +135,4 @@ EFI_INVALID_PARAMETER - The source data is corrupted
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif // EFITIANODECOMPRESS_H

View File

@ -11,8 +11,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
*/ */
#ifndef __BASETYPES_H__ #ifndef BASETYPES_H
#define __BASETYPES_H__ #define BASETYPES_H
#include <stdarg.h> #include <stdarg.h>
#include <stdint.h> #include <stdint.h>
@ -166,5 +166,4 @@ UINT8: 8;
#define hexarg(X) arg(QString("%1").arg((X),0,16).toUpper()) #define hexarg(X) arg(QString("%1").arg((X),0,16).toUpper())
#define hexarg2(X, Y) arg(QString("%1").arg((X),(Y),16,QLatin1Char('0')).toUpper()) #define hexarg2(X, Y) arg(QString("%1").arg((X),(Y),16,QLatin1Char('0')).toUpper())
#endif // BASETYPES_H
#endif

View File

@ -10,8 +10,8 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
*/ */
#ifndef __DESCRIPTOR_H__ #ifndef DESCRIPTOR_H
#define __DESCRIPTOR_H__ #define DESCRIPTOR_H
#include "basetypes.h" #include "basetypes.h"
@ -200,4 +200,5 @@ extern const UINT8* calculateAddress16(const UINT8* baseAddress, const UINT16 ba
extern UINT32 calculateRegionOffset(const UINT16 base); extern UINT32 calculateRegionOffset(const UINT16 base);
// Calculate size of region using it's base and limit // Calculate size of region using it's base and limit
extern UINT32 calculateRegionSize(const UINT16 base, const UINT16 limit); extern UINT32 calculateRegionSize(const UINT16 base, const UINT16 limit);
#endif
#endif // DESCRIPTOR_H

View File

@ -10,8 +10,8 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
*/ */
#ifndef __FFS_H__ #ifndef FFS_H
#define __FFS_H__ #define FFS_H
#include <vector> #include <vector>
@ -591,4 +591,4 @@ typedef EFI_COMMON_SECTION_HEADER2 EFI_USER_INTERFACE_SECTION2;
// Restore previous packing rules // Restore previous packing rules
#pragma pack(pop) #pragma pack(pop)
#endif #endif // FFS_H

View File

@ -11,8 +11,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
*/ */
#ifndef __FFSBUILDER_H__ #ifndef FFSBUILDER_H
#define __FFSBUILDER_H__ #define FFSBUILDER_H
#include <vector> #include <vector>
@ -58,4 +58,4 @@ private:
STATUS erase(const QModelIndex & index, QByteArray & erased); STATUS erase(const QModelIndex & index, QByteArray & erased);
}; };
#endif #endif // FFSBUILDER_H

View File

@ -11,8 +11,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
*/ */
#ifndef __FFSOPS_H__ #ifndef FFSOPS_H
#define __FFSOPS_H__ #define FFSOPS_H
#include <vector> #include <vector>
@ -48,4 +48,4 @@ private:
void msg(const QString & message, const QModelIndex &index = QModelIndex()); void msg(const QString & message, const QModelIndex &index = QModelIndex());
}; };
#endif #endif // FFSOPS_H

View File

@ -10,8 +10,8 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
*/ */
#ifndef __FFSPARSER_H__ #ifndef FFSPARSER_H
#define __FFSPARSER_H__ #define FFSPARSER_H
#include <vector> #include <vector>
@ -121,4 +121,4 @@ private:
void msg(const QString & message, const QModelIndex &index = QModelIndex()); void msg(const QString & message, const QModelIndex &index = QModelIndex());
}; };
#endif #endif // FFSPARSER_H

View File

@ -10,14 +10,14 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
*/ */
#ifndef __FIT_H__ #ifndef FIT_H
#define __FIT_H__ #define FIT_H
#include <QByteArray> #include <QByteArray>
#include "basetypes.h" #include "basetypes.h"
// Make sure we use right packing rules // Make sure we use right packing rules
#pragma pack(push,1) #pragma pack(push, 1)
// Memory address of a pointer to FIT, 40h back from the end of flash chip // Memory address of a pointer to FIT, 40h back from the end of flash chip
#define FIT_POINTER_OFFSET 0x40 #define FIT_POINTER_OFFSET 0x40
@ -63,4 +63,4 @@ typedef struct _INTEL_MICROCODE_HEADER {
#pragma pack(pop) #pragma pack(pop)
#endif #endif // FIT_H

View File

@ -10,8 +10,8 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
*/ */
#ifndef __FITPARSER_H__ #ifndef FITPARSER_H
#define __FITPARSER_H__ #define FITPARSER_H
#include <vector> #include <vector>
@ -56,4 +56,4 @@ private:
void msg(const QString & message, const QModelIndex &index = QModelIndex()); void msg(const QString & message, const QModelIndex &index = QModelIndex());
}; };
#endif #endif // FITPARSER_H

View File

@ -10,13 +10,13 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
*/ */
#ifndef __GBE_H__ #ifndef GBE_H
#define __GBE_H__ #define GBE_H
#include "basetypes.h" #include "basetypes.h"
// Make sure we use right packing rules // Make sure we use right packing rules
#pragma pack(push,1) #pragma pack(push, 1)
typedef struct _GBE_MAC_ADDRESS { typedef struct _GBE_MAC_ADDRESS {
UINT8 vendor[3]; UINT8 vendor[3];
@ -33,4 +33,5 @@ typedef struct _GBE_VERSION {
// Restore previous packing rules // Restore previous packing rules
#pragma pack(pop) #pragma pack(pop)
#endif
#endif // GBE_H

View File

@ -10,13 +10,13 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
*/ */
#ifndef __ME_H__ #ifndef ME_H
#define __ME_H__ #define ME_H
#include "basetypes.h" #include "basetypes.h"
// Make sure we use right packing rules // Make sure we use right packing rules
#pragma pack(push,1) #pragma pack(push, 1)
const QByteArray ME_VERSION_SIGNATURE("\x24\x4D\x41\x4E", 4); //$MAN const QByteArray ME_VERSION_SIGNATURE("\x24\x4D\x41\x4E", 4); //$MAN
const QByteArray ME_VERSION_SIGNATURE2("\x24\x4D\x4E\x32", 4); //$MN2 const QByteArray ME_VERSION_SIGNATURE2("\x24\x4D\x4E\x32", 4); //$MN2
@ -32,4 +32,5 @@ typedef struct _ME_VERSION {
// Restore previous packing rules // Restore previous packing rules
#pragma pack(pop) #pragma pack(pop)
#endif
#endif // ME_H

View File

@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
*/ */
#ifndef __NVRAM_H__ #ifndef NVRAM_H
#define __NVRAM_H__ #define NVRAM_H
#include <QByteArray> #include <QByteArray>
#include <QString> #include <QString>
@ -36,7 +36,7 @@ extern QString nvarAttributesToQString(const UINT8 attributes);
extern QString efiTimeToQString(const EFI_TIME & time); extern QString efiTimeToQString(const EFI_TIME & time);
// Make sure we use right packing rules // Make sure we use right packing rules
#pragma pack(push,1) #pragma pack(push, 1)
// Variable header // Variable header
typedef struct _NVAR_VARIABLE_HEADER { typedef struct _NVAR_VARIABLE_HEADER {
@ -263,4 +263,5 @@ typedef struct _EVSA_DATA_ENTRY {
// Restore previous packing rules // Restore previous packing rules
#pragma pack(pop) #pragma pack(pop)
#endif
#endif // NVRAM_H

View File

@ -14,8 +14,8 @@ routines without the need of backward traversal
*/ */
#ifndef __PARSINGDATA_H__ #ifndef PARSINGDATA_H
#define __PARSINGDATA_H__ #define PARSINGDATA_H
#include "basetypes.h" #include "basetypes.h"
@ -96,6 +96,7 @@ typedef struct _NVRAM_PARSING_DATA {
//}; //};
} NVRAM_PARSING_DATA; } NVRAM_PARSING_DATA;
// TODO: add more NVRAM-related PD
typedef struct _PARSING_DATA { typedef struct _PARSING_DATA {
UINT8 emptyByte; UINT8 emptyByte;
@ -114,4 +115,4 @@ typedef struct _PARSING_DATA {
}; };
} PARSING_DATA; } PARSING_DATA;
#endif #endif // NVRAM_H

View File

@ -13,18 +13,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
*/ */
#ifndef __PE_IMAGE_H__ #ifndef PEIMAGE_H
#define __PE_IMAGE_H__ #define PEIMAGE_H
#include <QString> #include <QString>
#include "basetypes.h" #include "basetypes.h"
// Make sure we use right packing rules
#pragma pack(push,1)
extern QString machineTypeToQString(UINT16 machineType); extern QString machineTypeToQString(UINT16 machineType);
// Make sure we use right packing rules
#pragma pack(push, 1)
// //
// PE32+ Subsystem type for EFI images // PE32+ Subsystem type for EFI images
// //
@ -724,4 +723,4 @@ typedef struct {
// Restore previous packing rules // Restore previous packing rules
#pragma pack(pop) #pragma pack(pop)
#endif #endif // PEIMAGE_H

View File

@ -11,8 +11,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
*/ */
#ifndef __TREEITEM_H__ #ifndef TREEITEM_H
#define __TREEITEM_H__ #define TREEITEM_H
#include <QByteArray> #include <QByteArray>
#include <QList> #include <QList>
@ -96,4 +96,4 @@ private:
TreeItem* parentItem; TreeItem* parentItem;
}; };
#endif #endif // TREEITEM_H

View File

@ -11,8 +11,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
*/ */
#ifndef __TREEMODEL_H__ #ifndef TREEMODEL_H
#define __TREEMODEL_H__ #define TREEMODEL_H
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QModelIndex> #include <QModelIndex>
@ -81,4 +81,4 @@ private:
TreeItem *rootItem; TreeItem *rootItem;
}; };
#endif #endif // TREEMODEL_H

View File

@ -11,8 +11,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
*/ */
#ifndef __TYPES_H__ #ifndef TYPES_H
#define __TYPES_H__ #define TYPES_H
#include "basetypes.h" #include "basetypes.h"
@ -125,4 +125,4 @@ extern QString itemSubtypeToQString(const UINT8 type, const UINT8 subtype);
extern QString compressionTypeToQString(const UINT8 algorithm); extern QString compressionTypeToQString(const UINT8 algorithm);
extern QString regionTypeToQString(const UINT8 type); extern QString regionTypeToQString(const UINT8 type);
#endif #endif // TYPES_H

View File

@ -11,8 +11,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
*/ */
#ifndef __UTILITY_H__ #ifndef UTILITY_H
#define __UTILITY_H__ #define UTILITY_H
#include <QString> #include <QString>
#include <QModelIndex> #include <QModelIndex>
@ -43,4 +43,4 @@ extern UINT8 calculateChecksum8(const UINT8* buffer, UINT32 bufferSize);
// 16bit checksum calculation routine // 16bit checksum calculation routine
extern UINT16 calculateChecksum16(const UINT16* buffer, UINT32 bufferSize); extern UINT16 calculateChecksum16(const UINT16* buffer, UINT32 bufferSize);
#endif #endif // UTILITY_H