From 9a75b154bf0732aa3a501b6e31e566e06c5f8a31 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 2 Mar 2012 02:11:59 -0600 Subject: Undo prior accidental commit --- src/styles/qcommonstyle.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/styles/qcommonstyle.cpp') diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp index 076b259..faf3649 100644 --- a/src/styles/qcommonstyle.cpp +++ b/src/styles/qcommonstyle.cpp @@ -611,7 +611,7 @@ void QCommonStyle::drawControl( ControlElement element, { #if defined(QT_CHECK_STATE) if (! widget) { - tqWarning("QCommonStyle::drawControl: widget parameter cannot be zero!"); + qWarning("QCommonStyle::drawControl: widget parameter cannot be zero!"); return; } #endif @@ -1139,7 +1139,7 @@ QRect QCommonStyle::subRect(SubRect r, const QWidget *widget) const { #if defined(QT_CHECK_STATE) if (! widget) { - tqWarning("QCommonStyle::subRect: widget parameter cannot be zero!"); + qWarning("QCommonStyle::subRect: widget parameter cannot be zero!"); return QRect(); } #endif @@ -1491,7 +1491,7 @@ void QCommonStyle::drawComplexControl( ComplexControl control, { #if defined(QT_CHECK_STATE) if (! widget) { - tqWarning("QCommonStyle::drawComplexControl: widget parameter cannot be zero!"); + qWarning("QCommonStyle::drawComplexControl: widget parameter cannot be zero!"); return; } #endif @@ -1917,7 +1917,7 @@ QRect QCommonStyle::querySubControlMetrics( ComplexControl control, { #if defined(QT_CHECK_STATE) if (! widget) { - tqWarning("QCommonStyle::querySubControlMetrics: widget parameter cannot be zero!"); + qWarning("QCommonStyle::querySubControlMetrics: widget parameter cannot be zero!"); return QRect(); } #endif @@ -2468,7 +2468,7 @@ QSize QCommonStyle::sizeFromContents(ContentsType contents, #if defined(QT_CHECK_STATE) if (! widget) { - tqWarning("QCommonStyle::sizeFromContents: widget parameter cannot be zero!"); + qWarning("QCommonStyle::sizeFromContents: widget parameter cannot be zero!"); return sz; } #endif -- cgit v1.2.1