Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 185446 | Differences between
and this patch

Collapse All | Expand All

(-)sql/qdatatable.cpp (-8 / +8 lines)
Lines 1043-1050 bool QDataTable::insertCurrent() Link Here
1043
	return FALSE;
1043
	return FALSE;
1044
    if ( !sqlCursor()->canInsert() ) {
1044
    if ( !sqlCursor()->canInsert() ) {
1045
#ifdef QT_CHECK_RANGE
1045
#ifdef QT_CHECK_RANGE
1046
	qWarning("QDataTable::insertCurrent: insert not allowed for " +
1046
	qWarning("QDataTable::insertCurrent: insert not allowed for %s",
1047
		 sqlCursor()->name() );
1047
		 sqlCursor()->name().latin1() );
1048
#endif
1048
#endif
1049
	endInsert();
1049
	endInsert();
1050
	return FALSE;
1050
	return FALSE;
Lines 1117-1132 bool QDataTable::updateCurrent() Link Here
1117
	return FALSE;
1117
	return FALSE;
1118
    if ( sqlCursor()->primaryIndex().count() == 0 ) {
1118
    if ( sqlCursor()->primaryIndex().count() == 0 ) {
1119
#ifdef QT_CHECK_RANGE
1119
#ifdef QT_CHECK_RANGE
1120
	qWarning("QDataTable::updateCurrent: no primary index for " +
1120
	qWarning("QDataTable::updateCurrent: no primary index for %s",
1121
		 sqlCursor()->name() );
1121
		 sqlCursor()->name().latin1() );
1122
#endif
1122
#endif
1123
	endUpdate();
1123
	endUpdate();
1124
	return FALSE;
1124
	return FALSE;
1125
    }
1125
    }
1126
    if ( !sqlCursor()->canUpdate() ) {
1126
    if ( !sqlCursor()->canUpdate() ) {
1127
#ifdef QT_CHECK_RANGE
1127
#ifdef QT_CHECK_RANGE
1128
	qWarning("QDataTable::updateCurrent: updates not allowed for " +
1128
	qWarning("QDataTable::updateCurrent: updates not allowed for %s",
1129
		 sqlCursor()->name() );
1129
		 sqlCursor()->name().latin1() );
1130
#endif
1130
#endif
1131
	endUpdate();
1131
	endUpdate();
1132
	return FALSE;
1132
	return FALSE;
Lines 1191-1198 bool QDataTable::deleteCurrent() Link Here
1191
	return FALSE;
1191
	return FALSE;
1192
    if ( sqlCursor()->primaryIndex().count() == 0 ) {
1192
    if ( sqlCursor()->primaryIndex().count() == 0 ) {
1193
#ifdef QT_CHECK_RANGE
1193
#ifdef QT_CHECK_RANGE
1194
	qWarning("QDataTable::deleteCurrent: no primary index " +
1194
	qWarning("QDataTable::deleteCurrent: no primary index %s",
1195
		 sqlCursor()->name() );
1195
		 sqlCursor()->name().latin1() );
1196
#endif
1196
#endif
1197
	return FALSE;
1197
	return FALSE;
1198
    }
1198
    }
(-)sql/qsqldatabase.cpp (-2 / +3 lines)
Lines 234-240 QSqlDatabase* QSqlDatabaseManager::datab Link Here
234
	db->open();
234
	db->open();
235
#ifdef QT_CHECK_RANGE
235
#ifdef QT_CHECK_RANGE
236
	if ( !db->isOpen() )
236
	if ( !db->isOpen() )
237
	    qWarning("QSqlDatabaseManager::database: unable to open database: " + db->lastError().databaseText() + ": " + db->lastError().driverText() );
237
	    qWarning("QSqlDatabaseManager::database: unable to open database: %s: %s",
238
                    db->lastError().databaseText().latin1(), db->lastError().driverText().latin1() );
238
#endif
239
#endif
239
    }
240
    }
240
    return db;
241
    return db;
Lines 686-692 void QSqlDatabase::init( const QString& Link Here
686
    if ( !d->driver ) {
687
    if ( !d->driver ) {
687
#ifdef QT_CHECK_RANGE
688
#ifdef QT_CHECK_RANGE
688
	qWarning( "QSqlDatabase: %s driver not loaded", type.latin1() );
689
	qWarning( "QSqlDatabase: %s driver not loaded", type.latin1() );
689
	qWarning( "QSqlDatabase: available drivers: " + drivers().join(" ") );
690
	qWarning( "QSqlDatabase: available drivers: %s", drivers().join(" ").latin1() );
690
#endif
691
#endif
691
	d->driver = new QNullDriver();
692
	d->driver = new QNullDriver();
692
	d->driver->setLastError( QSqlError( "Driver not loaded", "Driver not loaded" ) );
693
	d->driver->setLastError( QSqlError( "Driver not loaded", "Driver not loaded" ) );
(-)sql/qsqlindex.cpp (-1 / +1 lines)
Lines 273-279 QSqlIndex QSqlIndex::fromStringList( con Link Here
273
	if ( field )
273
	if ( field )
274
	    newSort.append( *field, desc );
274
	    newSort.append( *field, desc );
275
	else
275
	else
276
	    qWarning( "QSqlIndex::fromStringList: unknown field: '" + f + "'" );
276
	    qWarning( "QSqlIndex::fromStringList: unknown field: '%s'", f.latin1());
277
    }
277
    }
278
    return newSort;
278
    return newSort;
279
}
279
}
(-)sql/qsqlrecord.cpp (-3 / +3 lines)
Lines 298-304 int QSqlRecord::position( const QString& Link Here
298
	    return i;
298
	    return i;
299
    }
299
    }
300
#ifdef QT_CHECK_RANGE
300
#ifdef QT_CHECK_RANGE
301
    qWarning( "QSqlRecord::position: unable to find field " + name );
301
    qWarning( "QSqlRecord::position: unable to find field %s", name.latin1() );
302
#endif
302
#endif
303
    return -1;
303
    return -1;
304
}
304
}
Lines 313-319 QSqlField* QSqlRecord::field( int i ) Link Here
313
    checkDetach();
313
    checkDetach();
314
    if ( !sh->d->contains( i ) ) {
314
    if ( !sh->d->contains( i ) ) {
315
#ifdef QT_CHECK_RANGE
315
#ifdef QT_CHECK_RANGE
316
	qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) );
316
	qWarning( "QSqlRecord::field: index out of range: %d", i );
317
#endif
317
#endif
318
	return 0;
318
	return 0;
319
    }
319
    }
Lines 344-350 const QSqlField* QSqlRecord::field( int Link Here
344
{
344
{
345
    if ( !sh->d->contains( i ) ) {
345
    if ( !sh->d->contains( i ) ) {
346
#ifdef QT_CHECK_RANGE
346
#ifdef QT_CHECK_RANGE
347
	qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) );
347
	qWarning( "QSqlRecord::field: index out of range: %d", i  );
348
#endif // QT_CHECK_RANGE
348
#endif // QT_CHECK_RANGE
349
	return 0;
349
	return 0;
350
    }
350
    }
(-)tools/qgdict.cpp (-4 / +4 lines)
Lines 843-853 void QGDict::statistics() const Link Here
843
    QString line;
843
    QString line;
844
    line.fill( '-', 60 );
844
    line.fill( '-', 60 );
845
    double real, ideal;
845
    double real, ideal;
846
    qDebug( line.ascii() );
846
    qDebug( "%s", line.ascii() );
847
    qDebug( "DICTIONARY STATISTICS:" );
847
    qDebug( "DICTIONARY STATISTICS:" );
848
    if ( count() == 0 ) {
848
    if ( count() == 0 ) {
849
	qDebug( "Empty!" );
849
	qDebug( "Empty!" );
850
	qDebug( line.ascii() );
850
	qDebug( "%s", line.ascii() );
851
	return;
851
	return;
852
    }
852
    }
853
    real = 0.0;
853
    real = 0.0;
Lines 868-874 void QGDict::statistics() const Link Here
868
	while ( b-- )
868
	while ( b-- )
869
	    *pbuf++ = '*';
869
	    *pbuf++ = '*';
870
	*pbuf = '\0';
870
	*pbuf = '\0';
871
	qDebug( buf );
871
	qDebug( "%s", buf );
872
	i++;
872
	i++;
873
    }
873
    }
874
    qDebug( "Array size = %d", size() );
874
    qDebug( "Array size = %d", size() );
Lines 876-882 void QGDict::statistics() const Link Here
876
    qDebug( "Real dist  = %g", real );
876
    qDebug( "Real dist  = %g", real );
877
    qDebug( "Rand dist  = %g", ideal );
877
    qDebug( "Rand dist  = %g", ideal );
878
    qDebug( "Real/Rand  = %g", real/ideal );
878
    qDebug( "Real/Rand  = %g", real/ideal );
879
    qDebug( line.ascii() );
879
    qDebug( "%s", line.ascii() );
880
#endif // QT_DEBUG
880
#endif // QT_DEBUG
881
}
881
}
882
882
(-)tools/qglobal.cpp (-1 / +1 lines)
Lines 680-686 void qSystemWarning( const char* msg, in Link Here
680
    if ( code != -1 )
680
    if ( code != -1 )
681
	qWarning( "%s\n\tError code %d - %s", msg, code, strerror( code ) );
681
	qWarning( "%s\n\tError code %d - %s", msg, code, strerror( code ) );
682
    else
682
    else
683
	qWarning( msg );
683
	qWarning( "%s", msg );
684
#endif
684
#endif
685
#else
685
#else
686
    Q_UNUSED( msg );
686
    Q_UNUSED( msg );
(-)tools/qcstring.h (-1 / +5 lines)
Lines 161-167 public: Link Here
161
161
162
    QCString	copy()	const;
162
    QCString	copy()	const;
163
163
164
    QCString    &sprintf( const char *format, ... );
164
    QCString    &sprintf( const char *format, ... )
165
#if defined(Q_CC_GNU) && !defined(__INSURE__)
166
    __attribute__ ((format (printf, 2, 3)))
167
#endif
168
        ;
165
169
166
    int		find( char c, int index=0, bool cs=TRUE ) const;
170
    int		find( char c, int index=0, bool cs=TRUE ) const;
167
    int		find( const char *str, int index=0, bool cs=TRUE ) const;
171
    int		find( const char *str, int index=0, bool cs=TRUE ) const;
(-)tools/qgcache.cpp (-2 / +2 lines)
Lines 638-644 void QGCache::statistics() const Link Here
638
#if defined(QT_DEBUG)
638
#if defined(QT_DEBUG)
639
    QString line;
639
    QString line;
640
    line.fill( '*', 80 );
640
    line.fill( '*', 80 );
641
    qDebug( line.ascii() );
641
    qDebug( "%s", line.ascii() );
642
    qDebug( "CACHE STATISTICS:" );
642
    qDebug( "CACHE STATISTICS:" );
643
    qDebug( "cache contains %d item%s, with a total cost of %d",
643
    qDebug( "cache contains %d item%s, with a total cost of %d",
644
	   count(), count() != 1 ? "s" : "", tCost );
644
	   count(), count() != 1 ? "s" : "", tCost );
Lines 659-665 void QGCache::statistics() const Link Here
659
	   lruList->dumps != 1 ? "have" : "has", lruList->dumpCosts );
659
	   lruList->dumps != 1 ? "have" : "has", lruList->dumpCosts );
660
    qDebug( "Statistics from internal dictionary class:" );
660
    qDebug( "Statistics from internal dictionary class:" );
661
    dict->statistics();
661
    dict->statistics();
662
    qDebug( line.ascii() );
662
    qDebug( "%s", line.ascii() );
663
#endif
663
#endif
664
}
664
}
665
665
(-)xml/qsvgdevice.cpp (-5 / +8 lines)
Lines 1-3 Link Here
1
#ifndef XML_QSVGDEVICE.CPP
2
#define XML_QSVGDEVICE.CPP
1
/****************************************************************************
3
/****************************************************************************
2
** $Id: qt/qsvgdevice.cpp   3.3.8   edited Jan 11 14:46 $
4
** $Id: qt/qsvgdevice.cpp   3.3.8   edited Jan 11 14:46 $
3
**
5
**
Lines 978-984 bool QSvgDevice::play( const QDomNode &n Link Here
978
		// ### catch references to embedded .svg files
980
		// ### catch references to embedded .svg files
979
		QPixmap pix;
981
		QPixmap pix;
980
		if ( !pix.load( href ) ) {
982
		if ( !pix.load( href ) ) {
981
		    qWarning( "QSvgDevice::play: Couldn't load image "+href );
983
		    qWarning( "QSvgDevice::play: Couldn't load image %s", href.latin1() );
982
		    break;
984
		    break;
983
		}
985
		}
984
		pt->drawPixmap( QRect( x1, y1, w, h ), pix );
986
		pt->drawPixmap( QRect( x1, y1, w, h ), pix );
Lines 1024-1031 bool QSvgDevice::play( const QDomNode &n Link Here
1024
                break;
1026
                break;
1025
	    }
1027
	    }
1026
	case InvalidElement:
1028
	case InvalidElement:
1027
	    qWarning( "QSvgDevice::play: unknown element type " +
1029
	    qWarning( "QSvgDevice::play: unknown element type %s",
1028
		      node.nodeName() );
1030
		      node.nodeName().latin1() );
1029
	    break;
1031
	    break;
1030
	};
1032
	};
1031
1033
Lines 1111-1117 double QSvgDevice::parseLen( const QStri Link Here
1111
{
1113
{
1112
    QRegExp reg( QString::fromLatin1("([+-]?\\d*\\.*\\d*[Ee]?[+-]?\\d*)(em|ex|px|%|pt|pc|cm|mm|in|)$") );
1114
    QRegExp reg( QString::fromLatin1("([+-]?\\d*\\.*\\d*[Ee]?[+-]?\\d*)(em|ex|px|%|pt|pc|cm|mm|in|)$") );
1113
    if ( reg.search( str ) == -1 ) {
1115
    if ( reg.search( str ) == -1 ) {
1114
	qWarning( "QSvgDevice::parseLen: couldn't parse " + str );
1116
	qWarning( "QSvgDevice::parseLen: couldn't parse %s ", str.latin1() );
1115
	if ( ok )
1117
	if ( ok )
1116
	    *ok = FALSE;
1118
	    *ok = FALSE;
1117
	return 0.0;
1119
	return 0.0;
Lines 1140-1146 double QSvgDevice::parseLen( const QStri Link Here
1140
	else if ( u == "pc" )
1142
	else if ( u == "pc" )
1141
	    dbl *= m.logicalDpiX() / 6.0;
1143
	    dbl *= m.logicalDpiX() / 6.0;
1142
	else
1144
	else
1143
	    qWarning( "QSvgDevice::parseLen: Unknown unit " + u );
1145
	    qWarning( "QSvgDevice::parseLen: Unknown unit %s",  u.latin1() );
1144
    }
1146
    }
1145
    if ( ok )
1147
    if ( ok )
1146
	*ok = TRUE;
1148
	*ok = TRUE;
Lines 1586-1588 void QSvgDevice::applyTransform( QDomEle Link Here
1586
}
1588
}
1587
1589
1588
#endif // QT_NO_SVG
1590
#endif // QT_NO_SVG
1591
#endif // XML_QSVGDEVICE.CPP
(-)widgets/qheader.cpp (-3 / +1 lines)
Lines 1873-1882 void QHeader::setUpdatesEnabled( bool en Link Here
1873
1873
1874
bool QHeader::reverse () const
1874
bool QHeader::reverse () const
1875
{
1875
{
1876
#if 0
1876
#if 1
1877
    return ( orient == Qt::Horizontal && QApplication::reverseLayout() );
1877
    return ( orient == Qt::Horizontal && QApplication::reverseLayout() );
1878
#else
1879
    return FALSE;
1880
#endif
1878
#endif
1881
}
1879
}

Return to bug 185446