diff options
112 files changed, 112 insertions, 379 deletions
diff --git a/cli/cli.hpp b/cli/cli.hpp index 088f0e8c..81405651 100644 --- a/cli/cli.hpp +++ b/cli/cli.hpp @@ -25,8 +25,7 @@ * *********************************************************************/ -#ifndef _APITRACE_CLI_HPP_ -#define _APITRACE_CLI_HPP_ +#pragma once struct Command { @@ -52,4 +51,3 @@ extern const Command sed_command; extern const Command trace_command; extern const Command trim_command; -#endif /* _APITRACE_CLI_HPP_ */ diff --git a/cli/cli_pager.hpp b/cli/cli_pager.hpp index 95d98781..197d712f 100644 --- a/cli/cli_pager.hpp +++ b/cli/cli_pager.hpp @@ -24,12 +24,10 @@ **************************************************************************/ -#ifndef _CLI_PAGER_HPP_ -#define _CLI_PAGER_HPP_ +#pragma once void pipepager(void); -#endif /* _CLI_PAGER_HPP_ */ diff --git a/cli/cli_resources.hpp b/cli/cli_resources.hpp index ee3882be..27b883c3 100644 --- a/cli/cli_resources.hpp +++ b/cli/cli_resources.hpp @@ -23,8 +23,7 @@ * **************************************************************************/ -#ifndef _CLI_RESOURCES_HPP_ -#define _CLI_RESOURCES_HPP_ +#pragma once #include <stdlib.h> @@ -43,4 +42,3 @@ os::String findWrapper(const char *wrapperFilename, bool verbose = false); -#endif /* _CLI_RESOURCES_HPP_ */ diff --git a/cli/cli_retrace.hpp b/cli/cli_retrace.hpp index 0dfa823e..6df0fbe6 100644 --- a/cli/cli_retrace.hpp +++ b/cli/cli_retrace.hpp @@ -25,8 +25,7 @@ * *********************************************************************/ -#ifndef _CLI_RETRACE_HPP_ -#define _CLI_RETRACE_HPP_ +#pragma once #include <vector> @@ -43,4 +42,3 @@ executeRetrace(const std::vector<const char *> & opts, const char *traceName); -#endif /* _CLI_RETRACE_HPP_ */ diff --git a/cli/pickle.hpp b/cli/pickle.hpp index 20dbb13d..cbdacc2a 100644 --- a/cli/pickle.hpp +++ b/cli/pickle.hpp @@ -27,8 +27,7 @@ * Python pickle writer */ -#ifndef _PICKLE_HPP_ -#define _PICKLE_HPP_ +#pragma once #include <assert.h> #include <stddef.h> @@ -385,4 +384,3 @@ protected: } }; -#endif /* _Pickle_HPP_ */ diff --git a/common/highlight.hpp b/common/highlight.hpp index 9f6be8d4..bda49142 100644 --- a/common/highlight.hpp +++ b/common/highlight.hpp @@ -27,8 +27,7 @@ * Helpers for coloring output. */ -#ifndef _HIGHLIGHT_HPP_ -#define _HIGHLIGHT_HPP_ +#pragma once #include <iostream> @@ -85,4 +84,3 @@ defaultHighlighter(std::ostream & os); } /* namespace highlight */ -#endif /* _HIGHLIGHT_HPP_ */ diff --git a/common/os.hpp b/common/os.hpp index bbd88849..b9d3fc21 100644 --- a/common/os.hpp +++ b/common/os.hpp @@ -27,8 +27,7 @@ * Simple OS abstraction layer. */ -#ifndef _OS_HPP_ -#define _OS_HPP_ +#pragma once #include <stdlib.h> #include <stdarg.h> @@ -105,4 +104,3 @@ random(void) { } /* namespace os */ -#endif /* _OS_HPP_ */ diff --git a/common/os_backtrace.hpp b/common/os_backtrace.hpp index 27dcc90f..72869c26 100644 --- a/common/os_backtrace.hpp +++ b/common/os_backtrace.hpp @@ -24,8 +24,7 @@ * **************************************************************************/ -#ifndef _OS_BACKTRACE_HPP_ -#define _OS_BACKTRACE_HPP_ +#pragma once #include <vector> @@ -43,5 +42,3 @@ void dump_backtrace(); } /* namespace os */ - -#endif diff --git a/common/os_binary.hpp b/common/os_binary.hpp index a231c709..c3a1d6ea 100644 --- a/common/os_binary.hpp +++ b/common/os_binary.hpp @@ -27,8 +27,7 @@ * Force binary mode standard files on Windows. */ -#ifndef _OS_BINARY_HPP_ -#define _OS_BINARY_HPP_ +#pragma once #include <stdio.h> @@ -58,4 +57,3 @@ void setBinaryMode(FILE *fp) { } /* namespace os */ -#endif /* _OS_BINARY_HPP_ */ diff --git a/common/os_dl.hpp b/common/os_dl.hpp index da51d414..bf79d507 100644 --- a/common/os_dl.hpp +++ b/common/os_dl.hpp @@ -27,8 +27,7 @@ * Dynamic library linking abstraction. */ -#ifndef _OS_DL_HPP_ -#define _OS_DL_HPP_ +#pragma once #if defined(_WIN32) @@ -86,4 +85,3 @@ namespace os { } /* namespace os */ -#endif /* _OS_DL_HPP_ */ diff --git a/common/os_memory.hpp b/common/os_memory.hpp index bea7d404..5a852516 100644 --- a/common/os_memory.hpp +++ b/common/os_memory.hpp @@ -28,8 +28,7 @@ * Simple OS time measurement abstraction. */ -#ifndef _OS_MEMORY_HPP_ -#define _OS_MEMORY_HPP_ +#pragma once #ifdef HAVE_READPROC_H #include <proc/readproc.h> @@ -77,4 +76,3 @@ namespace os { } /* namespace os */ -#endif /* _OS_MEMORY_HPP_ */ diff --git a/common/os_process.hpp b/common/os_process.hpp index e1b1df17..880242f8 100644 --- a/common/os_process.hpp +++ b/common/os_process.hpp @@ -27,8 +27,7 @@ * Sub-process abstraction. */ -#ifndef _OS_PROCESS_HPP_ -#define _OS_PROCESS_HPP_ +#pragma once #ifdef _WIN32 @@ -88,4 +87,3 @@ int execute(char * const * args); } /* namespace os */ -#endif /* _OS_PROCESS_HPP_ */ diff --git a/common/os_string.hpp b/common/os_string.hpp index a9fc3434..1feca2c5 100644 --- a/common/os_string.hpp +++ b/common/os_string.hpp @@ -27,8 +27,7 @@ * String manipulation. */ -#ifndef _OS_STRING_HPP_ -#define _OS_STRING_HPP_ +#pragma once #include <assert.h> @@ -434,4 +433,3 @@ bool removeFile(const String &fileName); } /* namespace os */ -#endif /* _OS_STRING_HPP_ */ diff --git a/common/os_time.hpp b/common/os_time.hpp index 3e4960e7..e3f63aff 100644 --- a/common/os_time.hpp +++ b/common/os_time.hpp @@ -27,8 +27,7 @@ * Simple OS time measurement abstraction. */ -#ifndef _OS_TIME_HPP_ -#define _OS_TIME_HPP_ +#pragma once #if defined(_WIN32) @@ -103,4 +102,3 @@ namespace os { } /* namespace os */ -#endif /* _OS_TIME_HPP_ */ diff --git a/common/trace_api.hpp b/common/trace_api.hpp index 3ddda7ef..3b119f8e 100644 --- a/common/trace_api.hpp +++ b/common/trace_api.hpp @@ -23,8 +23,7 @@ * **************************************************************************/ -#ifndef _TRACE_API_HPP_ -#define _TRACE_API_HPP_ +#pragma once #include <stdlib.h> @@ -55,4 +54,3 @@ enum API { } /* namespace trace */ -#endif /* _TRACE_API_HPP_ */ diff --git a/common/trace_callset.hpp b/common/trace_callset.hpp index 53bad986..4070a4b8 100644 --- a/common/trace_callset.hpp +++ b/common/trace_callset.hpp @@ -44,8 +44,7 @@ * */ -#ifndef _TRACE_CALLSET_HPP_ -#define _TRACE_CALLSET_HPP_ +#pragma once #include <limits> @@ -194,4 +193,3 @@ namespace trace { } /* namespace trace */ -#endif /* _TRACE_CALLSET_HPP_ */ diff --git a/common/trace_dump.hpp b/common/trace_dump.hpp index 2d22027e..324b71a5 100644 --- a/common/trace_dump.hpp +++ b/common/trace_dump.hpp @@ -27,8 +27,7 @@ * Human-readible dumping. */ -#ifndef _TRACE_DUMP_HPP_ -#define _TRACE_DUMP_HPP_ +#pragma once #include <iostream> @@ -74,4 +73,3 @@ inline std::ostream & operator <<(std::ostream &os, Call &call) { } /* namespace trace */ -#endif /* _TRACE_DUMP_HPP_ */ diff --git a/common/trace_fast_callset.hpp b/common/trace_fast_callset.hpp index 4b27c7ac..55d507df 100644 --- a/common/trace_fast_callset.hpp +++ b/common/trace_fast_callset.hpp @@ -26,8 +26,7 @@ * *********************************************************************/ -#ifndef _TRACE_FAST_CALLSET_HPP_ -#define _TRACE_FAST_CALLSET_HPP_ +#pragma once #include "trace_model.hpp" @@ -139,4 +138,3 @@ public: } /* namespace trace */ -#endif /* _TRACE_FAST_CALLSET_HPP_ */ diff --git a/common/trace_file.hpp b/common/trace_file.hpp index 0c176aab..5ad03fc7 100644 --- a/common/trace_file.hpp +++ b/common/trace_file.hpp @@ -24,8 +24,7 @@ **************************************************************************/ -#ifndef TRACE_FILE_HPP -#define TRACE_FILE_HPP +#pragma once #include <string> #include <fstream> @@ -205,5 +204,3 @@ operator<=(const File::Offset &one, const File::Offset &two) } /* namespace trace */ - -#endif diff --git a/common/trace_format.hpp b/common/trace_format.hpp index d33d6b22..4c6d821e 100644 --- a/common/trace_format.hpp +++ b/common/trace_format.hpp @@ -29,8 +29,7 @@ * See FORMAT.markdown for details. */ -#ifndef _TRACE_FORMAT_HPP_ -#define _TRACE_FORMAT_HPP_ +#pragma once namespace trace { @@ -82,4 +81,3 @@ enum BacktraceDetail { } /* namespace trace */ -#endif /* _TRACE_FORMAT_HPP_ */ diff --git a/common/trace_loader.hpp b/common/trace_loader.hpp index 6873c964..d618a6c0 100644 --- a/common/trace_loader.hpp +++ b/common/trace_loader.hpp @@ -1,5 +1,4 @@ -#ifndef TRACE_LOADER_HPP -#define TRACE_LOADER_HPP +#pragma once #include "trace_file.hpp" #include "trace_parser.hpp" @@ -62,4 +61,3 @@ private: } -#endif // TRACE_LOADER_HPP diff --git a/common/trace_lookup.hpp b/common/trace_lookup.hpp index 7134778d..55655027 100644 --- a/common/trace_lookup.hpp +++ b/common/trace_lookup.hpp @@ -27,8 +27,7 @@ * Helper code for function name indexed lookup tables. */ -#ifndef _TRACE_LOOKUP_HPP_ -#define _TRACE_LOOKUP_HPP_ +#pragma once #include <assert.h> @@ -108,4 +107,3 @@ entryLookup(const char *name, const Entry<T> (& entries)[n], const T & default_) } /* namespace trace */ -#endif /* _TRACE_LOOKUP_HPP_ */ diff --git a/common/trace_model.hpp b/common/trace_model.hpp index 402b3868..821adf65 100644 --- a/common/trace_model.hpp +++ b/common/trace_model.hpp @@ -27,8 +27,7 @@ * Object hierarchy for describing the traces in memory. */ -#ifndef _TRACE_MODEL_HPP_ -#define _TRACE_MODEL_HPP_ +#pragma once #include <assert.h> @@ -584,4 +583,3 @@ public: } /* namespace trace */ -#endif /* _TRACE_MODEL_HPP_ */ diff --git a/common/trace_option.hpp b/common/trace_option.hpp index f29e5959..f11d4658 100644 --- a/common/trace_option.hpp +++ b/common/trace_option.hpp @@ -24,8 +24,7 @@ * **************************************************************************/ -#ifndef _TRACE_OPTION_HPP_ -#define _TRACE_OPTION_HPP_ +#pragma once namespace trace { @@ -37,4 +36,3 @@ intOption(const char *option, int default_ = 0); } /* namespace trace */ -#endif /* _TRACE_CALLSET_HPP_ */ diff --git a/common/trace_parser.hpp b/common/trace_parser.hpp index b0e97535..0dfaabe4 100644 --- a/common/trace_parser.hpp +++ b/common/trace_parser.hpp @@ -23,8 +23,7 @@ * **************************************************************************/ -#ifndef _TRACE_PARSER_HPP_ -#define _TRACE_PARSER_HPP_ +#pragma once #include <iostream> @@ -223,4 +222,3 @@ protected: } /* namespace trace */ -#endif /* _TRACE_PARSER_HPP_ */ diff --git a/common/trace_profiler.hpp b/common/trace_profiler.hpp index e3ae016b..ebe28b46 100644 --- a/common/trace_profiler.hpp +++ b/common/trace_profiler.hpp @@ -24,8 +24,7 @@ * **************************************************************************/ -#ifndef TRACE_PROFILER_H -#define TRACE_PROFILER_H +#pragma once #include <string> #include <vector> @@ -142,4 +141,3 @@ private: }; } -#endif // TRACE_PROFILER_H diff --git a/common/trace_writer.hpp b/common/trace_writer.hpp index 1f4cb5c4..6cadbafb 100644 --- a/common/trace_writer.hpp +++ b/common/trace_writer.hpp @@ -27,8 +27,7 @@ * Trace writing functions. */ -#ifndef _TRACE_WRITER_HPP_ -#define _TRACE_WRITER_HPP_ +#pragma once #include <stddef.h> @@ -115,4 +114,3 @@ namespace trace { } /* namespace trace */ -#endif /* _TRACE_WRITER_HPP_ */ diff --git a/common/trace_writer_local.hpp b/common/trace_writer_local.hpp index 3b00c81b..5d55bd9d 100644 --- a/common/trace_writer_local.hpp +++ b/common/trace_writer_local.hpp @@ -27,8 +27,7 @@ * Trace writing functions, used to trace calls in the current process. */ -#ifndef _TRACE_WRITER_LOCAL_HPP_ -#define _TRACE_WRITER_LOCAL_HPP_ +#pragma once #include <stdint.h> @@ -120,4 +119,3 @@ namespace trace { } /* namespace trace */ -#endif /* _TRACE_WRITER_LOCAL_HPP_ */ diff --git a/dispatch/d2dimports.hpp b/dispatch/d2dimports.hpp index 4a2594b9..ef86dbd6 100644 --- a/dispatch/d2dimports.hpp +++ b/dispatch/d2dimports.hpp @@ -27,8 +27,7 @@ * Central place for all D2D/DWRITE includes, and respective OS dependent headers. */ -#ifndef _D2DIMPORTS_HPP_ -#define _D2DIMPORTS_HPP_ +#pragma once #include <windows.h> #include <tchar.h> @@ -95,4 +94,3 @@ DEFINE_GUID(IID_IDWriteGdiInterop,0x1edd9491,0x9853,0x4299,0x89,0x8f,0x64,0x32,0 DEFINE_GUID(IID_IDWriteGlyphRunAnalysis,0x7d97dbf7,0xe085,0x42d4,0x81,0xe3,0x6a,0x88,0x3b,0xde,0xd1,0x18); DEFINE_GUID(IID_IDWriteFactory,0xb859ee5a,0xd838,0x4b5b,0xa2,0xe8,0x1a,0xdc,0x7d,0x93,0xdb,0x48); -#endif /* _D2DIMPORTS_HPP_ */ diff --git a/dispatch/d3d10imports.hpp b/dispatch/d3d10imports.hpp index 8af79811..80116fe1 100644 --- a/dispatch/d3d10imports.hpp +++ b/dispatch/d3d10imports.hpp @@ -27,8 +27,7 @@ * Central place for all D3D10 includes, and respective OS dependent headers. */ -#ifndef _D3D10IMPORTS_HPP_ -#define _D3D10IMPORTS_HPP_ +#pragma once #include <windows.h> @@ -42,4 +41,3 @@ #include "dxgiint.h" -#endif /* _D3D10IMPORTS_HPP_ */ diff --git a/dispatch/d3d11imports.hpp b/dispatch/d3d11imports.hpp index 410dec41..b7fe3612 100644 --- a/dispatch/d3d11imports.hpp +++ b/dispatch/d3d11imports.hpp @@ -27,8 +27,7 @@ * Central place for all D3D11 includes, and respective OS dependent headers. */ -#ifndef _D3D11IMPORTS_HPP_ -#define _D3D11IMPORTS_HPP_ +#pragma once #include <windows.h> @@ -42,4 +41,3 @@ #include "dxgiint.h" -#endif /* _D3D11IMPORTS_HPP_ */ diff --git a/dispatch/d3d8imports.hpp b/dispatch/d3d8imports.hpp index d0813794..f0fd8814 100644 --- a/dispatch/d3d8imports.hpp +++ b/dispatch/d3d8imports.hpp @@ -27,8 +27,7 @@ * Central place for all D3D8 includes, and respective OS dependent headers. */ -#ifndef _D3D8IMPORTS_HPP_ -#define _D3D8IMPORTS_HPP_ +#pragma once #include <windows.h> @@ -36,4 +35,3 @@ #include <d3d8.h> -#endif /* _D3D8IMPORTS_HPP_ */ diff --git a/dispatch/d3d9imports.hpp b/dispatch/d3d9imports.hpp index b4e81873..675430ba 100644 --- a/dispatch/d3d9imports.hpp +++ b/dispatch/d3d9imports.hpp @@ -27,8 +27,7 @@ * Central place for all D3D9 includes, and respective OS dependent headers. */ -#ifndef _D3D9IMPORTS_HPP_ -#define _D3D9IMPORTS_HPP_ +#pragma once #include <windows.h> @@ -99,4 +98,3 @@ #endif -#endif /* _D3D9IMPORTS_HPP_ */ diff --git a/dispatch/d3derr.hpp b/dispatch/d3derr.hpp index 349cac4f..0b04f216 100644 --- a/dispatch/d3derr.hpp +++ b/dispatch/d3derr.hpp @@ -35,8 +35,7 @@ * - http://msdn.microsoft.com/en-us/library/windows/desktop/bb172554.aspx */ -#ifndef _D3DERR_HPP_ -#define _D3DERR_HPP_ +#pragma once #ifndef _FACD3D @@ -95,4 +94,3 @@ #endif -#endif /* _D3DERR_HPP_ */ diff --git a/dispatch/d3dimports.hpp b/dispatch/d3dimports.hpp index b70e2f4f..69836fe0 100644 --- a/dispatch/d3dimports.hpp +++ b/dispatch/d3dimports.hpp @@ -27,8 +27,7 @@ * Central place for all DDraw/D3D includes, and respective OS dependent headers. */ -#ifndef _D3DIMPORTS_HPP_ -#define _D3DIMPORTS_HPP_ +#pragma once #include <windows.h> @@ -56,4 +55,3 @@ #endif -#endif /* _D3DIMPORTS_HPP_ */ diff --git a/dispatch/dlopen.hpp b/dispatch/dlopen.hpp index c1a71ba8..d6eba006 100644 --- a/dispatch/dlopen.hpp +++ b/dispatch/dlopen.hpp @@ -27,8 +27,7 @@ * Provides access to real dlopen, as tracing libraries interpose it. */ -#ifndef _DLOPEN_HPP_ -#define _DLOPEN_HPP_ +#pragma once #include <dlfcn.h> @@ -63,4 +62,3 @@ _dlopen(const char *filename, int flag) return dlopen_ptr(filename, flag); } -#endif /* _DLOPEN_HPP_ */ diff --git a/dispatch/dxgiint.h b/dispatch/dxgiint.h index 49384d28..8df47b4c 100644 --- a/dispatch/dxgiint.h +++ b/dispatch/dxgiint.h @@ -24,8 +24,7 @@ **************************************************************************/ -#ifndef _DXGIINT_H_ -#define _DXGIINT_H_ +#pragma once #include <windows.h> @@ -54,4 +53,3 @@ struct IDXGIFactoryDWM: public IUnknown }; -#endif /* _DXGIINT_H_ */ diff --git a/dispatch/eglimports.hpp b/dispatch/eglimports.hpp index 49cf177a..95b52ee8 100644 --- a/dispatch/eglimports.hpp +++ b/dispatch/eglimports.hpp @@ -28,8 +28,7 @@ * directly, or indirectly through glimports.h. */ -#ifndef _EGLIMPORTS_HPP_ -#define _EGLIMPORTS_HPP_ +#pragma once #include <KHR/khrplatform.h> @@ -88,4 +87,3 @@ typedef int32_t GLclampx; #include "GLES/glext.h" -#endif /* _EGLIMPORTS_HPP_ */ diff --git a/dispatch/glimports.hpp b/dispatch/glimports.hpp index 21b57b9b..d535c793 100644 --- a/dispatch/glimports.hpp +++ b/dispatch/glimports.hpp @@ -27,8 +27,7 @@ * Central place for all GL includes, and respective OS dependent headers. */ -#ifndef _GLIMPORTS_HPP_ -#define _GLIMPORTS_HPP_ +#pragma once #if defined(_WIN32) @@ -244,4 +243,3 @@ CGLError CGLUpdateContext(CGLContextObj ctx); #include "eglimports.hpp" -#endif /* _GLIMPORTS_HPP_ */ diff --git a/dispatch/glproc.py b/dispatch/glproc.py index a1231f98..8e4dddad 100644 --- a/dispatch/glproc.py +++ b/dispatch/glproc.py @@ -570,8 +570,7 @@ if __name__ == '__main__': sys.stdout = open(decl, 'wt') print - print '#ifndef _GLPROC_HPP_' - print '#define _GLPROC_HPP_' + print '#pragma once' print print '#include "glimports.hpp"' print @@ -604,8 +603,6 @@ if __name__ == '__main__': print dispatcher.dispatchModuleDecl(glapi) print - print '#endif /* !_GLPROC_HPP_ */' - print sys.stdout = open(impl, 'wt') print diff --git a/gui/androiddevicedialog.h b/gui/androiddevicedialog.h index 9e48785a..0b994c6a 100644 --- a/gui/androiddevicedialog.h +++ b/gui/androiddevicedialog.h @@ -28,8 +28,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDDEVICEDIALOG_H -#define ANDROIDDEVICEDIALOG_H +#pragma once #include "androidutils.h" @@ -64,4 +63,3 @@ private: Ui::AndroidDeviceDialog *m_ui; }; -#endif // ANDROIDDEVICEDIALOG_H diff --git a/gui/androidfiledialog.h b/gui/androidfiledialog.h index 32c9948d..ac626ef0 100644 --- a/gui/androidfiledialog.h +++ b/gui/androidfiledialog.h @@ -1,5 +1,4 @@ -#ifndef ANDROIDFILEDIALOG_H -#define ANDROIDFILEDIALOG_H +#pragma once #include <QDialog> #include <QDialogButtonBox> @@ -44,4 +43,3 @@ private: Mode m_mode; }; -#endif // ANDROIDFILEDIALOG_H diff --git a/gui/androidretracer.h b/gui/androidretracer.h index cc18444f..f2c758e5 100644 --- a/gui/androidretracer.h +++ b/gui/androidretracer.h @@ -1,5 +1,4 @@ -#ifndef ANDROIDRETRACER_H -#define ANDROIDRETRACER_H +#pragma once #include <QAtomicInt> #include <QTcpSocket> @@ -32,4 +31,3 @@ private: int m_stderrPort; }; -#endif // ANDROIDRETRACER_H diff --git a/gui/androidutils.h b/gui/androidutils.h index 44f6c156..60c8abea 100644 --- a/gui/androidutils.h +++ b/gui/androidutils.h @@ -1,5 +1,4 @@ -#ifndef ANDROIDUTILS_H -#define ANDROIDUTILS_H +#pragma once #include <QList> #include <QObject> @@ -70,4 +69,3 @@ private: mutable qint64 m_wait; mutable QString m_serialNumber; }; -#endif // ANDROIDUTILS_H diff --git a/gui/apicalldelegate.h b/gui/apicalldelegate.h index 18c8b33a..c4379586 100644 --- a/gui/apicalldelegate.h +++ b/gui/apicalldelegate.h @@ -1,5 +1,4 @@ -#ifndef APICALLDELEGATE_H -#define APICALLDELEGATE_H +#pragma once #include <QStyledItemDelegate> @@ -20,5 +19,3 @@ private: QIcon m_editEmblem; QIcon m_errorEmblem; }; - -#endif diff --git a/gui/apisurface.h b/gui/apisurface.h index 19fbce31..6cb9efd3 100644 --- a/gui/apisurface.h +++ b/gui/apisurface.h @@ -1,5 +1,4 @@ -#ifndef APISURFACE_H -#define APISURFACE_H +#pragma once #include <QImage> #include <QSize> @@ -68,5 +67,3 @@ private: QString m_type; }; - -#endif diff --git a/gui/apitrace.h b/gui/apitrace.h index 99cf3e66..77cac61d 100644 --- a/gui/apitrace.h +++ b/gui/apitrace.h @@ -1,5 +1,4 @@ -#ifndef APITRACE_H -#define APITRACE_H +#pragma once #include "apitracecall.h" @@ -177,5 +176,3 @@ private: ImageHash m_thumbnails; }; - -#endif diff --git a/gui/apitracecall.h b/gui/apitracecall.h index c99784d2..7ff03400 100644 --- a/gui/apitracecall.h +++ b/gui/apitracecall.h @@ -1,5 +1,4 @@ -#ifndef APITRACECALL_H -#define APITRACECALL_H +#pragma once #include "apisurface.h" @@ -369,6 +368,3 @@ private: unsigned m_lastCallIndex; }; Q_DECLARE_METATYPE(ApiTraceFrame*); - - -#endif diff --git a/gui/apitracefilter.h b/gui/apitracefilter.h index 35f627df..b9cd75d5 100644 --- a/gui/apitracefilter.h +++ b/gui/apitracefilter.h @@ -1,5 +1,4 @@ -#ifndef APITRACEFILTER_H -#define APITRACEFILTER_H +#pragma once #include <QRegExp> #include <QSortFilterProxyModel> @@ -40,5 +39,3 @@ private: FilterOptions m_filters; QRegExp m_customRegexp; }; - -#endif diff --git a/gui/apitracemodel.h b/gui/apitracemodel.h index e7354aa6..76876c20 100644 --- a/gui/apitracemodel.h +++ b/gui/apitracemodel.h @@ -1,5 +1,4 @@ -#ifndef APITRACEMODEL_H -#define APITRACEMODEL_H +#pragma once #include <QAbstractItemModel> @@ -67,5 +66,3 @@ private: ApiTrace *m_trace; QSet<ApiTraceFrame*> m_loadingFrames; }; - -#endif diff --git a/gui/argumentseditor.h b/gui/argumentseditor.h index 73cd4580..148b3ff6 100644 --- a/gui/argumentseditor.h +++ b/gui/argumentseditor.h @@ -1,5 +1,4 @@ -#ifndef ARGUMENTSEDITOR_H -#define ARGUMENTSEDITOR_H +#pragma once #include "apitracecall.h" #include "ui_argumentseditor.h" @@ -182,5 +181,3 @@ private: ApiTraceCall *m_call; }; - -#endif diff --git a/gui/calldurationgraph.h b/gui/calldurationgraph.h index 0c7e8c91..be6fe45e 100644 --- a/gui/calldurationgraph.h +++ b/gui/calldurationgraph.h @@ -1,5 +1,4 @@ -#ifndef CALLDURATIONGRAPH_H -#define CALLDURATIONGRAPH_H +#pragma once #include "graphing/graphwidget.h" #include "trace_profiler.hpp" @@ -170,4 +169,3 @@ private: SelectionState* m_selectionState; }; -#endif diff --git a/gui/graphing/frameaxiswidget.h b/gui/graphing/frameaxiswidget.h index 59fdc162..4b2c4cbb 100644 --- a/gui/graphing/frameaxiswidget.h +++ b/gui/graphing/frameaxiswidget.h @@ -1,5 +1,4 @@ -#ifndef FRAMEAXISWIDGET_H -#define FRAMEAXISWIDGET_H +#pragma once #include "graphaxiswidget.h" @@ -30,5 +29,3 @@ public: protected: FrameDataProvider* m_data; }; - -#endif diff --git a/gui/graphing/graphaxiswidget.h b/gui/graphing/graphaxiswidget.h index 6ae00800..a8d1c01a 100644 --- a/gui/graphing/graphaxiswidget.h +++ b/gui/graphing/graphaxiswidget.h @@ -1,5 +1,4 @@ -#ifndef GRAPHAXISWIDGET_H -#define GRAPHAXISWIDGET_H +#pragma once #include "graphing.h" @@ -69,5 +68,3 @@ protected: QPoint m_mousePressPosition; qint64 m_mousePressValue; }; - -#endif diff --git a/gui/graphing/graphing.h b/gui/graphing/graphing.h index 35b4a913..f97df8b3 100644 --- a/gui/graphing/graphing.h +++ b/gui/graphing/graphing.h @@ -1,5 +1,4 @@ -#ifndef GRAPHING_H -#define GRAPHING_H +#pragma once #include <QString> @@ -44,5 +43,3 @@ public: /* Set pointer to selection state */ virtual void setSelectionState(SelectionState* state) = 0; }; - -#endif diff --git a/gui/graphing/graphlabelwidget.h b/gui/graphing/graphlabelwidget.h index 49c0cd49..050dc40d 100644 --- a/gui/graphing/graphlabelwidget.h +++ b/gui/graphing/graphlabelwidget.h @@ -1,5 +1,4 @@ -#ifndef GRAPHLABELWIDGET_H -#define GRAPHLABELWIDGET_H +#pragma once #include <QWidget> #include <QPainter> @@ -38,5 +37,3 @@ protected: int m_flags; QString m_text; }; - -#endif diff --git a/gui/graphing/graphview.h b/gui/graphing/graphview.h index 6b881d4e..94328b69 100644 --- a/gui/graphing/graphview.h +++ b/gui/graphing/graphview.h @@ -1,5 +1,4 @@ -#ifndef GRAPHVIEW_H -#define GRAPHVIEW_H +#pragma once #include "graphing.h" @@ -89,5 +88,3 @@ protected: qint64 m_graphTop; } m_previous; }; - -#endif diff --git a/gui/graphing/graphwidget.h b/gui/graphing/graphwidget.h index 16b77868..17cb4651 100644 --- a/gui/graphing/graphwidget.h +++ b/gui/graphing/graphwidget.h @@ -1,5 +1,4 @@ -#ifndef GRAPHWIDGET_H -#define GRAPHWIDGET_H +#pragma once #include "graphview.h" #include "graphaxiswidget.h" @@ -108,5 +107,3 @@ protected: qint64 m_verticalEnd; Qt::ScrollBarPolicy m_verticalScrollbarPolicy; }; - -#endif diff --git a/gui/graphing/heatmapverticalaxiswidget.h b/gui/graphing/heatmapverticalaxiswidget.h index ca64adb4..9a21c25b 100644 --- a/gui/graphing/heatmapverticalaxiswidget.h +++ b/gui/graphing/heatmapverticalaxiswidget.h @@ -1,5 +1,4 @@ -#ifndef HEATMAPVERTICALAXISWIDGET_H -#define HEATMAPVERTICALAXISWIDGET_H +#pragma once #include "heatmapview.h" #include "graphaxiswidget.h" @@ -20,5 +19,3 @@ protected: int m_rowHeight; HeatmapDataProvider* m_data; }; - -#endif diff --git a/gui/graphing/heatmapview.h b/gui/graphing/heatmapview.h index 781c9a7a..86d8848d 100644 --- a/gui/graphing/heatmapview.h +++ b/gui/graphing/heatmapview.h @@ -1,5 +1,4 @@ -#ifndef HEATMAPVIEW_H -#define HEATMAPVIEW_H +#pragma once #include "graphview.h" @@ -120,5 +119,3 @@ protected: int m_rowHeight; HeatmapDataProvider* m_data; }; - -#endif diff --git a/gui/graphing/histogramview.h b/gui/graphing/histogramview.h index 563d664b..ae89f7b1 100644 --- a/gui/graphing/histogramview.h +++ b/gui/graphing/histogramview.h @@ -1,5 +1,4 @@ -#ifndef HISTOGRAMVIEW_H -#define HISTOGRAMVIEW_H +#pragma once #include "graphview.h" @@ -37,5 +36,3 @@ protected: GraphDataProvider* m_data; }; - -#endif diff --git a/gui/graphing/timeaxiswidget.h b/gui/graphing/timeaxiswidget.h index 836651cb..7f79a399 100644 --- a/gui/graphing/timeaxiswidget.h +++ b/gui/graphing/timeaxiswidget.h @@ -1,5 +1,4 @@ -#ifndef TIMEAXISWIDGET_H -#define TIMEAXISWIDGET_H +#pragma once #include "graphaxiswidget.h" @@ -12,5 +11,3 @@ public: virtual void paintEvent(QPaintEvent *e); }; - -#endif diff --git a/gui/imageviewer.h b/gui/imageviewer.h index ce5d9bdd..daf5baed 100644 --- a/gui/imageviewer.h +++ b/gui/imageviewer.h @@ -1,5 +1,4 @@ -#ifndef IMAGEVIEWER_H -#define IMAGEVIEWER_H +#pragma once #include "ui_imageviewer.h" #include <QDialog> @@ -35,6 +34,3 @@ private: QImage m_convertedImage; PixelWidget *m_pixelWidget; }; - - -#endif diff --git a/gui/jumpwidget.h b/gui/jumpwidget.h index 5f71c002..8fec83f4 100644 --- a/gui/jumpwidget.h +++ b/gui/jumpwidget.h @@ -1,5 +1,4 @@ -#ifndef JUMPWIDGET_H -#define JUMPWIDGET_H +#pragma once #include "ui_jumpwidget.h" #include <QWidget> @@ -27,5 +26,3 @@ protected: private: Ui_JumpWidget m_ui; }; - -#endif diff --git a/gui/mainwindow.h b/gui/mainwindow.h index 22799ff9..d5107da7 100644 --- a/gui/mainwindow.h +++ b/gui/mainwindow.h @@ -1,5 +1,4 @@ -#ifndef MAINWINDOW_H -#define MAINWINDOW_H +#pragma once #include "ui_mainwindow.h" @@ -168,6 +167,3 @@ private: ProfileDialog* m_profileDialog; QString m_androidFilePath; }; - - -#endif diff --git a/gui/pixelwidget.h b/gui/pixelwidget.h index 837dde40..6d92a84e 100644 --- a/gui/pixelwidget.h +++ b/gui/pixelwidget.h @@ -44,8 +44,7 @@ ** ****************************************************************************/ -#ifndef PIXELWIDGET_H -#define PIXELWIDGET_H +#pragma once #include <qwidget.h> #include <qpixmap.h> @@ -111,5 +110,3 @@ private: QSize m_initialSize; QColor m_currentColor; }; - -#endif // PIXELWIDGET_H diff --git a/gui/profiledialog.h b/gui/profiledialog.h index 862d068b..b6c3f163 100644 --- a/gui/profiledialog.h +++ b/gui/profiledialog.h @@ -1,5 +1,4 @@ -#ifndef PROFILEDIALOG_H -#define PROFILEDIALOG_H +#pragma once #include "ui_profiledialog.h" #include <QDialog> @@ -27,5 +26,3 @@ signals: private: trace::Profile *m_profile; }; - -#endif diff --git a/gui/profileheatmap.h b/gui/profileheatmap.h index 15a919f6..548917bd 100644 --- a/gui/profileheatmap.h +++ b/gui/profileheatmap.h @@ -1,5 +1,4 @@ -#ifndef PROFILEHEATMAP_H -#define PROFILEHEATMAP_H +#pragma once #include "graphing/heatmapview.h" #include "profiling.h" @@ -466,5 +465,3 @@ protected: std::vector<int> m_rowPrograms; SelectionState* m_selectionState; }; - -#endif diff --git a/gui/profiletablemodel.h b/gui/profiletablemodel.h index da175503..e2288b42 100644 --- a/gui/profiletablemodel.h +++ b/gui/profiletablemodel.h @@ -1,5 +1,4 @@ -#ifndef PROFILETABLEMODEL_H -#define PROFILETABLEMODEL_H +#pragma once #include <QAbstractTableModel> #include "trace_profiler.hpp" @@ -67,4 +66,3 @@ private: Qt::SortOrder m_sortOrder; }; -#endif // PROFILEMODEL_H diff --git a/gui/profiling.h b/gui/profiling.h index a5b12660..6d4ef806 100644 --- a/gui/profiling.h +++ b/gui/profiling.h @@ -1,5 +1,4 @@ -#ifndef PROFILING_H -#define PROFILING_H +#pragma once #include <QString> #include <QLocale> @@ -124,5 +123,3 @@ public: } } }; - -#endif diff --git a/gui/retracer.h b/gui/retracer.h index e64519fe..bd395e2c 100644 --- a/gui/retracer.h +++ b/gui/retracer.h @@ -1,5 +1,4 @@ -#ifndef RETRACER_H -#define RETRACER_H +#pragma once #include "trace_api.hpp" #include "apitrace.h" @@ -91,5 +90,3 @@ private: QList<qlonglong> m_thumbnailsToCapture; }; - -#endif diff --git a/gui/saverthread.h b/gui/saverthread.h index e8c6889f..f53296e1 100644 --- a/gui/saverthread.h +++ b/gui/saverthread.h @@ -1,5 +1,4 @@ -#ifndef SAVERTHREAD_H -#define SAVERTHREAD_H +#pragma once #include "apitrace.h" @@ -31,6 +30,3 @@ private: QString m_writeFileName; QSet<ApiTraceCall*> m_editedCalls; }; - - -#endif diff --git a/gui/searchwidget.h b/gui/searchwidget.h index f59b4a0c..6415ef28 100644 --- a/gui/searchwidget.h +++ b/gui/searchwidget.h @@ -1,5 +1,4 @@ -#ifndef SEARCHWIDGET_H -#define SEARCHWIDGET_H +#pragma once #include "ui_searchwidget.h" #include <QPalette> @@ -34,5 +33,3 @@ private: Ui_SearchWidget m_ui; QPalette m_origPalette; }; - -#endif diff --git a/gui/settingsdialog.h b/gui/settingsdialog.h index 6ea3969b..aa2db34f 100644 --- a/gui/settingsdialog.h +++ b/gui/settingsdialog.h @@ -1,5 +1,4 @@ -#ifndef SETTINGSDIALOG_H -#define SETTINGSDIALOG_H +#pragma once #include "trace_api.hpp" #include "apitracefilter.h" @@ -33,5 +32,3 @@ private: QMap<QString, QRegExp> m_showFilters; ApiTraceFilter *m_filter; }; - -#endif diff --git a/gui/shaderssourcewidget.h b/gui/shaderssourcewidget.h index 9a5c3228..d40ea6e8 100644 --- a/gui/shaderssourcewidget.h +++ b/gui/shaderssourcewidget.h @@ -1,5 +1,4 @@ -#ifndef SHADERSSOURCEWIDGET_H -#define SHADERSSOURCEWIDGET_H +#pragma once #include "ui_shaderssourcewidget.h" #include <QWidget> @@ -22,5 +21,3 @@ private: QMap<QString, QString> m_sources; GLSLEdit *m_edit; }; - -#endif diff --git a/gui/thumbnail.h b/gui/thumbnail.h index 23155648..9cf8fca6 100644 --- a/gui/thumbnail.h +++ b/gui/thumbnail.h @@ -1,5 +1,4 @@ -#ifndef THUMBNAIL_H -#define THUMBNAIL_H +#pragma once #define THUMBNAIL_SIZE 64 @@ -9,5 +8,3 @@ inline QImage thumbnail(const QImage &image, Qt::TransformationMode transformationMode = Qt::FastTransformation) { return image.scaled(THUMBNAIL_SIZE, THUMBNAIL_SIZE, Qt::KeepAspectRatio, transformationMode); } - -#endif diff --git a/gui/tracedialog.h b/gui/tracedialog.h index 0ebe13ad..cf45833d 100644 --- a/gui/tracedialog.h +++ b/gui/tracedialog.h @@ -1,5 +1,4 @@ -#ifndef TRACEDIALOG_H -#define TRACEDIALOG_H +#pragma once #include "ui_tracedialog.h" #include <QDialog> @@ -22,5 +21,3 @@ private slots: private: bool isFileOk(const QString &fileName); }; - -#endif diff --git a/gui/traceloader.h b/gui/traceloader.h index 65a179d9..daf3b3da 100644 --- a/gui/traceloader.h +++ b/gui/traceloader.h @@ -1,5 +1,4 @@ -#ifndef TRACELOADER_H -#define TRACELOADER_H +#pragma once #include "apitrace.h" @@ -118,5 +117,3 @@ private: QVector<ApiTraceCallSignature*> m_signatures; }; - -#endif diff --git a/gui/traceprocess.h b/gui/traceprocess.h index 343bac96..f3634237 100644 --- a/gui/traceprocess.h +++ b/gui/traceprocess.h @@ -1,5 +1,4 @@ -#ifndef TRACEPROCESS_H -#define TRACEPROCESS_H +#pragma once #include <QObject> #include <QProcess> @@ -40,5 +39,3 @@ private: bool m_canTrace; }; - -#endif diff --git a/gui/trimprocess.h b/gui/trimprocess.h index 4cce35d8..0d55c889 100644 --- a/gui/trimprocess.h +++ b/gui/trimprocess.h @@ -1,5 +1,4 @@ -#ifndef TRIMPROCESS_H -#define TRIMPROCESS_H +#pragma once #include "apitrace.h" @@ -40,5 +39,3 @@ private: int m_trimIndex; QProcess *m_process; }; - -#endif diff --git a/gui/vertexdatainterpreter.h b/gui/vertexdatainterpreter.h index 6bf9b11c..1ad46b7d 100644 --- a/gui/vertexdatainterpreter.h +++ b/gui/vertexdatainterpreter.h @@ -1,5 +1,4 @@ -#ifndef VERTEXDATAINTERPRETER_H -#define VERTEXDATAINTERPRETER_H +#pragma once #include <QObject> @@ -49,5 +48,3 @@ private: int m_components; int m_startingOffset; }; - -#endif diff --git a/helpers/com_ptr.hpp b/helpers/com_ptr.hpp index 83384f74..e822b6e8 100644 --- a/helpers/com_ptr.hpp +++ b/helpers/com_ptr.hpp @@ -23,8 +23,7 @@ * **************************************************************************/ -#ifndef COM_PTR_HPP -#define COM_PTR_HPP +#pragma once #include <assert.h> @@ -86,4 +85,3 @@ private: -#endif // COM_PTR_HPP diff --git a/helpers/d3d10size.hpp b/helpers/d3d10size.hpp index c9785615..1818b177 100644 --- a/helpers/d3d10size.hpp +++ b/helpers/d3d10size.hpp @@ -30,8 +30,7 @@ * Auxiliary functions to compute the size of array/blob arguments. */ -#ifndef _D3D10SIZE_HPP_ -#define _D3D10SIZE_HPP_ +#pragma once /* We purposedly don't include any D3D header, so that this header can be used @@ -280,4 +279,3 @@ _getQueryType(ID3D10Asynchronous *pAsync) } -#endif /* _D3D10SIZE_HPP_ */ diff --git a/helpers/d3d11size.hpp b/helpers/d3d11size.hpp index 4c59510f..f3f97b1a 100644 --- a/helpers/d3d11size.hpp +++ b/helpers/d3d11size.hpp @@ -30,8 +30,7 @@ * Auxiliary functions to compute the size of array/blob arguments. */ -#ifndef _D3D11SIZE_HPP_ -#define _D3D11SIZE_HPP_ +#pragma once /* We purposedly don't include any D3D header, so that this header can be used @@ -226,4 +225,3 @@ _getQueryType(ID3D11Asynchronous *pAsync) } -#endif /* _D3D11SIZE_HPP_ */ diff --git a/helpers/d3d7size.hpp b/helpers/d3d7size.hpp index d7a7e4d0..1d96cda6 100644 --- a/helpers/d3d7size.hpp +++ b/helpers/d3d7size.hpp @@ -30,8 +30,7 @@ * Auxiliary functions to compute the size of array/blob arguments. */ -#ifndef _D3D7SIZE_HPP_ -#define _D3D7SIZE_HPP_ +#pragma once static inline size_t @@ -103,5 +102,4 @@ _getVertexSize(DWORD dwFVF) { -#endif /* _D3D7SIZE_HPP_ */ diff --git a/helpers/d3d8size.hpp b/helpers/d3d8size.hpp index b84b9002..ba662f36 100644 --- a/helpers/d3d8size.hpp +++ b/helpers/d3d8size.hpp @@ -30,8 +30,7 @@ * Auxiliary functions to compute the size of array/blob arguments. */ -#ifndef _D3D8SIZE_HPP_ -#define _D3D8SIZE_HPP_ +#pragma once #include "d3dcommonsize.hpp" @@ -232,4 +231,3 @@ _getMapInfo(IDirect3DVolumeTexture8 *pTexture, UINT Level, const D3DLOCKED_BOX * } -#endif /* _D3D8SIZE_HPP_ */ diff --git a/helpers/d3d9size.hpp b/helpers/d3d9size.hpp index 04f5e593..11ea14c0 100644 --- a/helpers/d3d9size.hpp +++ b/helpers/d3d9size.hpp @@ -30,8 +30,7 @@ * Auxiliary functions to compute the size of array/blob arguments. */ -#ifndef _D3D9SIZE_HPP_ -#define _D3D9SIZE_HPP_ +#pragma once #include "d3dcommonsize.hpp" @@ -233,4 +232,3 @@ _getMapInfo(IDirect3DVolumeTexture9 *pTexture, UINT Level, const D3DLOCKED_BOX * } -#endif /* _D3D9SIZE_HPP_ */ diff --git a/helpers/d3dcommonsize.hpp b/helpers/d3dcommonsize.hpp index 6619b13a..4a7344bb 100644 --- a/helpers/d3dcommonsize.hpp +++ b/helpers/d3dcommonsize.hpp @@ -30,8 +30,7 @@ * Auxiliary functions to compute the size of array/blob arguments. */ -#ifndef _D3DCOMMONSIZE_HPP_ -#define _D3DCOMMONSIZE_HPP_ +#pragma once /* We purposedly don't include any D3D header, so that this header can be used @@ -186,4 +185,3 @@ _getLockSize(D3DFORMAT Format, UINT Width, UINT Height, INT RowPitch, UINT Depth } -#endif /* _D3DCOMMONSIZE_HPP_ */ diff --git a/helpers/d3dshader.hpp b/helpers/d3dshader.hpp index 169785ef..4acc01dd 100644 --- a/helpers/d3dshader.hpp +++ b/helpers/d3dshader.hpp @@ -23,8 +23,7 @@ * **************************************************************************/ -#ifndef _D3DSHADER_HPP_ -#define _D3DSHADER_HPP_ +#pragma once #include <windows.h> @@ -48,4 +47,3 @@ HRESULT DisassembleShader(const void *pShader, SIZE_T BytecodeLength, IDisassemblyBuffer **ppDisassembly); -#endif /* _D3DSHADER_HPP_ */ diff --git a/helpers/dxgisize.hpp b/helpers/dxgisize.hpp index cbe526fb..584a884b 100644 --- a/helpers/dxgisize.hpp +++ b/helpers/dxgisize.hpp @@ -30,8 +30,7 @@ * Auxiliary functions to compute the size of array/blob arguments. */ -#ifndef _DXGISIZE_HPP_ -#define _DXGISIZE_HPP_ +#pragma once /* We purposedly don't include any D3D header, so that this header can be used @@ -264,4 +263,3 @@ _getMapDesc(IDXGISurface *pResource, DXGI_MAPPED_RECT * pLockedRect, UINT MapFla } -#endif /* _DXGISIZE_HPP_ */ diff --git a/helpers/eglsize.hpp b/helpers/eglsize.hpp index 3da79d12..2025fd46 100644 --- a/helpers/eglsize.hpp +++ b/helpers/eglsize.hpp @@ -29,8 +29,7 @@ /* * Auxiliary functions to compute the size of array/blob arguments. */ -#ifndef _EGLSIZE_HPP_ -#define _EGLSIZE_HPP_ +#pragma once #ifndef _WIN32 @@ -55,5 +54,3 @@ void _EGLImageKHR_free_image_info(struct image_info *info); #endif // !defined(_WIN32) - -#endif diff --git a/helpers/glprofile.hpp b/helpers/glprofile.hpp index b662f3af..554294fb 100644 --- a/helpers/glprofile.hpp +++ b/helpers/glprofile.hpp @@ -29,8 +29,7 @@ */ -#ifndef GLPROFILE_HPP -#define GLPROFILE_HPP +#pragma once #include <ostream> @@ -134,4 +133,3 @@ struct Extensions } /* namespace glprofile */ -#endif // GLPROFILE_HPP diff --git a/helpers/glsize.hpp b/helpers/glsize.hpp index 0b36cc8e..b3ef4abd 100644 --- a/helpers/glsize.hpp +++ b/helpers/glsize.hpp @@ -31,8 +31,7 @@ * Auxiliary functions to compute the size of array/blob arguments, depending. */ -#ifndef _GL_SIZE_HPP_ -#define _GL_SIZE_HPP_ +#pragma once #include <string.h> @@ -1366,4 +1365,3 @@ _glGetDebugMessageLog_length(const Char * string, const GLsizei *lengths, GLuint return size; } -#endif /* _GL_SIZE_HPP_ */ diff --git a/image/image.hpp b/image/image.hpp index e4df964d..e6f0d226 100644 --- a/image/image.hpp +++ b/image/image.hpp @@ -27,8 +27,7 @@ * Image I/O. */ -#ifndef _IMAGE_HPP_ -#define _IMAGE_HPP_ +#pragma once #include <iostream> @@ -155,4 +154,3 @@ readPNM(const char *buffer, size_t bufferSize); } /* namespace image */ -#endif /* _IMAGE_HPP_ */ diff --git a/retrace/d3d10state.hpp b/retrace/d3d10state.hpp index 7dfdf6e1..0cea2a5d 100644 --- a/retrace/d3d10state.hpp +++ b/retrace/d3d10state.hpp @@ -23,8 +23,7 @@ * **************************************************************************/ -#ifndef _D3D10STATE_HPP_ -#define _D3D10STATE_HPP_ +#pragma once #include <windows.h> @@ -120,4 +119,3 @@ getSubResourceImage(ID3D10Device *pDevice, } /* namespace d3dstate */ -#endif // _D3D10STATE_HPP_ diff --git a/retrace/d3d11state.hpp b/retrace/d3d11state.hpp index a6a18939..9438b658 100644 --- a/retrace/d3d11state.hpp +++ b/retrace/d3d11state.hpp @@ -23,8 +23,7 @@ * **************************************************************************/ -#ifndef _D3D11STATE_HPP_ -#define _D3D11STATE_HPP_ +#pragma once #include <windows.h> @@ -46,4 +45,3 @@ getSubResourceImage(ID3D11DeviceContext *pDevice, } /* namespace d3dstate */ -#endif // _D3D11STATE_HPP_ diff --git a/retrace/d3d9state.hpp b/retrace/d3d9state.hpp index 01791831..affb1221 100644 --- a/retrace/d3d9state.hpp +++ b/retrace/d3d9state.hpp @@ -24,8 +24,7 @@ **************************************************************************/ -#ifndef D3D9STATE_HPP -#define D3D9STATE_HPP +#pragma once #include <ostream> @@ -56,4 +55,3 @@ ConvertImage(D3DFORMAT SrcFormat, -#endif // D3D9STATE_HPP diff --git a/retrace/d3dretrace.hpp b/retrace/d3dretrace.hpp index 8ddc0c45..034e6165 100644 --- a/retrace/d3dretrace.hpp +++ b/retrace/d3dretrace.hpp @@ -23,8 +23,7 @@ * **************************************************************************/ -#ifndef _D3DRETRACE_HPP_ -#define _D3DRETRACE_HPP_ +#pragma once #include <windows.h> @@ -97,4 +96,3 @@ processEvents(void); } /* namespace d3dretrace */ -#endif /* _D3DRETRACE_HPP_ */ diff --git a/retrace/d3dretrace_dxgi.hpp b/retrace/d3dretrace_dxgi.hpp index eafc3054..b4e42e75 100644 --- a/retrace/d3dretrace_dxgi.hpp +++ b/retrace/d3dretrace_dxgi.hpp @@ -23,8 +23,7 @@ * **************************************************************************/ -#ifndef _D3DRETRACE_DXGI_HPP_ -#define _D3DRETRACE_DXGI_HPP_ +#pragma once #include "dxgiint.h" @@ -69,4 +68,3 @@ overrideQueryInterface(IUnknown *pThis, REFIID riid, void **ppvObj, HRESULT *pRe } /* namespace d3dretrace */ -#endif /* _D3DRETRACE_DXGI_HPP_ */ diff --git a/retrace/d3dstate.hpp b/retrace/d3dstate.hpp index f1fdcf64..f7276b15 100644 --- a/retrace/d3dstate.hpp +++ b/retrace/d3dstate.hpp @@ -23,8 +23,7 @@ * **************************************************************************/ -#ifndef _D3DSTATE_HPP_ -#define _D3DSTATE_HPP_ +#pragma once #include <iostream> @@ -159,4 +158,3 @@ dumpDevice(StateWriter &writer, ID3D11DeviceContext *pDeviceContext); } /* namespace d3dstate */ -#endif /* _D3DSTATE_HPP_ */ diff --git a/retrace/dxgistate.hpp b/retrace/dxgistate.hpp index 40e9eeb9..78cf4334 100644 --- a/retrace/dxgistate.hpp +++ b/retrace/dxgistate.hpp @@ -23,8 +23,7 @@ * **************************************************************************/ -#ifndef _DXGISTATE_HPP_ -#define _DXGISTATE_HPP_ +#pragma once #include <windows.h> @@ -73,4 +72,3 @@ getDXGIFormatName(DXGI_FORMAT format); } /* namespace d3dstate */ -#endif // _DXGISTATE_HPP_ diff --git a/retrace/glretrace.hpp b/retrace/glretrace.hpp index 2816a39a..756bace1 100644 --- a/retrace/glretrace.hpp +++ b/retrace/glretrace.hpp @@ -23,8 +23,7 @@ * **************************************************************************/ -#ifndef _GLRETRACE_HPP_ -#define _GLRETRACE_HPP_ +#pragma once #include "glws.hpp" #include "retrace.hpp" @@ -122,4 +121,3 @@ clientWaitSync(trace::Call &call, GLsync sync, GLbitfield flags, GLuint64 timeou } /* namespace glretrace */ -#endif /* _GLRETRACE_HPP_ */ diff --git a/retrace/glstate.hpp b/retrace/glstate.hpp index 7502c2eb..417a0328 100644 --- a/retrace/glstate.hpp +++ b/retrace/glstate.hpp @@ -23,8 +23,7 @@ * **************************************************************************/ -#ifndef _GLSTATE_HPP_ -#define _GLSTATE_HPP_ +#pragma once #include <ostream> @@ -72,4 +71,3 @@ getDrawBufferImage(void); } /* namespace glstate */ -#endif /* _GLSTATE_HPP_ */ diff --git a/retrace/glstate_internal.hpp b/retrace/glstate_internal.hpp index e1c6c7b3..90dd74c8 100644 --- a/retrace/glstate_internal.hpp +++ b/retrace/glstate_internal.hpp @@ -23,8 +23,7 @@ * **************************************************************************/ -#ifndef _GLSTATE_INTERNAL_HPP_ -#define _GLSTATE_INTERNAL_HPP_ +#pragma once #include "glimports.hpp" @@ -172,4 +171,3 @@ void dumpFramebuffer(StateWriter &writer, Context &context); } /* namespace glstate */ -#endif /* _GLSTATE_INTERNAL_HPP_ */ diff --git a/retrace/glws.hpp b/retrace/glws.hpp index 03c325dd..b6f9f166 100644 --- a/retrace/glws.hpp +++ b/retrace/glws.hpp @@ -27,8 +27,7 @@ * Abstraction for GL window system specific APIs (GLX, WGL). */ -#ifndef _GLWS_HPP_ -#define _GLWS_HPP_ +#pragma once #include <assert.h> @@ -183,4 +182,3 @@ processEvents(void); } /* namespace glws */ -#endif /* _GLWS_HPP_ */ diff --git a/retrace/glws_xlib.hpp b/retrace/glws_xlib.hpp index d703c931..68d32c20 100644 --- a/retrace/glws_xlib.hpp +++ b/retrace/glws_xlib.hpp @@ -27,8 +27,7 @@ * Common XLIB code, used by GLX and EGL. */ -#ifndef _GLWS_XLIB_HPP_ -#define _GLWS_XLIB_HPP_ +#pragma once #include "glimports.hpp" @@ -68,4 +67,3 @@ showWindow(Window window); } /* namespace glws */ -#endif /* _GLWS_XLIB_HPP_ */ diff --git a/retrace/retrace.hpp b/retrace/retrace.hpp index 697d70c9..46cd6012 100644 --- a/retrace/retrace.hpp +++ b/retrace/retrace.hpp @@ -25,8 +25,7 @@ * **************************************************************************/ -#ifndef _RETRACE_HPP_ -#define _RETRACE_HPP_ +#pragma once #include <assert.h> #include <string.h> @@ -252,4 +251,3 @@ cleanUp(void); } /* namespace retrace */ -#endif /* _RETRACE_HPP_ */ diff --git a/retrace/retrace_swizzle.hpp b/retrace/retrace_swizzle.hpp index f8d46e90..b5c74a9d 100644 --- a/retrace/retrace_swizzle.hpp +++ b/retrace/retrace_swizzle.hpp @@ -23,8 +23,7 @@ * **************************************************************************/ -#ifndef _RETRACE_SWIZZLE_HPP_ -#define _RETRACE_SWIZZLE_HPP_ +#pragma once #include <map> @@ -129,5 +128,4 @@ asObjPointer(trace::Call &call, trace::Value &value) { } /* namespace retrace */ -#endif /* _RETRACE_SWIZZLE_HPP_ */ diff --git a/retrace/scoped_allocator.hpp b/retrace/scoped_allocator.hpp index 84018c4c..b0066f58 100644 --- a/retrace/scoped_allocator.hpp +++ b/retrace/scoped_allocator.hpp @@ -23,8 +23,7 @@ * **************************************************************************/ -#ifndef _SCOPED_ALLOCATOR_HPP_ -#define _SCOPED_ALLOCATOR_HPP_ +#pragma once #include <assert.h> @@ -99,4 +98,3 @@ public: }; -#endif /* _SCOPED_ALLOCATOR_HPP_ */ diff --git a/wrappers/d3d9shader.hpp b/wrappers/d3d9shader.hpp index 340f03b3..91b9895a 100644 --- a/wrappers/d3d9shader.hpp +++ b/wrappers/d3d9shader.hpp @@ -24,8 +24,7 @@ * **************************************************************************/ -#ifndef _D3D9SHADER_HPP_ -#define _D3D9SHADER_HPP_ +#pragma once #include <windows.h> @@ -35,4 +34,3 @@ void DumpShader(trace::Writer &writer, const DWORD *tokens); -#endif /* _D3D9SHADER_HPP_ */ diff --git a/wrappers/d3dcommonshader.hpp b/wrappers/d3dcommonshader.hpp index 6d8500b8..1a73ab77 100644 --- a/wrappers/d3dcommonshader.hpp +++ b/wrappers/d3dcommonshader.hpp @@ -24,8 +24,7 @@ * **************************************************************************/ -#ifndef _D3DCOMMONSHADER_HPP_ -#define _D3DCOMMONSHADER_HPP_ +#pragma once #include <windows.h> @@ -35,4 +34,3 @@ void DumpShader(trace::Writer &writer, const void *pShaderBytecode, SIZE_T BytecodeLength); -#endif /* _D3DCOMMONSHADER_HPP_ */ diff --git a/wrappers/gltrace.hpp b/wrappers/gltrace.hpp index 721cf828..5b4a4f44 100644 --- a/wrappers/gltrace.hpp +++ b/wrappers/gltrace.hpp @@ -23,8 +23,7 @@ * **************************************************************************/ -#ifndef _GLTRACE_HPP_ -#define _GLTRACE_HPP_ +#pragma once #include <string.h> @@ -145,4 +144,3 @@ _glGetStringi_override(GLenum name, GLuint index); } /* namespace gltrace */ -#endif /* _GLRETRACE_HPP_ */ |