Remove -Wno-reorder

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1c9555a00f3c87fba00196d223fc45d4b672d2b..49029f3652beac83bf5bd554c3a573dc88035388 100644 (file)
--- 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 007d51afd474c0cac22c8c68bb5469cdc1a32203..3629abd8782e44091a54057bc002979a7ec71f83 100644 (file)
--- 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 87cb205c15b4afd6fc7519b3458b08d380f717d7..6a08cecd8c63a3afe63ff54a12cb7c869705435e 100644 (file)
--- 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 8ee515ffd54852eac2a5282b5325397ff5aa5591..6961bf39eaeea9c31c14df53c97168b41ab05d89 100644 (file)
--- 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 ),