summaryrefslogtreecommitdiffstats
path: root/src/widgets/qscrollview.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-03-02 02:11:59 -0600
committerTimothy Pearson <[email protected]>2012-03-02 02:11:59 -0600
commit9a75b154bf0732aa3a501b6e31e566e06c5f8a31 (patch)
treedf1e10cc7504665622d096f9ba80dc9e56f3afb8 /src/widgets/qscrollview.cpp
parenta830bf10b7d4ed2c83ffe68c0b22d7c4ba9860b0 (diff)
downloadqt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.tar.gz
qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.zip
Undo prior accidental commit
Diffstat (limited to 'src/widgets/qscrollview.cpp')
-rw-r--r--src/widgets/qscrollview.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp
index aa9651e..6af8f12 100644
--- a/src/widgets/qscrollview.cpp
+++ b/src/widgets/qscrollview.cpp
@@ -1388,7 +1388,7 @@ void QScrollView::addChild(QWidget* child, int x, int y)
{
if ( !child ) {
#if defined(QT_CHECK_NULL)
- tqWarning( "QScrollView::addChild(): Cannot add null child" );
+ qWarning( "QScrollView::addChild(): Cannot add null child" );
#endif
return;
}
@@ -2589,7 +2589,7 @@ void QScrollView::enableClipper(bool y)
if ( !d->clipped_viewport == !y )
return;
if ( d->children.count() )
- tqFatal("May only call QScrollView::enableClipper() before adding widgets");
+ qFatal("May only call QScrollView::enableClipper() before adding widgets");
if ( y ) {
d->clipped_viewport = new QClipperWidget(clipper(), "qt_clipped_viewport", d->flags);
d->clipped_viewport->setGeometry(-coord_limit/2,-coord_limit/2,