From f293853a8bce6ee74498c412fc25deed9e7801c9 Mon Sep 17 00:00:00 2001 From: TimePath Date: Sun, 6 Aug 2017 20:08:48 +1000 Subject: [PATCH] Remove -Wno-reorder --- CMakeLists.txt | 1 - contrib/bobtoolz/bobToolz-GTK.cpp | 4 ++-- radiant/filetypes.cpp | 2 +- radiant/texwindow.cpp | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f1c9555a..49029f36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,7 +99,6 @@ addflags_c("-Wno-int-conversion") addflags_c("-Wno-pointer-to-int-cast") addflags_c("-Wno-incompatible-pointer-types") -addflags_cxx("-Wno-reorder") addflags_cxx("-Wno-delete-non-virtual-dtor") set(CMAKE_POSITION_INDEPENDENT_CODE 1) diff --git a/contrib/bobtoolz/bobToolz-GTK.cpp b/contrib/bobtoolz/bobToolz-GTK.cpp index 007d51af..3629abd8 100644 --- a/contrib/bobtoolz/bobToolz-GTK.cpp +++ b/contrib/bobtoolz/bobToolz-GTK.cpp @@ -284,10 +284,10 @@ class BobToolzPluginDependencies : public: BobToolzPluginDependencies() : GlobalEntityModuleRef( GlobalRadiant().getRequiredGameDescriptionKeyValue( "entities" ) ), + GlobalEntityClassManagerModuleRef( GlobalRadiant().getRequiredGameDescriptionKeyValue( "entityclass" ) ), GlobalShadersModuleRef( GlobalRadiant().getRequiredGameDescriptionKeyValue( "shaders" ) ), GlobalBrushModuleRef( GlobalRadiant().getRequiredGameDescriptionKeyValue( "brushtypes" ) ), - GlobalPatchModuleRef( GlobalRadiant().getRequiredGameDescriptionKeyValue( "patchtypes" ) ), - GlobalEntityClassManagerModuleRef( GlobalRadiant().getRequiredGameDescriptionKeyValue( "entityclass" ) ){ + GlobalPatchModuleRef( GlobalRadiant().getRequiredGameDescriptionKeyValue( "patchtypes" ) ){ } }; diff --git a/radiant/filetypes.cpp b/radiant/filetypes.cpp index 87cb205c..6a08cecd 100644 --- a/radiant/filetypes.cpp +++ b/radiant/filetypes.cpp @@ -35,7 +35,7 @@ class RadiantFileTypeRegistry : public IFileTypeRegistry struct filetype_copy_t { filetype_copy_t( const char* moduleName, const filetype_t other ) - : m_moduleName( moduleName ), m_name( other.name ), m_pattern( other.pattern ), m_can_load( other.can_load ), m_can_import( other.can_import ), m_can_save( other.can_save ){ + : m_can_load( other.can_load ), m_can_import( other.can_import ), m_can_save( other.can_save ), m_moduleName( moduleName ), m_name( other.name ), m_pattern( other.pattern ) { } const char* getModuleName() const { return m_moduleName.c_str(); diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index 8ee515ff..6961bf39 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -349,11 +349,11 @@ int getTextureHeight( qtexture_t* tex ){ TextureBrowser() : m_texture_scroll( 0 ), m_hideunused_item( TextureBrowserHideUnusedExport() ), + m_hidenotex_item( TextureBrowserFilterFallbackExport() ), m_showshaders_item( TextureBrowserShowShadersExport() ), m_showshaderlistonly_item( TextureBrowserShowShaderlistOnlyExport() ), m_fixedsize_item( TextureBrowserFixedSizeExport() ), m_filternotex_item( TextureBrowserFilterMissingExport() ), - m_hidenotex_item( TextureBrowserFilterFallbackExport() ), m_enablealpha_item( TextureBrowserEnableAlphaExport() ), m_heightChanged( true ), m_originInvalid( true ), -- 2.39.2