Merge branch 'master' of github.com:mhugent/Quantum-GIS

Author: mhugent

i18n/qgis_de.ts

@@ -19443,8 +19443,8 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten.</
     <message>
         <location filename="../src/app/legend/qgslegendlayer.cpp" line="603"/>
         <location filename="../src/app/legend/qgslegendlayer.cpp" line="665"/>
-        <source>Updating feature count for layer </source>
-        <translation>Objektanzahl des Layers aktualsieren</translation>
+        <source>Updating feature count for layer %1</source>
+        <translation>Objektanzahl des Layers %1 aktualsieren</translation>
     </message>
     <message>
         <location filename="../src/app/legend/qgslegendlayer.cpp" line="603"/>

src/app/legend/qgslegendlayer.cpp

@@ -600,7 +600,7 @@ void QgsLegendLayer::updateItemListCountV2( SymbologyList& itemList, QgsVectorLa
 
   //go through all features and count the number of occurrences
   int nFeatures = layer->pendingFeatureCount();
-  QProgressDialog p( tr( "Updating feature count for layer " ) + layer->name(), tr( "Abort" ), 0, nFeatures );
+  QProgressDialog p( tr( "Updating feature count for layer %1" ).arg( layer->name() ), tr( "Abort" ), 0, nFeatures );
   p.setWindowModality( Qt::WindowModal );
   int featuresCounted = 0;
 

src/app/qgsidentifyresults.cpp

@@ -802,7 +802,7 @@ void QgsIdentifyResults::highlightFeature( QTreeWidgetItem *item )
   if ( mHighlights.contains( featItem ) )
     return;
 
-  int fid = featItem->data( 0, Qt::UserRole ).toInt();
+  QgsFeatureId fid = featItem->data( 0, Qt::UserRole ).toInt();
 
   QgsFeature feat;
   if ( !layer->featureAtId( fid, feat, true, false ) )

src/providers/postgres/qgspostgresprovider.cpp

@@ -461,9 +461,10 @@ qint64 QgsPostgresProvider::getBinaryInt( PGresult *queryResult, int row, int co
   QString buf = "";
   for ( size_t i = 0; i < s; i++ )
   {
-    buf += QString( "%1 " ).arg( *( char * )( p + i ), 0, 16, QLatin1Char( ' ' ) );
+    buf += QString( "%1 " ).arg( *( unsigned char * )( p + i ), 0, 16, QLatin1Char( ' ' ) );
   }
-  QgsDebugMsg( QString( "int in hex:%1" ).arg( buf ) );
+
+  QgsDebugMsgLevel( QString( "int in hex:%1" ).arg( buf ), 3 );
 
   switch ( s )
   {
@@ -530,7 +531,7 @@ bool QgsPostgresProvider::getFeature( PGresult *queryResult, int row, bool fetch
   try
   {
     QgsFeatureId oid = getBinaryInt( queryResult, row, 0 );
-    QgsDebugMsg( QString( "oid=%1" ).arg( oid ) );
+    QgsDebugMsgLevel( QString( "oid=%1" ).arg( oid ), 3 );
 
     feature.setFeatureId( oid );
     feature.clearAttributeMap();
@@ -3145,7 +3146,7 @@ bool QgsPostgresProvider::deduceEndian()
     QgsDebugMsg( QString( "First oid is %1" ).arg( oidValue ) );
 
     // compare the two oid values to determine if we need to do an endian swap
-    if ( oid == oidValue.toLongLong() )
+    if ( oid != oidValue.toLongLong() )
       swapEndian = false;
   }
   connectionRO->closeCursor( "oidcursor" );