Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-04-12 15:43:47 +02:00
commit 346a0297f6
10 changed files with 170 additions and 220 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/nel/tools/3d/object_viewer_widget/src/stdpch.h
View file

@ -29,12 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#undef free #undef free
#endif #endif
#include <qglobal.h>
#ifdef Q_COMPILER_RVALUE_REFS
#undef Q_COMPILER_RVALUE_REFS
#endif
#include <QtCore/QtCore> #include <QtCore/QtCore>
#include <QtGui/QtGui> #include <QtGui/QtGui>

6
code/nel/tools/3d/panoply_preview/main_window.h
View file

@ -21,12 +21,6 @@
// STL includes // STL includes
// Qt includes // Qt includes
#include <qglobal.h>
#ifdef Q_COMPILER_RVALUE_REFS
#undef Q_COMPILER_RVALUE_REFS
#endif
#include <QMainWindow> #include <QMainWindow>
// NeL includes // NeL includes

6
code/nel/tools/3d/panoply_preview/panoply_preview.h
View file

@ -21,12 +21,6 @@
// STL includes // STL includes
// Qt includes // Qt includes
#include <qglobal.h>
#ifdef Q_COMPILER_RVALUE_REFS
#undef Q_COMPILER_RVALUE_REFS
#endif
#include <QWidget> #include <QWidget>
#include <QTextEdit> #include <QTextEdit>
#include <QLineEdit> #include <QLineEdit>

6
code/nel/tools/3d/shared_widgets/command_log.h
View file

@ -34,12 +34,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// STL includes // STL includes
// Qt includes // Qt includes
#include <qglobal.h>
#ifdef Q_COMPILER_RVALUE_REFS
#undef Q_COMPILER_RVALUE_REFS
#endif
#include <QWidget> #include <QWidget>
#include <QTextEdit> #include <QTextEdit>
#include <QLineEdit> #include <QLineEdit>

6
code/nel/tools/3d/tile_edit_qt/common.h
View file

@ -26,12 +26,6 @@
#undef free #undef free
#endif #endif
#include <qglobal.h>
#ifdef Q_COMPILER_RVALUE_REFS
#undef Q_COMPILER_RVALUE_REFS
#endif
#include <QtCore/QtCore> #include <QtCore/QtCore>
#include <QtGui/QtGui> #include <QtGui/QtGui>

6
code/nel/tools/misc/crash_report/crash_report_data.h
View file

@ -20,12 +20,6 @@
#ifndef RCERROR_DATA #ifndef RCERROR_DATA
#define RCERROR_DATA #define RCERROR_DATA
#include <qglobal.h>
#ifdef Q_COMPILER_RVALUE_REFS
#undef Q_COMPILER_RVALUE_REFS
#endif
#include <QString> #include <QString>
struct SCrashReportData struct SCrashReportData

6
code/nel/tools/misc/words_dic_qt/words_dicDlg.h
View file

@ -1,12 +1,6 @@
#ifndef WORDS_DICDLG_H #ifndef WORDS_DICDLG_H
#define WORDS_DICDLG_H #define WORDS_DICDLG_H
#include <qglobal.h>
#ifdef Q_COMPILER_RVALUE_REFS
#undef Q_COMPILER_RVALUE_REFS
#endif
#include <QMainWindow> #include <QMainWindow>
#include "ui_words_dic_Qt.h" #include "ui_words_dic_Qt.h"

2
code/ryzom/client/src/http_client_curl.cpp
View file

@ -148,7 +148,7 @@ bool CCurlHttpClient::verifyServer(bool verify)
curl_easy_setopt(_Curl, CURLOPT_SSL_VERIFYPEER, verify ? 1 : 0); curl_easy_setopt(_Curl, CURLOPT_SSL_VERIFYPEER, verify ? 1 : 0);
curl_easy_setopt(_Curl, CURLOPT_SSLCERTTYPE, "PEM"); curl_easy_setopt(_Curl, CURLOPT_SSLCERTTYPE, "PEM");
// would allow to provide the CA in memory instead of using CURLOPT_CAINFO, but needs to include and link OpenSSL // would allow to provide the CA in memory instead of using CURLOPT_CAINFO, but needs to include and link OpenSSL
if (curl_easy_setopt(_Curl, CURLOPT_SSL_CTX_FUNCTION, *sslctx_function) == CURLE_NOT_BUILT_IN) if (curl_easy_setopt(_Curl, CURLOPT_SSL_CTX_FUNCTION, *sslctx_function) != CURLE_OK)
{ {
nlwarning("Unable to support CURLOPT_SSL_CTX_FUNCTION, curl not compiled with OpenSSL ?"); nlwarning("Unable to support CURLOPT_SSL_CTX_FUNCTION, curl not compiled with OpenSSL ?");
} }

8
code/ryzom/tools/client/client_config_qt/stdpch.h
View file

@ -17,14 +17,6 @@
#ifndef STDPCH_H #ifndef STDPCH_H
#define STDPCH_H #define STDPCH_H
#include <qglobal.h>
#ifdef Q_COMPILER_RVALUE_REFS
#undef Q_COMPILER_RVALUE_REFS
#endif
#include <string>
#include <nel/misc/types_nl.h> #include <nel/misc/types_nl.h>
#include <nel/misc/config_file.h> #include <nel/misc/config_file.h>