diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-02 02:11:59 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-02 02:11:59 -0600 |
commit | 9a75b154bf0732aa3a501b6e31e566e06c5f8a31 (patch) | |
tree | df1e10cc7504665622d096f9ba80dc9e56f3afb8 /src/kernel/qlayout.cpp | |
parent | a830bf10b7d4ed2c83ffe68c0b22d7c4ba9860b0 (diff) | |
download | qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.tar.gz qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.zip |
Undo prior accidental commit
Diffstat (limited to 'src/kernel/qlayout.cpp')
-rw-r--r-- | src/kernel/qlayout.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/kernel/qlayout.cpp b/src/kernel/qlayout.cpp index e7ca24d..de9f5b9 100644 --- a/src/kernel/qlayout.cpp +++ b/src/kernel/qlayout.cpp @@ -468,9 +468,9 @@ void QGridLayoutData::add( QGridBox *box, int row1, int row2, int col1, { #ifdef QT_CHECK_RANGE if ( row2 >= 0 && row2 < row1 ) - tqWarning( "QGridLayout: Multi-cell fromRow greater than toRow" ); + qWarning( "QGridLayout: Multi-cell fromRow greater than toRow" ); if ( col2 >= 0 && col2 < col1 ) - tqWarning( "QGridLayout: Multi-cell fromCol greater than toCol" ); + qWarning( "QGridLayout: Multi-cell fromCol greater than toCol" ); #endif if ( row1 == row2 && col1 == col2 ) { add( box, row1, col1 ); @@ -1216,7 +1216,7 @@ static bool checkWidget( QLayout *l, QWidget *w ) { if ( !w ) { #if defined(QT_CHECK_STATE) - tqWarning( "QLayout: Cannot add null widget to %s/%s", l->className(), + qWarning( "QLayout: Cannot add null widget to %s/%s", l->className(), l->name() ); #endif return FALSE; @@ -1224,12 +1224,12 @@ static bool checkWidget( QLayout *l, QWidget *w ) if ( w->parentWidget() != l->mainWidget() && l->mainWidget() ) { #if defined(QT_CHECK_STATE) if ( w->parentWidget() ) - tqWarning( "QLayout: Adding %s/%s (child of %s/%s) to layout for " + qWarning( "QLayout: Adding %s/%s (child of %s/%s) to layout for " "%s/%s", w->className(), w->name(), w->parentWidget()->className(), w->parentWidget()->name(), l->mainWidget()->className(), l->mainWidget()->name() ); else - tqWarning( "QLayout: Adding %s/%s (top-level widget) to layout for" + qWarning( "QLayout: Adding %s/%s (top-level widget) to layout for" " %s/%s", w->className(), w->name(), l->mainWidget()->className(), l->mainWidget()->name() ); #endif @@ -1264,7 +1264,7 @@ void QGridLayout::addWidget( QWidget *w, int row, int col, int alignment ) return; if ( row < 0 || col < 0 ) { #if defined(QT_CHECK_STATE) - tqWarning( "QGridLayout: Cannot add %s/%s to %s/%s at row %d col %d", + qWarning( "QGridLayout: Cannot add %s/%s to %s/%s at row %d col %d", w->className(), w->name(), className(), name(), row, col ); #endif return; |