feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix warnings

Browse Source 
Warnings came up using MinGW 4.4:
* botan.cpp: integer constant is too large for 'long' type
* dnssd_clientlib.c, dnssd_clientstub.c: ignoring #pragma warning
* hostutils.cpp: comparison between signed and unsigned integer expressions
* qmakebuildins.cpp: 'QString windowsErrorCode()' defined but not used

Change-Id: I80827f7f740ff380f13cef96d6b43baaa7e179cb
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Orgad Shaneh
2012-09-16 11:15:08 +03:00
committed by hjk
parent e7605b46b7
commit 0e13cf3faf
6 changed files with 1783 additions and 1779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3552
src/libs/3rdparty/botan/botan.cpp vendored
View File

File diff suppressed because it is too large Load Diff

2
src/libs/zeroconf/embed/dnssd_clientlib.c
View File

@@ -36,8 +36,10 @@
#endif #endif
#if defined(_WIN32) #if defined(_WIN32)
#ifdef _MSC_VER
// disable warning "conversion from <data> to uint16_t" // disable warning "conversion from <data> to uint16_t"
#pragma warning(disable:4244) #pragma warning(disable:4244)
#endif
#define strncasecmp _strnicmp #define strncasecmp _strnicmp
#define strcasecmp _stricmp #define strcasecmp _stricmp
#endif #endif

2
src/libs/zeroconf/embed/dnssd_clientstub.c
View File

@@ -56,11 +56,13 @@ static int gDaemonErr = kDNSServiceErr_NoError;
#define sockaddr_mdns sockaddr_in #define sockaddr_mdns sockaddr_in
#define AF_MDNS AF_INET #define AF_MDNS AF_INET
#ifdef _MSC_VER
// Disable warning: "'type cast' : from data pointer 'void *' to function pointer" // Disable warning: "'type cast' : from data pointer 'void *' to function pointer"
#pragma warning(disable:4055) #pragma warning(disable:4055)
// Disable warning: "nonstandard extension, function/data pointer conversion in expression" // Disable warning: "nonstandard extension, function/data pointer conversion in expression"
#pragma warning(disable:4152) #pragma warning(disable:4152)
#endif
//extern BOOL IsSystemServiceDisabled(); //extern BOOL IsSystemServiceDisabled();

2
src/plugins/debugger/shared/hostutils.cpp
View File

@@ -206,7 +206,7 @@ void formatWindowsException(unsigned long code, quint64 address,
str.setIntegerBase(10); str.setIntegerBase(10);
} }
bool isDebuggerWinException(long code) bool isDebuggerWinException(unsigned long code)
{ {
return code == EXCEPTION_BREAKPOINT || code == EXCEPTION_SINGLE_STEP; return code == EXCEPTION_BREAKPOINT || code == EXCEPTION_SINGLE_STEP;
} }

2
src/plugins/debugger/shared/hostutils.h
View File

@@ -74,7 +74,7 @@ void formatWindowsException(unsigned long code, quint64 address,
bool isFatalWinException(long code); bool isFatalWinException(long code);
// Check for EXCEPTION_BREAKPOINT, EXCEPTION_SINGLE_STEP // Check for EXCEPTION_BREAKPOINT, EXCEPTION_SINGLE_STEP
bool isDebuggerWinException(long code); bool isDebuggerWinException(unsigned long code);
#endif // defined(Q_OS_WIN) #endif // defined(Q_OS_WIN)

2
src/shared/proparser/qmakebuiltins.cpp
View File

@@ -184,7 +184,7 @@ static bool isTrue(const ProString &_str, QString &tmp)
return !str.compare(statics.strtrue, Qt::CaseInsensitive) || str.toInt(); return !str.compare(statics.strtrue, Qt::CaseInsensitive) || str.toInt();
} }
#ifdef Q_OS_WIN #if defined(Q_OS_WIN) && defined(PROEVALUATOR_FULL)
static QString windowsErrorCode() static QString windowsErrorCode()
{ {
wchar_t *string = 0; wchar_t *string = 0;