From f480045309dab954030ed19b5e8f99137aa7c9f4 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 12 Apr 2016 15:43:13 +0200 Subject: [PATCH] Changed: Q_COMPILER_RVALUE_REFS hack useless with Qt 5.6 --- code/nel/tools/3d/object_viewer_widget/src/stdpch.h | 6 ------ code/nel/tools/3d/panoply_preview/main_window.h | 6 ------ code/nel/tools/3d/panoply_preview/panoply_preview.h | 6 ------ code/nel/tools/3d/shared_widgets/command_log.h | 6 ------ code/nel/tools/3d/tile_edit_qt/common.h | 6 ------ code/nel/tools/misc/crash_report/crash_report_data.h | 6 ------ code/nel/tools/misc/words_dic_qt/words_dicDlg.h | 6 ------ code/ryzom/tools/client/client_config_qt/stdpch.h | 8 -------- 8 files changed, 50 deletions(-) diff --git a/code/nel/tools/3d/object_viewer_widget/src/stdpch.h b/code/nel/tools/3d/object_viewer_widget/src/stdpch.h index 2c5b38f92..588d8a898 100644 --- a/code/nel/tools/3d/object_viewer_widget/src/stdpch.h +++ b/code/nel/tools/3d/object_viewer_widget/src/stdpch.h @@ -29,12 +29,6 @@ along with this program. If not, see . #undef free #endif -#include - -#ifdef Q_COMPILER_RVALUE_REFS -#undef Q_COMPILER_RVALUE_REFS -#endif - #include #include diff --git a/code/nel/tools/3d/panoply_preview/main_window.h b/code/nel/tools/3d/panoply_preview/main_window.h index 1d864249b..3e3d2f025 100644 --- a/code/nel/tools/3d/panoply_preview/main_window.h +++ b/code/nel/tools/3d/panoply_preview/main_window.h @@ -21,12 +21,6 @@ // STL includes // Qt includes -#include - -#ifdef Q_COMPILER_RVALUE_REFS -#undef Q_COMPILER_RVALUE_REFS -#endif - #include // NeL includes diff --git a/code/nel/tools/3d/panoply_preview/panoply_preview.h b/code/nel/tools/3d/panoply_preview/panoply_preview.h index 794a223f8..9fbe2bad3 100644 --- a/code/nel/tools/3d/panoply_preview/panoply_preview.h +++ b/code/nel/tools/3d/panoply_preview/panoply_preview.h @@ -21,12 +21,6 @@ // STL includes // Qt includes -#include - -#ifdef Q_COMPILER_RVALUE_REFS -#undef Q_COMPILER_RVALUE_REFS -#endif - #include #include #include diff --git a/code/nel/tools/3d/shared_widgets/command_log.h b/code/nel/tools/3d/shared_widgets/command_log.h index 16bc21c9d..ec6332601 100644 --- a/code/nel/tools/3d/shared_widgets/command_log.h +++ b/code/nel/tools/3d/shared_widgets/command_log.h @@ -34,12 +34,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // STL includes // Qt includes -#include - -#ifdef Q_COMPILER_RVALUE_REFS -#undef Q_COMPILER_RVALUE_REFS -#endif - #include #include #include diff --git a/code/nel/tools/3d/tile_edit_qt/common.h b/code/nel/tools/3d/tile_edit_qt/common.h index 685195251..6cafbbd8a 100644 --- a/code/nel/tools/3d/tile_edit_qt/common.h +++ b/code/nel/tools/3d/tile_edit_qt/common.h @@ -26,12 +26,6 @@ #undef free #endif -#include - -#ifdef Q_COMPILER_RVALUE_REFS -#undef Q_COMPILER_RVALUE_REFS -#endif - #include #include diff --git a/code/nel/tools/misc/crash_report/crash_report_data.h b/code/nel/tools/misc/crash_report/crash_report_data.h index 8a7f2ffcb..f2d222189 100644 --- a/code/nel/tools/misc/crash_report/crash_report_data.h +++ b/code/nel/tools/misc/crash_report/crash_report_data.h @@ -20,12 +20,6 @@ #ifndef RCERROR_DATA #define RCERROR_DATA -#include - -#ifdef Q_COMPILER_RVALUE_REFS -#undef Q_COMPILER_RVALUE_REFS -#endif - #include struct SCrashReportData diff --git a/code/nel/tools/misc/words_dic_qt/words_dicDlg.h b/code/nel/tools/misc/words_dic_qt/words_dicDlg.h index 707eaaa44..dcf27e838 100644 --- a/code/nel/tools/misc/words_dic_qt/words_dicDlg.h +++ b/code/nel/tools/misc/words_dic_qt/words_dicDlg.h @@ -1,12 +1,6 @@ #ifndef WORDS_DICDLG_H #define WORDS_DICDLG_H -#include - -#ifdef Q_COMPILER_RVALUE_REFS -#undef Q_COMPILER_RVALUE_REFS -#endif - #include #include "ui_words_dic_Qt.h" diff --git a/code/ryzom/tools/client/client_config_qt/stdpch.h b/code/ryzom/tools/client/client_config_qt/stdpch.h index 744899ecd..112cd5c45 100644 --- a/code/ryzom/tools/client/client_config_qt/stdpch.h +++ b/code/ryzom/tools/client/client_config_qt/stdpch.h @@ -17,14 +17,6 @@ #ifndef STDPCH_H #define STDPCH_H -#include - -#ifdef Q_COMPILER_RVALUE_REFS -#undef Q_COMPILER_RVALUE_REFS -#endif - -#include - #include #include