1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MSVC warnings about inconsistent DLL linkage.

Browse Source 
Change-Id: I42f817caf212b871cd00f976054381487b238d31
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Friedemann Kleint 2012-05-07 09:33:27 +02:00 committed by Qt by Nokia
parent f60bf8a18a
commit 864f930ba9
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/tools/qstring.cpp
View File

@ -372,7 +372,7 @@ inline char qToLower(char ch)
/*! /*!
\internal \internal
*/ */
bool qStringComparisonHelper(const QString &s1, const char *s2) Q_CORE_EXPORT bool qStringComparisonHelper(const QString &s1, const char *s2)
{ {
// ### optimize me // ### optimize me
return s1 == QString::fromAscii(s2); return s1 == QString::fromAscii(s2);
@ -381,7 +381,7 @@ bool qStringComparisonHelper(const QString &s1, const char *s2)
/*! /*!
\internal \internal
*/ */
bool qStringComparisonHelper(const QString &s1, const QByteArray &s2) Q_CORE_EXPORT bool qStringComparisonHelper(const QString &s1, const QByteArray &s2)
{ {
// ### optimize me // ### optimize me
return s1 == QString::fromAscii(s2); return s1 == QString::fromAscii(s2);
@ -390,7 +390,7 @@ bool qStringComparisonHelper(const QString &s1, const QByteArray &s2)
/*! /*!
\internal \internal
*/ */
bool qStringComparisonHelper(const QStringRef &s1, const char *s2) Q_CORE_EXPORT bool qStringComparisonHelper(const QStringRef &s1, const char *s2)
{ {
// ### optimize me // ### optimize me
return s1 == QString::fromAscii(s2); return s1 == QString::fromAscii(s2);
@ -399,7 +399,7 @@ bool qStringComparisonHelper(const QStringRef &s1, const char *s2)
/*! /*!
\internal \internal
*/ */
bool qStringComparisonHelper(const QStringRef &s1, const QByteArray &s2) Q_CORE_EXPORT bool qStringComparisonHelper(const QStringRef &s1, const QByteArray &s2)
{ {
// ### optimize me // ### optimize me
return s1 == QString::fromAscii(s2); return s1 == QString::fromAscii(s2);

8
src/corelib/tools/qstring.h
View File

@ -674,10 +674,10 @@ private:
friend class QTextCodec; friend class QTextCodec;
friend class QStringRef; friend class QStringRef;
friend struct QAbstractConcatenable; friend struct QAbstractConcatenable;
friend bool qStringComparisonHelper(const QString &s1, const char *s2); friend Q_CORE_EXPORT bool qStringComparisonHelper(const QString &s1, const char *s2);
friend bool qStringComparisonHelper(const QString &s1, const QByteArray &s2); friend Q_CORE_EXPORT bool qStringComparisonHelper(const QString &s1, const QByteArray &s2);
friend bool qStringComparisonHelper(const QStringRef &s1, const char *s2); friend Q_CORE_EXPORT bool qStringComparisonHelper(const QStringRef &s1, const char *s2);
friend bool qStringComparisonHelper(const QStringRef &s1, const QByteArray &s2); friend Q_CORE_EXPORT bool qStringComparisonHelper(const QStringRef &s1, const QByteArray &s2);
public: public:
typedef Data * DataPtr; typedef Data * DataPtr;
inline DataPtr &data_ptr() { return d; } inline DataPtr &data_ptr() { return d; }