diff --git a/src/declarative/qml/parser/qdeclarativejsengine_p.cpp b/src/declarative/qml/parser/qdeclarativejsengine_p.cpp index f41467502..8a052c43a 100644 --- a/src/declarative/qml/parser/qdeclarativejsengine_p.cpp +++ b/src/declarative/qml/parser/qdeclarativejsengine_p.cpp @@ -80,7 +80,7 @@ NodePool::NodePool(const QString &fileName, Engine *engine) Code *NodePool::createCompiledCode(AST::Node *, CompilationUnit &) { - Q_ASSERT(0); + Q_ASSERT(false); return 0; } diff --git a/src/designer/components/formeditor/brushmanagerproxy.cpp b/src/designer/components/formeditor/brushmanagerproxy.cpp index 73125ff3b..704414a5a 100644 --- a/src/designer/components/formeditor/brushmanagerproxy.cpp +++ b/src/designer/components/formeditor/brushmanagerproxy.cpp @@ -256,7 +256,7 @@ void BrushManagerProxy::setBrushManager(QtBrushManager *manager) // load brushes from resources QFile qrcFile(QLatin1String(":trolltech/brushes/defaultbrushes.xml")); if (!qrcFile.open(QIODevice::ReadOnly)) - Q_ASSERT(0); + Q_ASSERT(false); QXmlStreamReader reader(&qrcFile); diff --git a/src/designer/components/formeditor/layout_propertysheet.cpp b/src/designer/components/formeditor/layout_propertysheet.cpp index a0d46fe82..306c5d536 100644 --- a/src/designer/components/formeditor/layout_propertysheet.cpp +++ b/src/designer/components/formeditor/layout_propertysheet.cpp @@ -141,7 +141,7 @@ static int getLayoutMargin(const QLayout *l, LayoutPropertyType type) case LayoutPropertyBottomMargin: return bottom; default: - Q_ASSERT(0); + Q_ASSERT(false); break; } return 0; @@ -166,7 +166,7 @@ static void setLayoutMargin(QLayout *l, LayoutPropertyType type, int margin) bottom = margin; break; default: - Q_ASSERT(0); + Q_ASSERT(false); break; } l->setContentsMargins(left, top, right, bottom); diff --git a/src/designer/components/formeditor/widgetselection.cpp b/src/designer/components/formeditor/widgetselection.cpp index a7ab771ef..8f34ca1a1 100644 --- a/src/designer/components/formeditor/widgetselection.cpp +++ b/src/designer/components/formeditor/widgetselection.cpp @@ -128,7 +128,7 @@ void WidgetHandle::updateCursor() setCursor(Qt::SizeHorCursor); break; default: - Q_ASSERT(0); + Q_ASSERT(false); } #endif } diff --git a/src/designer/shared/layout.cpp b/src/designer/shared/layout.cpp index cff56c440..b0ab3ce87 100644 --- a/src/designer/shared/layout.cpp +++ b/src/designer/shared/layout.cpp @@ -1267,7 +1267,7 @@ Layout* Layout::createLayout(const QWidgetList &widgets, QWidget *parentWidget, default: break; } - Q_ASSERT(0); + Q_ASSERT(false); return 0; } diff --git a/src/designer/shared/widgetfactory.cpp b/src/designer/shared/widgetfactory.cpp index 3f2332202..aed8e9a8d 100644 --- a/src/designer/shared/widgetfactory.cpp +++ b/src/designer/shared/widgetfactory.cpp @@ -443,7 +443,7 @@ QLayout *WidgetFactory::createUnmanagedLayout(QWidget *parentWidget, int type) case LayoutInfo::Form: return new QFormLayout(parentWidget); default: - Q_ASSERT(0); + Q_ASSERT(false); break; } return 0; diff --git a/src/gui/painting/qstroker.cpp b/src/gui/painting/qstroker.cpp index 309dc20c9..8efbe8a31 100644 --- a/src/gui/painting/qstroker.cpp +++ b/src/gui/painting/qstroker.cpp @@ -992,7 +992,7 @@ static inline void qdashstroker_lineTo(qfixed x, qfixed y, void *data) { } static inline void qdashstroker_cubicTo(qfixed, qfixed, qfixed, qfixed, qfixed, qfixed, void *) { - Q_ASSERT(0); + Q_ASSERT(false); // ((QStroker *) data)->cubicTo(c1x, c1y, c2x, c2y, ex, ey); } diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index 3e64e0ab2..b853567d5 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -783,7 +783,7 @@ static QVariant parseHeaderValue(QNetworkRequest::KnownHeaders header, const QBy return QVariant::fromValue(QNetworkCookie::parseCookies(value)); default: - Q_ASSERT(0); + Q_ASSERT(false); } return QVariant(); } diff --git a/src/plugins/accessible/widgets/itemviews.h b/src/plugins/accessible/widgets/itemviews.h index 92eddaf66..5f4c44985 100644 --- a/src/plugins/accessible/widgets/itemviews.h +++ b/src/plugins/accessible/widgets/itemviews.h @@ -126,7 +126,7 @@ protected: case QAccessible::Tree: return QAccessible::TreeItem; default: - Q_ASSERT(0); + Q_ASSERT(false); } return QAccessible::NoRole; } diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index 09258897e..4336d2d8d 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -924,7 +924,7 @@ struct QtMethodCaller params[i] = const_cast(v.constData()); break; default: - Q_ASSERT(0); + Q_ASSERT(false); } } diff --git a/src/scripttools/debugging/qscriptdebuggerconsole.cpp b/src/scripttools/debugging/qscriptdebuggerconsole.cpp index 384988706..aa3d9903d 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsole.cpp +++ b/src/scripttools/debugging/qscriptdebuggerconsole.cpp @@ -63,7 +63,7 @@ static QScriptValue debuggerResponseToScriptValue(QScriptEngine *eng, const QScr static void debuggerResponseFromScriptValue(const QScriptValue &, QScriptDebuggerResponse &) { - Q_ASSERT(0); + Q_ASSERT(false); } static QScriptValue breakpointDataToScriptValue(QScriptEngine *eng, const QScriptBreakpointData &in) @@ -108,7 +108,7 @@ static QScriptValue breakpointMapToScriptValue(QScriptEngine *eng, const QScript static void breakpointMapFromScriptValue(const QScriptValue &, QScriptBreakpointMap &) { - Q_ASSERT(0); + Q_ASSERT(false); } static QScriptValue scriptDataToScriptValue(QScriptEngine *eng, const QScriptScriptData &in) @@ -141,7 +141,7 @@ static QScriptValue scriptMapToScriptValue(QScriptEngine *eng, const QScriptScri static void scriptMapFromScriptValue(const QScriptValue &, QScriptScriptMap &) { - Q_ASSERT(0); + Q_ASSERT(false); } static QScriptValue consoleCommandToScriptValue( @@ -162,7 +162,7 @@ static QScriptValue consoleCommandToScriptValue( static void consoleCommandFromScriptValue( const QScriptValue &, QScriptDebuggerConsoleCommand* &) { - Q_ASSERT(0); + Q_ASSERT(false); } static QScriptValue consoleCommandGroupDataToScriptValue( @@ -177,7 +177,7 @@ static QScriptValue consoleCommandGroupDataToScriptValue( static void consoleCommandGroupDataFromScriptValue( const QScriptValue &, QScriptDebuggerConsoleCommandGroupData &) { - Q_ASSERT(0); + Q_ASSERT(false); } static QScriptValue consoleCommandGroupMapToScriptValue( @@ -194,7 +194,7 @@ static QScriptValue consoleCommandGroupMapToScriptValue( static void consoleCommandGroupMapFromScriptValue( const QScriptValue &, QScriptDebuggerConsoleCommandGroupMap &) { - Q_ASSERT(0); + Q_ASSERT(false); } static QScriptValue contextInfoToScriptValue(QScriptEngine *eng, const QScriptContextInfo &in) @@ -210,7 +210,7 @@ static QScriptValue contextInfoToScriptValue(QScriptEngine *eng, const QScriptCo static void contextInfoFromScriptValue(const QScriptValue &, QScriptContextInfo &) { - Q_ASSERT(0); + Q_ASSERT(false); } static QScriptValue debuggerScriptValuePropertyToScriptValue(QScriptEngine *eng, const QScriptDebuggerValueProperty &in) diff --git a/src/tools/designer/qdesigner_workbench.cpp b/src/tools/designer/qdesigner_workbench.cpp index 071c9ad32..069c5d123 100644 --- a/src/tools/designer/qdesigner_workbench.cpp +++ b/src/tools/designer/qdesigner_workbench.cpp @@ -327,7 +327,7 @@ Qt::WindowFlags QDesignerWorkbench::magicalWindowFlags() const case DockedMode: return Qt::Window | Qt::WindowShadeButtonHint | Qt::WindowSystemMenuHint | Qt::WindowTitleHint; default: - Q_ASSERT(0); + Q_ASSERT(false); return 0; } } @@ -346,7 +346,7 @@ QWidget *QDesignerWorkbench::magicalParent(const QWidget *w) const case NeutralMode: return 0; default: - Q_ASSERT(0); + Q_ASSERT(false); return 0; } } @@ -1045,7 +1045,7 @@ void QDesignerWorkbench::restoreUISettings() switchToDockedMode(); break; - default: Q_ASSERT(0); + default: Q_ASSERT(false); } ToolWindowFontSettings fontSettings = QDesignerSettings(m_core).toolWindowFont(); diff --git a/src/uitools/abstractformbuilder.cpp b/src/uitools/abstractformbuilder.cpp index eb9f643fe..b1d401489 100644 --- a/src/uitools/abstractformbuilder.cpp +++ b/src/uitools/abstractformbuilder.cpp @@ -103,7 +103,7 @@ using namespace QFormInternal; class QFriendlyLayout: public QLayout { public: - inline QFriendlyLayout() { Q_ASSERT(0); } + inline QFriendlyLayout() { Q_ASSERT(false); } #ifdef QFORMINTERNAL_NAMESPACE friend class QFormInternal::QAbstractFormBuilder; diff --git a/src/uitools/properties_p.h b/src/uitools/properties_p.h index 313cda929..4f999df19 100644 --- a/src/uitools/properties_p.h +++ b/src/uitools/properties_p.h @@ -91,24 +91,24 @@ class QAbstractFormBuilderGadget: public QWidget Q_PROPERTY(QLocale::Language language READ fakeLanguage) Q_PROPERTY(QLocale::Country country READ fakeCountry) public: - QAbstractFormBuilderGadget() { Q_ASSERT(0); } + QAbstractFormBuilderGadget() { Q_ASSERT(false); } - Qt::Orientation fakeOrientation() const { Q_ASSERT(0); return Qt::Horizontal; } - QSizePolicy::Policy fakeSizeType() const { Q_ASSERT(0); return QSizePolicy::Expanding; } - QPalette::ColorGroup fakeColorGroup() const { Q_ASSERT(0); return static_cast(0); } - QPalette::ColorRole fakeColorRole() const { Q_ASSERT(0); return static_cast(0); } - QFont::StyleStrategy fakeStyleStrategy() const { Q_ASSERT(0); return QFont::PreferDefault; } - Qt::CursorShape fakeCursorShape() const { Q_ASSERT(0); return Qt::ArrowCursor; } - Qt::BrushStyle fakeBrushStyle() const { Q_ASSERT(0); return Qt::NoBrush; } - Qt::ToolBarArea fakeToolBarArea() const { Q_ASSERT(0); return Qt::NoToolBarArea; } - QGradient::Type fakeGradientType() const { Q_ASSERT(0); return QGradient::NoGradient; } - QGradient::Spread fakeGradientSpread() const { Q_ASSERT(0); return QGradient::PadSpread; } - QGradient::CoordinateMode fakeGradientCoordinate() const { Q_ASSERT(0); return QGradient::LogicalMode; } - QLocale::Language fakeLanguage() const { Q_ASSERT(0); return QLocale::C; } - QLocale::Country fakeCountry() const { Q_ASSERT(0); return QLocale::AnyCountry; } - Qt::ItemFlags fakeItemFlags() const { Q_ASSERT(0); return Qt::NoItemFlags; } - Qt::CheckState fakeCheckState() const { Q_ASSERT(0); return Qt::Unchecked; } - Qt::Alignment fakeAlignment() const { Q_ASSERT(0); return Qt::AlignLeft; } + Qt::Orientation fakeOrientation() const { Q_ASSERT(false); return Qt::Horizontal; } + QSizePolicy::Policy fakeSizeType() const { Q_ASSERT(false); return QSizePolicy::Expanding; } + QPalette::ColorGroup fakeColorGroup() const { Q_ASSERT(false); return static_cast(0); } + QPalette::ColorRole fakeColorRole() const { Q_ASSERT(false); return static_cast(0); } + QFont::StyleStrategy fakeStyleStrategy() const { Q_ASSERT(false); return QFont::PreferDefault; } + Qt::CursorShape fakeCursorShape() const { Q_ASSERT(false); return Qt::ArrowCursor; } + Qt::BrushStyle fakeBrushStyle() const { Q_ASSERT(false); return Qt::NoBrush; } + Qt::ToolBarArea fakeToolBarArea() const { Q_ASSERT(false); return Qt::NoToolBarArea; } + QGradient::Type fakeGradientType() const { Q_ASSERT(false); return QGradient::NoGradient; } + QGradient::Spread fakeGradientSpread() const { Q_ASSERT(false); return QGradient::PadSpread; } + QGradient::CoordinateMode fakeGradientCoordinate() const { Q_ASSERT(false); return QGradient::LogicalMode; } + QLocale::Language fakeLanguage() const { Q_ASSERT(false); return QLocale::C; } + QLocale::Country fakeCountry() const { Q_ASSERT(false); return QLocale::AnyCountry; } + Qt::ItemFlags fakeItemFlags() const { Q_ASSERT(false); return Qt::NoItemFlags; } + Qt::CheckState fakeCheckState() const { Q_ASSERT(false); return Qt::Unchecked; } + Qt::Alignment fakeAlignment() const { Q_ASSERT(false); return Qt::AlignLeft; } }; // Convert key to value for a given QMetaEnum