Martchus
/
qtutilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make include guards more unique and consistent

This commit is contained in:
Martchus 2016-07-04 23:26:48 +02:00
parent adf201078b
commit 20e663cbcc
17 changed files with 53 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
aboutdialog/aboutdialog.h
View File

@ -1,5 +1,5 @@
#ifndef ABOUTDIALOG_H #ifndef DIALOGS_ABOUTDIALOG_H
#define ABOUTDIALOG_H #define DIALOGS_ABOUTDIALOG_H
#include <c++utilities/application/global.h> #include <c++utilities/application/global.h>
@ -9,8 +9,7 @@
QT_FORWARD_DECLARE_CLASS(QGraphicsScene) QT_FORWARD_DECLARE_CLASS(QGraphicsScene)
namespace Dialogs namespace Dialogs {
{
namespace Ui { namespace Ui {
class AboutDialog; class AboutDialog;
@ -32,5 +31,4 @@ private:
} }
#endif // DIALOGS_ABOUTDIALOG_H
#endif // ABOUTDIALOG_H

6
enterpassworddialog/enterpassworddialog.h
View File

@ -1,5 +1,5 @@
#ifndef ENTERPASSWORDDIALOG_H #ifndef DIALOGS_ENTERPASSWORDDIALOG_H
#define ENTERPASSWORDDIALOG_H #define DIALOGS_ENTERPASSWORDDIALOG_H
#include <c++utilities/application/global.h> #include <c++utilities/application/global.h>
@ -103,4 +103,4 @@ inline void EnterPasswordDialog::abort()
} }
#endif // ENTERPASSWORDDIALOG_H #endif // DIALOGS_ENTERPASSWORDDIALOG_H

6
misc/adoptlocker.h
View File

@ -1,5 +1,5 @@
#ifndef ADOPTLOCKER_H #ifndef THEADING_UTILS_ADOPTLOCKER_H
#define ADOPTLOCKER_H #define THEADING_UTILS_ADOPTLOCKER_H
#include <QtGlobal> #include <QtGlobal>
@ -35,4 +35,4 @@ private:
} }
#endif // ADOPTLOCKER_H #endif // THEADING_UTILS_ADOPTLOCKER_H

6
misc/desktoputils.h
View File

@ -1,5 +1,5 @@
#ifndef DESKTOPSERVICES_H #ifndef DESKTOP_UTILS_DESKTOPSERVICES_H
#define DESKTOPSERVICES_H #define DESKTOP_UTILS_DESKTOPSERVICES_H
#include <QtGlobal> #include <QtGlobal>
@ -11,4 +11,4 @@ bool openLocalFileOrDir(const QString &path);
} }
#endif // DESKTOPSERVICES_H #endif // DESKTOP_UTILS_DESKTOPSERVICES_H

6
misc/recentmenumanager.h
View File

@ -1,5 +1,5 @@
#ifndef RECENTMENUMANAGER_H #ifndef MISC_UTILS_RECENTMENUMANAGER_H
#define RECENTMENUMANAGER_H #define MISC_UTILS_RECENTMENUMANAGER_H
#include <c++utilities/application/global.h> #include <c++utilities/application/global.h>
@ -37,4 +37,4 @@ private:
} }
#endif // RECENTMENUMANAGER_H #endif // MISC_UTILS_RECENTMENUMANAGER_H

6
misc/trylocker.h
View File

@ -1,5 +1,5 @@
#ifndef TRYLOCKER_H #ifndef THREADING_UTILS_TRYLOCKER_H
#define TRYLOCKER_H #define THREADING_UTILS_TRYLOCKER_H
#include <QtGlobal> #include <QtGlobal>
@ -54,4 +54,4 @@ private:
} }
#endif // TRYLOCKER_H #endif // THREADING_UTILS_TRYLOCKER_H

6
models/checklistmodel.h
View File

@ -1,5 +1,5 @@
#ifndef CHECKLISTMODEL_H #ifndef MODELS_CHECKLISTMODEL_H
#define CHECKLISTMODEL_H #define MODELS_CHECKLISTMODEL_H
#include <c++utilities/application/global.h> #include <c++utilities/application/global.h>
@ -114,4 +114,4 @@ inline constexpr int ChecklistModel::idRole()
} }
#endif // CHECKLISTMODEL_H #endif // MODELS_CHECKLISTMODEL_H

6
paletteeditor/colorbutton.h
View File

@ -1,5 +1,5 @@
#ifndef COLORBUTTON_H #ifndef WIDGETS_COLORBUTTON_H
#define COLORBUTTON_H #define WIDGETS_COLORBUTTON_H
#include <c++utilities/application/global.h> #include <c++utilities/application/global.h>
@ -50,4 +50,4 @@ private:
} }
#endif #endif // WIDGETS_COLORBUTTON_H

6
paletteeditor/paletteeditor.h
View File

@ -1,5 +1,5 @@
#ifndef PALETTEEDITOR_H #ifndef WIDGETS_PALETTEEDITOR_H
#define PALETTEEDITOR_H #define WIDGETS_PALETTEEDITOR_H
#include "ui_paletteeditor.h" #include "ui_paletteeditor.h"
@ -177,4 +177,4 @@ public:
} }
#endif // PALETTEEDITOR_H #endif // WIDGETS_PALETTEEDITOR_H

8
resources/qtconfigarguments.h
View File

@ -1,5 +1,5 @@
#ifndef QTCONFIGARGUMENTS_H #ifndef APPLICATION_UTILITIES_QTCONFIGARGUMENTS_H
#define QTCONFIGARGUMENTS_H #define APPLICATION_UTILITIES_QTCONFIGARGUMENTS_H
#include <c++utilities/application/argumentparser.h> #include <c++utilities/application/argumentparser.h>
@ -62,10 +62,10 @@ inline bool QtConfigArguments::areQtGuiArgsPresent() const
} }
#endif // QTCONFIGARGUMENTS_H #endif // APPLICATION_UTILITIES_QTCONFIGARGUMENTS_H
#ifdef QT_CONFIG_ARGUMENTS #ifdef QT_CONFIG_ARGUMENTS
#undef QT_CONFIG_ARGUMENTS # undef QT_CONFIG_ARGUMENTS
#endif #endif
#define QT_CONFIG_ARGUMENTS ApplicationUtilities::QtConfigArguments #define QT_CONFIG_ARGUMENTS ApplicationUtilities::QtConfigArguments

6
resources/resources.h
View File

@ -1,5 +1,5 @@
#ifndef RESOURCES_H #ifndef APPLICATION_UTILITIES_RESOURCES_H
#define RESOURCES_H #define APPLICATION_UTILITIES_RESOURCES_H
#include <c++utilities/application/global.h> #include <c++utilities/application/global.h>
@ -52,4 +52,4 @@ LIB_EXPORT QString locateConfigFile(const QString &applicationName, const QStrin
} }
#endif // RESOURCES_H #endif // APPLICATION_UTILITIES_RESOURCES_H

6
settingsdialog/optioncategory.h
View File

@ -1,5 +1,5 @@
#ifndef OPTIONSCATEGORY_H #ifndef DIALOGS_OPTIONSCATEGORY_H
#define OPTIONSCATEGORY_H #define DIALOGS_OPTIONSCATEGORY_H
#include <c++utilities/application/global.h> #include <c++utilities/application/global.h>
@ -88,4 +88,4 @@ inline const QList<OptionPage *> OptionCategory::pages() const
} }
#endif // OPTIONSCATEGORY_H #endif // DIALOGS_OPTIONSCATEGORY_H

6
settingsdialog/optioncategoryfiltermodel.h
View File

@ -1,5 +1,5 @@
#ifndef OPTIONCATEGORYFILTERMODEL_H #ifndef DIALOGS_OPTIONCATEGORYFILTERMODEL_H
#define OPTIONCATEGORYFILTERMODEL_H #define DIALOGS_OPTIONCATEGORYFILTERMODEL_H
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
@ -19,4 +19,4 @@ protected:
} }
#endif // OPTIONCATEGORYFILTERMODEL_H #endif // DIALOGS_OPTIONCATEGORYFILTERMODEL_H

6
settingsdialog/optioncategorymodel.h
View File

@ -1,5 +1,5 @@
#ifndef OPTIONCATEGORYMODEL_H #ifndef DIALOGS_OPTIONCATEGORYMODEL_H
#define OPTIONCATEGORYMODEL_H #define DIALOGS_OPTIONCATEGORYMODEL_H
#include <c++utilities/application/global.h> #include <c++utilities/application/global.h>
@ -69,4 +69,4 @@ inline OptionCategory *OptionCategoryModel::category(int row) const
} }
#endif // OPTIONCATEGORYMODEL_H #endif // DIALOGS_OPTIONCATEGORYMODEL_H

6
settingsdialog/optionpage.h
View File

@ -1,5 +1,5 @@
#ifndef OPTIONSPAGE_H #ifndef DIALOGS_OPTIONSPAGE_H
#define OPTIONSPAGE_H #define DIALOGS_OPTIONSPAGE_H
#include <c++utilities/application/global.h> #include <c++utilities/application/global.h>
@ -245,4 +245,4 @@ inline UiClass *UiFileBasedOptionPage<UiClass>::ui()
DECLARE_SETUP_WIDGETS \ DECLARE_SETUP_WIDGETS \
END_DECLARE_OPTION_PAGE END_DECLARE_OPTION_PAGE
#endif // OPTIONSPAGE_H #endif // DIALOGS_OPTIONSPAGE_H

6
settingsdialog/qtsettings.h
View File

@ -1,8 +1,8 @@
// The functions and classes declared in this header are experimental. // The functions and classes declared in this header are experimental.
// API/ABI might change in minor release! // API/ABI might change in minor release!
#ifndef QT_UTILITIES_QTSETTINGS_H #ifndef DIALOGS_QT_UTILITIES_QTSETTINGS_H
#define QT_UTILITIES_QTSETTINGS_H #define DIALOGS_QT_UTILITIES_QTSETTINGS_H
#include "./optionpage.h" #include "./optionpage.h"
@ -27,4 +27,4 @@ DECLARE_UI_FILE_BASED_OPTION_PAGE(QtEnvOptionPage)
} }
#endif // QT_UTILITIES_QTSETTINGS_H #endif // DIALOGS_QT_UTILITIES_QTSETTINGS_H

6
settingsdialog/settingsdialog.h
View File

@ -1,5 +1,5 @@
#ifndef QT_UTILITIES_SETTINGSDIALOG_H #ifndef DIALOGS_SETTINGSDIALOG_H
#define QT_UTILITIES_SETTINGSDIALOG_H #define DIALOGS_SETTINGSDIALOG_H
#include <c++utilities/application/global.h> #include <c++utilities/application/global.h>
@ -94,4 +94,4 @@ inline OptionCategoryModel *SettingsDialog::categoryModel()
} }
#endif // QT_UTILITIES_SETTINGSDIALOG_H #endif // DIALOGS_SETTINGSDIALOG_H