package/qt/qt3/170529.patch

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