summaryrefslogtreecommitdiff
path: root/x11/qt3-libs/patches
diff options
context:
space:
mode:
Diffstat (limited to 'x11/qt3-libs/patches')
-rw-r--r--x11/qt3-libs/patches/patch-ca23
-rw-r--r--x11/qt3-libs/patches/patch-cb49
-rw-r--r--x11/qt3-libs/patches/patch-cc25
-rw-r--r--x11/qt3-libs/patches/patch-cd15
-rw-r--r--x11/qt3-libs/patches/patch-ce33
-rw-r--r--x11/qt3-libs/patches/patch-cf15
-rw-r--r--x11/qt3-libs/patches/patch-cg43
7 files changed, 203 insertions, 0 deletions
diff --git a/x11/qt3-libs/patches/patch-ca b/x11/qt3-libs/patches/patch-ca
new file mode 100644
index 00000000000..bea9490918f
--- /dev/null
+++ b/x11/qt3-libs/patches/patch-ca
@@ -0,0 +1,23 @@
+$NetBSD: patch-ca,v 1.1.2.2 2007/08/02 07:29:27 ghen Exp $
+
+--- src/widgets/qtextedit.cpp Mon Jul 16 10:44:40 CEST 2007
++++ src/widgets/qtextedit.cpp Mon Jul 16 10:44:40 CEST 2007
+
+@@ -6349,7 +6349,7 @@
+ cur = tag->prev;
+ if ( !cur ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning( "QTextEdit::optimParseTags: no left-tag for '<" + tag->tag + ">' in line %d.", tag->line + 1 );
++ qWarning( "QTextEdit::optimParseTags: no left-tag for '<%s>' in line %d.", tag->tag.ascii(), tag->line + 1 );
+ #endif
+ return; // something is wrong - give up
+ }
+@@ -6372,7 +6372,7 @@
+ break;
+ } else if ( !cur->leftTag ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<" + cur->tag + ">' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->line + 1 );
++ qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<%s>' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->tag.ascii(), cur->line + 1 );
+ #endif
+ return; // something is amiss - give up
+ }
diff --git a/x11/qt3-libs/patches/patch-cb b/x11/qt3-libs/patches/patch-cb
new file mode 100644
index 00000000000..ffab340d45a
--- /dev/null
+++ b/x11/qt3-libs/patches/patch-cb
@@ -0,0 +1,49 @@
+$NetBSD: patch-cb,v 1.1.2.2 2007/08/02 07:29:27 ghen Exp $
+
+--- src/sql/qdatatable.cpp Mon Jul 16 10:45:03 CEST 2007
++++ src/sql/qdatatable.cpp Mon Jul 16 10:45:03 CEST 2007
+
+@@ -1043,8 +1043,8 @@
+ return FALSE;
+ if ( !sqlCursor()->canInsert() ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning("QDataTable::insertCurrent: insert not allowed for " +
+- sqlCursor()->name() );
++ qWarning("QDataTable::insertCurrent: insert not allowed for %s",
++ sqlCursor()->name().latin1() );
+ #endif
+ endInsert();
+ return FALSE;
+@@ -1117,16 +1117,16 @@
+ return FALSE;
+ if ( sqlCursor()->primaryIndex().count() == 0 ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning("QDataTable::updateCurrent: no primary index for " +
+- sqlCursor()->name() );
++ qWarning("QDataTable::updateCurrent: no primary index for %s",
++ sqlCursor()->name().latin1() );
+ #endif
+ endUpdate();
+ return FALSE;
+ }
+ if ( !sqlCursor()->canUpdate() ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning("QDataTable::updateCurrent: updates not allowed for " +
+- sqlCursor()->name() );
++ qWarning("QDataTable::updateCurrent: updates not allowed for %s",
++ sqlCursor()->name().latin1() );
+ #endif
+ endUpdate();
+ return FALSE;
+@@ -1191,8 +1191,8 @@
+ return FALSE;
+ if ( sqlCursor()->primaryIndex().count() == 0 ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning("QDataTable::deleteCurrent: no primary index " +
+- sqlCursor()->name() );
++ qWarning("QDataTable::deleteCurrent: no primary index %s",
++ sqlCursor()->name().latin1() );
+ #endif
+ return FALSE;
+ }
+
diff --git a/x11/qt3-libs/patches/patch-cc b/x11/qt3-libs/patches/patch-cc
new file mode 100644
index 00000000000..3770be0f487
--- /dev/null
+++ b/x11/qt3-libs/patches/patch-cc
@@ -0,0 +1,25 @@
+$NetBSD: patch-cc,v 1.1.2.2 2007/08/02 07:29:27 ghen Exp $
+
+--- src/sql/qsqldatabase.cpp Mon Jul 16 10:45:03 CEST 2007
++++ src/sql/qsqldatabase.cpp Mon Jul 16 10:45:03 CEST 2007
+
+@@ -234,7 +234,8 @@
+ db->open();
+ #ifdef QT_CHECK_RANGE
+ if ( !db->isOpen() )
+- qWarning("QSqlDatabaseManager::database: unable to open database: " + db->lastError().databaseText() + ": " + db->lastError().driverText() );
++ qWarning("QSqlDatabaseManager::database: unable to open database: %s: %s",
++ db->lastError().databaseText().latin1(), db->lastError().driverText().latin1() );
+ #endif
+ }
+ return db;
+@@ -686,7 +687,7 @@
+ if ( !d->driver ) {
+ #ifdef QT_CHECK_RANGE
+ qWarning( "QSqlDatabase: %s driver not loaded", type.latin1() );
+- qWarning( "QSqlDatabase: available drivers: " + drivers().join(" ") );
++ qWarning( "QSqlDatabase: available drivers: %s", drivers().join(" ").latin1() );
+ #endif
+ d->driver = new QNullDriver();
+ d->driver->setLastError( QSqlError( "Driver not loaded", "Driver not loaded" ) );
+
diff --git a/x11/qt3-libs/patches/patch-cd b/x11/qt3-libs/patches/patch-cd
new file mode 100644
index 00000000000..fc2e4b9d1b7
--- /dev/null
+++ b/x11/qt3-libs/patches/patch-cd
@@ -0,0 +1,15 @@
+$NetBSD: patch-cd,v 1.1.2.2 2007/08/02 07:29:28 ghen Exp $
+
+--- src/sql/qsqlindex.cpp Mon Jul 16 10:45:03 CEST 2007
++++ src/sql/qsqlindex.cpp Mon Jul 16 10:45:03 CEST 2007
+
+@@ -273,7 +273,7 @@
+ if ( field )
+ newSort.append( *field, desc );
+ else
+- qWarning( "QSqlIndex::fromStringList: unknown field: '" + f + "'" );
++ qWarning( "QSqlIndex::fromStringList: unknown field: '%s'", f.latin1());
+ }
+ return newSort;
+ }
+
diff --git a/x11/qt3-libs/patches/patch-ce b/x11/qt3-libs/patches/patch-ce
new file mode 100644
index 00000000000..9a0c6e91d6e
--- /dev/null
+++ b/x11/qt3-libs/patches/patch-ce
@@ -0,0 +1,33 @@
+$NetBSD: patch-ce,v 1.1.2.2 2007/08/02 07:29:28 ghen Exp $
+
+--- src/sql/qsqlrecord.cpp Mon Jul 16 10:45:03 CEST 2007
++++ src/sql/qsqlrecord.cpp Mon Jul 16 10:45:03 CEST 2007
+
+@@ -298,7 +298,7 @@
+ return i;
+ }
+ #ifdef QT_CHECK_RANGE
+- qWarning( "QSqlRecord::position: unable to find field " + name );
++ qWarning( "QSqlRecord::position: unable to find field %s", name.latin1() );
+ #endif
+ return -1;
+ }
+@@ -313,7 +313,7 @@
+ checkDetach();
+ if ( !sh->d->contains( i ) ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) );
++ qWarning( "QSqlRecord::field: index out of range: %d", i );
+ #endif
+ return 0;
+ }
+@@ -344,7 +344,7 @@
+ {
+ if ( !sh->d->contains( i ) ) {
+ #ifdef QT_CHECK_RANGE
+- qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) );
++ qWarning( "QSqlRecord::field: index out of range: %d", i );
+ #endif // QT_CHECK_RANGE
+ return 0;
+ }
+
diff --git a/x11/qt3-libs/patches/patch-cf b/x11/qt3-libs/patches/patch-cf
new file mode 100644
index 00000000000..9f8d3e225bc
--- /dev/null
+++ b/x11/qt3-libs/patches/patch-cf
@@ -0,0 +1,15 @@
+$NetBSD: patch-cf,v 1.1.2.2 2007/08/02 07:29:29 ghen Exp $
+
+--- src/tools/qglobal.cpp Mon Jul 16 10:45:03 CEST 2007
++++ src/tools/qglobal.cpp Mon Jul 16 10:45:03 CEST 2007
+
+@@ -680,7 +680,7 @@
+ if ( code != -1 )
+ qWarning( "%s\n\tError code %d - %s", msg, code, strerror( code ) );
+ else
+- qWarning( msg );
++ qWarning( "%s", msg );
+ #endif
+ #else
+ Q_UNUSED( msg );
+
diff --git a/x11/qt3-libs/patches/patch-cg b/x11/qt3-libs/patches/patch-cg
new file mode 100644
index 00000000000..f082d5d09d6
--- /dev/null
+++ b/x11/qt3-libs/patches/patch-cg
@@ -0,0 +1,43 @@
+$NetBSD: patch-cg,v 1.1.2.2 2007/08/02 07:29:29 ghen Exp $
+
+--- src/xml/qsvgdevice.cpp Mon Jul 16 10:45:03 CEST 2007
++++ src/xml/qsvgdevice.cpp Mon Jul 16 10:45:03 CEST 2007
+
+@@ -978,7 +978,7 @@
+ // ### catch references to embedded .svg files
+ QPixmap pix;
+ if ( !pix.load( href ) ) {
+- qWarning( "QSvgDevice::play: Couldn't load image "+href );
++ qWarning( "QSvgDevice::play: Couldn't load image %s", href.latin1() );
+ break;
+ }
+ pt->drawPixmap( QRect( x1, y1, w, h ), pix );
+@@ -1024,8 +1024,8 @@
+ break;
+ }
+ case InvalidElement:
+- qWarning( "QSvgDevice::play: unknown element type " +
+- node.nodeName() );
++ qWarning( "QSvgDevice::play: unknown element type %s",
++ node.nodeName().latin1() );
+ break;
+ };
+
+@@ -1111,7 +1111,7 @@
+ {
+ QRegExp reg( QString::fromLatin1("([+-]?\\d*\\.*\\d*[Ee]?[+-]?\\d*)(em|ex|px|%|pt|pc|cm|mm|in|)$") );
+ if ( reg.search( str ) == -1 ) {
+- qWarning( "QSvgDevice::parseLen: couldn't parse " + str );
++ qWarning( "QSvgDevice::parseLen: couldn't parse %s ", str.latin1() );
+ if ( ok )
+ *ok = FALSE;
+ return 0.0;
+@@ -1140,7 +1140,7 @@
+ else if ( u == "pc" )
+ dbl *= m.logicalDpiX() / 6.0;
+ else
+- qWarning( "QSvgDevice::parseLen: Unknown unit " + u );
++ qWarning( "QSvgDevice::parseLen: Unknown unit %s", u.latin1() );
+ }
+ if ( ok )
+ *ok = TRUE;
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-02 10:56:48 +0000