Remove -Wno-reorder
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 6 Aug 2017 10:08:48 +0000 (20:08 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 6 Aug 2017 10:08:48 +0000 (20:08 +1000)
CMakeLists.txt
contrib/bobtoolz/bobToolz-GTK.cpp
radiant/filetypes.cpp
radiant/texwindow.cpp

index f1c9555..49029f3 100644 (file)
@@ -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)
index 007d51a..3629abd 100644 (file)
@@ -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" ) ){
 }
 };
 
index 87cb205..6a08cec 100644 (file)
@@ -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();
index 8ee515f..6961bf3 100644 (file)
@@ -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 ),