Skip to content

Commit f740277

Browse files
committed
Fixed compile error in Linux
Include guard naming fix (names starting with underscore+capital letter are reserved in C++, so we should not use those) Codeblocks project file update
1 parent 364d806 commit f740277

7 files changed

Lines changed: 26 additions & 20 deletions

File tree

cppcheck.cbp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
<Unit filename="gui/projectfile.cpp" />
4848
<Unit filename="gui/projectfile.h" />
4949
<Unit filename="gui/qrc_gui.cpp" />
50+
<Unit filename="gui/report.cpp" />
51+
<Unit filename="gui/report.h" />
5052
<Unit filename="gui/resultstree.cpp" />
5153
<Unit filename="gui/resultstree.h" />
5254
<Unit filename="gui/resultsview.cpp" />
@@ -58,6 +60,10 @@
5860
<Unit filename="gui/threadhandler.h" />
5961
<Unit filename="gui/threadresult.cpp" />
6062
<Unit filename="gui/threadresult.h" />
63+
<Unit filename="gui/txtreport.cpp" />
64+
<Unit filename="gui/txtreport.h" />
65+
<Unit filename="gui/xmlreport.cpp" />
66+
<Unit filename="gui/xmlreport.h" />
6167
<Unit filename="src/check.h" />
6268
<Unit filename="src/checkautovariables.cpp" />
6369
<Unit filename="src/checkautovariables.h" />

gui/aboutdialog.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* along with this program. If not, see <http://www.gnu.org/licenses/
1717
*/
1818

19-
#ifndef _ABOUT_DIALOG_H_
20-
#define _ABOUT_DIALOG_H_
19+
#ifndef ABOUT_DIALOG_H
20+
#define ABOUT_DIALOG_H
2121

2222
#include <QDialog>
2323
#include <QString>
@@ -38,4 +38,4 @@ class AboutDialog : public QDialog
3838
QString mVersion;
3939
};
4040

41-
#endif // _ABOUT_DIALOG_H_
41+
#endif // ABOUT_DIALOG_H

gui/fileviewdialog.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* along with this program. If not, see <http://www.gnu.org/licenses/
1717
*/
1818

19-
#ifndef _FILEVIEW_DIALOG_H_
20-
#define _FILEVIEW_DIALOG_H_
19+
#ifndef FILEVIEW_DIALOG_H
20+
#define FILEVIEW_DIALOG_H
2121

2222
#include <QDialog>
2323
#include <QString>
@@ -55,4 +55,4 @@ class FileViewDialog : public QDialog
5555
QString FormatTitle(const QString &filename);
5656
};
5757

58-
#endif // _FILEVIEW_DIALOG_H_
58+
#endif // FILEVIEW_DIALOG_H

gui/projectfile.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* along with this program. If not, see <http://www.gnu.org/licenses/
1717
*/
1818

19-
#ifndef _PROJECT_FILE_H_
20-
#define _PROJECT_FILE_H_
19+
#ifndef PROJECT_FILE_H
20+
#define PROJECT_FILE_H
2121

2222
#include <QObject>
2323
#include <QString>
@@ -65,4 +65,4 @@ class ProjectFile : public QObject
6565
QStringList mDeAllocatedClasses;
6666
};
6767

68-
#endif // _PROJECT_FILE_H_
68+
#endif // PROJECT_FILE_H

gui/report.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* along with this program. If not, see <http://www.gnu.org/licenses/
1717
*/
1818

19-
#ifndef _REPORT_H_
20-
#define _REPORT_H_
19+
#ifndef REPORT_H
20+
#define REPORT_H
2121

2222
#include <QObject>
2323
#include <QString>
@@ -81,4 +81,4 @@ class Report : public QObject
8181
QFile mFile;
8282
};
8383

84-
#endif // _REPORT_H_
84+
#endif // REPORT_H

gui/txtreport.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
* along with this program. If not, see <http://www.gnu.org/licenses/
1717
*/
1818

19-
#ifndef _TXT_REPORT_H_
20-
#define _TXT_REPORT_H_
19+
#ifndef TXT_REPORT_H
20+
#define TXT_REPORT_H
2121

2222
#include <QObject>
2323
#include <QString>
2424
#include <QStringList>
2525
#include <QFile>
2626
#include <QTextStream>
27-
#include "Report.h"
27+
#include "report.h"
2828

2929
/**
3030
* @brief Text file report.
@@ -67,4 +67,4 @@ class TxtReport : public Report
6767
QTextStream mTxtWriter;
6868
};
6969

70-
#endif // _TXT_REPORT_H_
70+
#endif // TXT_REPORT_H

gui/xmlreport.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
* along with this program. If not, see <http://www.gnu.org/licenses/
1717
*/
1818

19-
#ifndef _XML_REPORT_H_
20-
#define _XML_REPORT_H_
19+
#ifndef XML_REPORT_H
20+
#define XML_REPORT_H
2121

2222
#include <QObject>
2323
#include <QString>
2424
#include <QStringList>
2525
#include <QFile>
2626
#include <QXmlStreamWriter>
27-
#include "Report.h"
27+
#include "report.h"
2828

2929
/**
3030
* @brief XML file report.
@@ -67,4 +67,4 @@ class XmlReport : public Report
6767
QXmlStreamWriter mXmlWriter;
6868
};
6969

70-
#endif // _XML_REPORT_H_
70+
#endif // XML_REPORT_H

0 commit comments

Comments
 (0)