From bcd8645639fe58bf3513a40c12624ec755e0f4c8 2013-10-03 10:30:46 From: Titta Heikkala Date: 2013-10-03 10:30:46 Subject: [PATCH] Fix Chart build when QT_NO_TEXTSTREAM is defined If QT_NO_TEXTSTREAM is defined the operator<< can't be used. It's safe to flag out the streaming operator debug information because the function itself can't be used when QT_NO_TEXTSTREAM is defined. Task-number: QTRD-2336 Change-Id: I2d64f4dd03bf65e7ae0e07f4916f245bc71a7458 Reviewed-by: Miikka Heikkinen --- diff --git a/src/domain/abstractdomain.cpp b/src/domain/abstractdomain.cpp index 2b9c751..814cdc6 100644 --- a/src/domain/abstractdomain.cpp +++ b/src/domain/abstractdomain.cpp @@ -242,7 +242,11 @@ bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator!= (const AbstractDomain &domain1 QDebug QTCOMMERCIALCHART_AUTOTEST_EXPORT operator<<(QDebug dbg, const AbstractDomain &domain) { +#ifdef QT_NO_TEXTSTREAM + Q_UNUSED(domain) +#else dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size; +#endif return dbg.maybeSpace(); } diff --git a/src/domain/logxlogydomain.cpp b/src/domain/logxlogydomain.cpp index 85b9a01..ae7190b 100644 --- a/src/domain/logxlogydomain.cpp +++ b/src/domain/logxlogydomain.cpp @@ -265,7 +265,11 @@ bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator!= (const LogXLogYDomain &domain1 QDebug QTCOMMERCIALCHART_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXLogYDomain &domain) { +#ifdef QT_NO_TEXTSTREAM + Q_UNUSED(domain) +#else dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size; +#endif return dbg.maybeSpace(); } diff --git a/src/domain/logxlogypolardomain.cpp b/src/domain/logxlogypolardomain.cpp index 0a2cc84..6ada0b7 100644 --- a/src/domain/logxlogypolardomain.cpp +++ b/src/domain/logxlogypolardomain.cpp @@ -260,7 +260,11 @@ bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator!= (const LogXLogYPolarDomain &do QDebug QTCOMMERCIALCHART_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXLogYPolarDomain &domain) { +#ifdef QT_NO_TEXTSTREAM + Q_UNUSED(domain) +#else dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size; +#endif return dbg.maybeSpace(); } diff --git a/src/domain/logxydomain.cpp b/src/domain/logxydomain.cpp index b42d1b6..fa7ef53 100644 --- a/src/domain/logxydomain.cpp +++ b/src/domain/logxydomain.cpp @@ -232,7 +232,11 @@ bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator!= (const LogXYDomain &domain1, c QDebug QTCOMMERCIALCHART_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXYDomain &domain) { +#ifdef QT_NO_TEXTSTREAM + Q_UNUSED(domain) +#else dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size; +#endif return dbg.maybeSpace(); } diff --git a/src/domain/logxypolardomain.cpp b/src/domain/logxypolardomain.cpp index 2cb210f..989aed2 100644 --- a/src/domain/logxypolardomain.cpp +++ b/src/domain/logxypolardomain.cpp @@ -229,7 +229,11 @@ bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator!= (const LogXYPolarDomain &domai QDebug QTCOMMERCIALCHART_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXYPolarDomain &domain) { +#ifdef QT_NO_TEXTSTREAM + Q_UNUSED(domain) +#else dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size; +#endif return dbg.maybeSpace(); } diff --git a/src/domain/xlogydomain.cpp b/src/domain/xlogydomain.cpp index 494e8f5..7d6f07c 100644 --- a/src/domain/xlogydomain.cpp +++ b/src/domain/xlogydomain.cpp @@ -228,7 +228,11 @@ bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator!= (const XLogYDomain &domain1, c QDebug QTCOMMERCIALCHART_AUTOTEST_EXPORT operator<<(QDebug dbg, const XLogYDomain &domain) { +#ifdef QT_NO_TEXTSTREAM + Q_UNUSED(domain) +#else dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size; +#endif return dbg.maybeSpace(); } diff --git a/src/domain/xlogypolardomain.cpp b/src/domain/xlogypolardomain.cpp index cf0158e..36a7e6d 100644 --- a/src/domain/xlogypolardomain.cpp +++ b/src/domain/xlogypolardomain.cpp @@ -224,7 +224,11 @@ bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator!= (const XLogYPolarDomain &domai QDebug QTCOMMERCIALCHART_AUTOTEST_EXPORT operator<<(QDebug dbg, const XLogYPolarDomain &domain) { +#ifdef QT_NO_TEXTSTREAM + Q_UNUSED(domain) +#else dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size; +#endif return dbg.maybeSpace(); } diff --git a/src/domain/xydomain.cpp b/src/domain/xydomain.cpp index 8b41e73..83cc051 100644 --- a/src/domain/xydomain.cpp +++ b/src/domain/xydomain.cpp @@ -173,7 +173,11 @@ bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator!= (const XYDomain &domain1, cons QDebug QTCOMMERCIALCHART_AUTOTEST_EXPORT operator<<(QDebug dbg, const XYDomain &domain) { +#ifdef QT_NO_TEXTSTREAM + Q_UNUSED(domain) +#else dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size; +#endif return dbg.maybeSpace(); } diff --git a/src/domain/xypolardomain.cpp b/src/domain/xypolardomain.cpp index 03b5a89..ac01f17 100644 --- a/src/domain/xypolardomain.cpp +++ b/src/domain/xypolardomain.cpp @@ -171,7 +171,11 @@ bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator!= (const XYPolarDomain &domain1, QDebug QTCOMMERCIALCHART_AUTOTEST_EXPORT operator<<(QDebug dbg, const XYPolarDomain &domain) { +#ifdef QT_NO_TEXTSTREAM + Q_UNUSED(domain) +#else dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size; +#endif return dbg.maybeSpace(); }