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

make ProString c'tors explicit only when not building qmake

Browse Source 
otherwise it's impossible to migrate the qmake generators to this.

Change-Id: I70c848da2ce428706b960c3c1434c26f7e3a9447
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-08-21 19:23:53 +02:00
parent fddd20ffad
commit d97de7e43f
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/shared/proparser/proitems.h
View File

@@ -52,6 +52,12 @@ private:
}; };
#endif #endif
#ifndef QT_BUILD_QMAKE
# define PROITEM_EXPLICIT explicit
#else
# define PROITEM_EXPLICIT
#endif
class ProKey; class ProKey;
class ProStringList; class ProStringList;
class ProFile; class ProFile;
@@ -60,8 +66,8 @@ class ProString {
public: public:
ProString(); ProString();
ProString(const ProString &other); ProString(const ProString &other);
explicit ProString(const QString &str); PROITEM_EXPLICIT ProString(const QString &str);
explicit ProString(const char *str); PROITEM_EXPLICIT ProString(const char *str);
ProString(const QString &str, int offset, int length); ProString(const QString &str, int offset, int length);
void setValue(const QString &str); void setValue(const QString &str);
ProString &setSource(const ProString &other) { m_file = other.m_file; return *this; } ProString &setSource(const ProString &other) { m_file = other.m_file; return *this; }
@@ -122,7 +128,7 @@ class ProKey : public ProString {
public: public:
ALWAYS_INLINE ProKey() : ProString() {} ALWAYS_INLINE ProKey() : ProString() {}
explicit ProKey(const QString &str); explicit ProKey(const QString &str);
explicit ProKey(const char *str); PROITEM_EXPLICIT ProKey(const char *str);
ProKey(const QString &str, int off, int len); ProKey(const QString &str, int off, int len);
ProKey(const QString &str, int off, int len, uint hash); ProKey(const QString &str, int off, int len, uint hash);
void setValue(const QString &str); void setValue(const QString &str);