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/kernel/qabstractlayout.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/kernel/qabstractlayout.cpp') diff --git a/src/kernel/qabstractlayout.cpp b/src/kernel/qabstractlayout.cpp index 4607fd0..6921d49 100644 --- a/src/kernel/qabstractlayout.cpp +++ b/src/kernel/qabstractlayout.cpp @@ -606,7 +606,7 @@ QLayout::QLayout( QWidget *parent, int margin, int spacing, const char *name ) init(); if ( parent ) { if ( parent->layout() ) { - tqWarning( "QLayout \"%s\" added to %s \"%s\", which already has a" + qWarning( "QLayout \"%s\" added to %s \"%s\", which already has a" " layout", QObject::name(), parent->className(), parent->name() ); parent->removeChild( this ); @@ -1063,7 +1063,7 @@ void QLayout::addChildLayout( QLayout *l ) { if ( l->parent() ) { #if defined(QT_CHECK_NULL) - tqWarning( "QLayout::addChildLayout: layout already has a parent" ); + qWarning( "QLayout::addChildLayout: layout already has a parent" ); #endif return; } @@ -1189,7 +1189,7 @@ bool QLayout::activate() QWidget *mw = mainWidget(); if (!mw) { #if defined( QT_CHECK_NULL ) - tqWarning( "QLayout::activate: %s \"%s\" does not have a main widget", + qWarning( "QLayout::activate: %s \"%s\" does not have a main widget", QObject::className(), QObject::name() ); #endif return FALSE; -- cgit v1.2.1