x11-libs/qt/files/0081-format-string-fixes.diff

   1 qt-bugs@ issue : none
   2 bugs.kde.org number : none
   3 applied: no
   4 author: Dirk Mueller/TT
   5
   6 Fixes various, partially exploitable format string errors on Qt 3.x code base.
   7
   8
   9 --- src/widgets/qtextedit.cpp   Mon Jul 16 10:44:40 CEST 2007
  10 +++ src/widgets/qtextedit.cpp   Mon Jul 16 10:44:40 CEST 2007
  11
  12 @@ -6349,7 +6349,7 @@
  13                     cur = tag->prev;
  14                     if ( !cur ) {
  15  #ifdef QT_CHECK_RANGE
  16 -                       qWarning( "QTextEdit::optimParseTags: no left-tag for '<" + tag->tag + ">' in line %d.", tag->line + 1 );
  17 +                       qWarning( "QTextEdit::optimParseTags: no left-tag for '<%s>' in line %d.", tag->tag.ascii(), tag->line + 1 );
  18  #endif
  19                         return; // something is wrong - give up
  20                     }
  21 @@ -6372,7 +6372,7 @@
  22                                     break;
  23                                 } else if ( !cur->leftTag ) {
  24  #ifdef QT_CHECK_RANGE
  25 -                                   qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<" + cur->tag + ">' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->line + 1 );
  26 +                                   qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<%s>' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->tag.ascii(), cur->line + 1 );
  27  #endif
  28                                     return; // something is amiss - give up
  29                                 }
  30 --- src/sql/qdatatable.cpp      Mon Jul 16 10:45:03 CEST 2007
  31 +++ src/sql/qdatatable.cpp      Mon Jul 16 10:45:03 CEST 2007
  32
  33 @@ -1043,8 +1043,8 @@
  34         return FALSE;
  35      if ( !sqlCursor()->canInsert() ) {
  36  #ifdef QT_CHECK_RANGE
  37 -       qWarning("QDataTable::insertCurrent: insert not allowed for " +
  38 -                sqlCursor()->name() );
  39 +       qWarning("QDataTable::insertCurrent: insert not allowed for %s",
  40 +                sqlCursor()->name().latin1() );
  41  #endif
  42         endInsert();
  43         return FALSE;
  44 @@ -1117,16 +1117,16 @@
  45         return FALSE;
  46      if ( sqlCursor()->primaryIndex().count() == 0 ) {
  47  #ifdef QT_CHECK_RANGE
  48 -       qWarning("QDataTable::updateCurrent: no primary index for " +
  49 -                sqlCursor()->name() );
  50 +       qWarning("QDataTable::updateCurrent: no primary index for %s",
  51 +                sqlCursor()->name().latin1() );
  52  #endif
  53         endUpdate();
  54         return FALSE;
  55      }
  56      if ( !sqlCursor()->canUpdate() ) {
  57  #ifdef QT_CHECK_RANGE
  58 -       qWarning("QDataTable::updateCurrent: updates not allowed for " +
  59 -                sqlCursor()->name() );
  60 +       qWarning("QDataTable::updateCurrent: updates not allowed for %s",
  61 +                sqlCursor()->name().latin1() );
  62  #endif
  63         endUpdate();
  64         return FALSE;
  65 @@ -1191,8 +1191,8 @@
  66         return FALSE;
  67      if ( sqlCursor()->primaryIndex().count() == 0 ) {
  68  #ifdef QT_CHECK_RANGE
  69 -       qWarning("QDataTable::deleteCurrent: no primary index " +
  70 -                sqlCursor()->name() );
  71 +       qWarning("QDataTable::deleteCurrent: no primary index %s",
  72 +                sqlCursor()->name().latin1() );
  73  #endif
  74         return FALSE;
  75      }
  76
  77 --- src/sql/qsqldatabase.cpp    Mon Jul 16 10:45:03 CEST 2007
  78 +++ src/sql/qsqldatabase.cpp    Mon Jul 16 10:45:03 CEST 2007
  79
  80 @@ -234,7 +234,8 @@
  81         db->open();
  82  #ifdef QT_CHECK_RANGE
  83         if ( !db->isOpen() )
  84 -           qWarning("QSqlDatabaseManager::database: unable to open database: " + db->lastError().databaseText() + ": " + db->lastError().driverText() );
  85 +           qWarning("QSqlDatabaseManager::database: unable to open database: %s: %s",
  86 +                    db->lastError().databaseText().latin1(), db->lastError().driverText().latin1() );
  87  #endif
  88      }
  89      return db;
  90 @@ -686,7 +687,7 @@
  91      if ( !d->driver ) {
  92  #ifdef QT_CHECK_RANGE
  93         qWarning( "QSqlDatabase: %s driver not loaded", type.latin1() );
  94 -       qWarning( "QSqlDatabase: available drivers: " + drivers().join(" ") );
  95 +       qWarning( "QSqlDatabase: available drivers: %s", drivers().join(" ").latin1() );
  96  #endif
  97         d->driver = new QNullDriver();
  98         d->driver->setLastError( QSqlError( "Driver not loaded", "Driver not loaded" ) );
  99
 100 --- src/sql/qsqlindex.cpp       Mon Jul 16 10:45:03 CEST 2007
 101 +++ src/sql/qsqlindex.cpp       Mon Jul 16 10:45:03 CEST 2007
 102
 103 @@ -273,7 +273,7 @@
 104         if ( field )
 105             newSort.append( *field, desc );
 106         else
 107 -           qWarning( "QSqlIndex::fromStringList: unknown field: '" + f + "'" );
 108 +           qWarning( "QSqlIndex::fromStringList: unknown field: '%s'", f.latin1());
 109      }
 110      return newSort;
 111  }
 112
 113 --- src/sql/qsqlrecord.cpp      Mon Jul 16 10:45:03 CEST 2007
 114 +++ src/sql/qsqlrecord.cpp      Mon Jul 16 10:45:03 CEST 2007
 115
 116 @@ -298,7 +298,7 @@
 117             return i;
 118      }
 119  #ifdef QT_CHECK_RANGE
 120 -    qWarning( "QSqlRecord::position: unable to find field " + name );
 121 +    qWarning( "QSqlRecord::position: unable to find field %s", name.latin1() );
 122  #endif
 123      return -1;
 124  }
 125 @@ -313,7 +313,7 @@
 126      checkDetach();
 127      if ( !sh->d->contains( i ) ) {
 128  #ifdef QT_CHECK_RANGE
 129 -       qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) );
 130 +       qWarning( "QSqlRecord::field: index out of range: %d", i );
 131  #endif
 132         return 0;
 133      }
 134 @@ -344,7 +344,7 @@
 135  {
 136      if ( !sh->d->contains( i ) ) {
 137  #ifdef QT_CHECK_RANGE
 138 -       qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) );
 139 +       qWarning( "QSqlRecord::field: index out of range: %d", i  );
 140  #endif // QT_CHECK_RANGE
 141         return 0;
 142      }
 143
 144 --- src/tools/qglobal.cpp       Mon Jul 16 10:45:03 CEST 2007
 145 +++ src/tools/qglobal.cpp       Mon Jul 16 10:45:03 CEST 2007
 146
 147 @@ -680,7 +680,7 @@
 148      if ( code != -1 )
 149         qWarning( "%s\n\tError code %d - %s", msg, code, strerror( code ) );
 150      else
 151 -       qWarning( msg );
 152 +       qWarning( "%s", msg );
 153  #endif
 154  #else
 155      Q_UNUSED( msg );
 156
 157 --- src/xml/qsvgdevice.cpp      Mon Jul 16 10:45:03 CEST 2007
 158 +++ src/xml/qsvgdevice.cpp      Mon Jul 16 10:45:03 CEST 2007
 159
 160 @@ -978,7 +978,7 @@
 161                 // ### catch references to embedded .svg files
 162                 QPixmap pix;
 163                 if ( !pix.load( href ) ) {
 164 -                   qWarning( "QSvgDevice::play: Couldn't load image "+href );
 165 +                   qWarning( "QSvgDevice::play: Couldn't load image %s", href.latin1() );
 166                     break;
 167                 }
 168                 pt->drawPixmap( QRect( x1, y1, w, h ), pix );
 169 @@ -1024,8 +1024,8 @@
 170                  break;
 171             }
 172         case InvalidElement:
 173 -           qWarning( "QSvgDevice::play: unknown element type " +
 174 -                     node.nodeName() );
 175 +           qWarning( "QSvgDevice::play: unknown element type %s",
 176 +                     node.nodeName().latin1() );
 177             break;
 178         };
 179
 180 @@ -1111,7 +1111,7 @@
 181  {
 182      QRegExp reg( QString::fromLatin1("([+-]?\\d*\\.*\\d*[Ee]?[+-]?\\d*)(em|ex|px|%|pt|pc|cm|mm|in|)$") );
 183      if ( reg.search( str ) == -1 ) {
 184 -       qWarning( "QSvgDevice::parseLen: couldn't parse " + str );
 185 +       qWarning( "QSvgDevice::parseLen: couldn't parse %s ", str.latin1() );
 186         if ( ok )
 187             *ok = FALSE;
 188         return 0.0;
 189 @@ -1140,7 +1140,7 @@
 190         else if ( u == "pc" )
 191             dbl *= m.logicalDpiX() / 6.0;
 192         else
 193 -           qWarning( "QSvgDevice::parseLen: Unknown unit " + u );
 194 +           qWarning( "QSvgDevice::parseLen: Unknown unit %s",  u.latin1() );
 195      }
 196      if ( ok )
 197         *ok = TRUE;