[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/filters/kspread/excel (silent)
From:       Marijn Kruisselbrink <m.kruisselbrink () student ! tue ! nl>
Date:       2010-08-30 1:47:23
Message-ID: 20100830014723.9F206AC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1169748 by mkruisselbrink:

SVN_SILENT warnings--

 M  +5 -5      export/CFBWriter.cpp  
 M  +3 -0      export/ExcelExport.cpp  
 M  +1 -0      sidewinder/utils.cpp  
 M  +1 -1      sidewinder/workbook.cpp  


--- trunk/koffice/filters/kspread/excel/export/CFBWriter.cpp #1169747:1169748
@@ -144,7 +144,7 @@
 void CFBWriter::StreamIODevice::appendData(const char *data, qint64 len)
 {
     m_buffer.append(data, len);
-    while (m_buffer.size() > m_writer.m_sectorSize) {
+    while (unsigned(m_buffer.size()) > m_writer.m_sectorSize) {
         QByteArray sector = m_buffer.left(m_writer.m_sectorSize);
         m_buffer = m_buffer.mid(m_writer.m_sectorSize);
         m_lastSector = m_writer.writeSector(sector, m_lastSector);
@@ -295,7 +295,7 @@
         b.open(QIODevice::WriteOnly);
         QDataStream ds(&b);
         ds.setByteOrder(QDataStream::LittleEndian);
-        for (int j = 0; j < m_sectorSize/128 && i+j < m_entries.size(); j++) {
+        for (int j = 0; j < int(m_sectorSize/128) && i+j < m_entries.size(); j++) {
             const DirectoryEntry& e = m_entries[i+j];
             const ushort* name = e.name.utf16();
             int n = 0;
@@ -332,7 +332,7 @@
         b.open(QIODevice::WriteOnly);
         QDataStream ds(&b);
         ds.setByteOrder(QDataStream::LittleEndian);
-        for (int j = 0; j < m_sectorSize/4 && i+j < m_miniFat.size(); j++) {
+        for (int j = 0; j < int(m_sectorSize/4) && i+j < m_miniFat.size(); j++) {
             ds << quint32(m_miniFat[i+j]);
         }
         miniFatSector = writeSector(sector, miniFatSector);
@@ -358,8 +358,8 @@
         m_device->seek((sector + 1) * m_sectorSize);
         QDataStream ds(m_device);
         ds.setByteOrder(QDataStream::LittleEndian);
-        for (int j = 0, idx = i*(m_sectorSize/4); j < m_sectorSize/4; j++, idx++) {
-            ds << quint32(idx < m_fat.size() ? m_fat[idx] : 0);
+        for (unsigned j = 0, idx = i*(m_sectorSize/4); j < m_sectorSize/4; j++, idx++) {
+            ds << quint32(idx < unsigned(m_fat.size()) ? m_fat[idx] : 0);
         }
     }
 
--- trunk/koffice/filters/kspread/excel/export/ExcelExport.cpp #1169747:1169748
@@ -686,6 +686,9 @@
                 // TODO
                 codes.append(FormulaToken(FormulaToken::MissArg));
                 break;
+            default:
+                // Can't reach here
+                break;
             }
         }
 
--- trunk/koffice/filters/kspread/excel/sidewinder/utils.cpp #1169747:1169748
@@ -241,6 +241,7 @@
 
 void Record::writeData(XlsRecordOutputStream &out) const
 {
+    Q_UNUSED(out);
     fprintf(stderr, "ERROR! writeData not implemented for record type %u\n", rtti());
 }
 
--- trunk/koffice/filters/kspread/excel/sidewinder/workbook.cpp #1169747:1169748
@@ -215,7 +215,7 @@
 
 QColor Workbook::customColor(unsigned index) const
 {
-    if (index < d->colorTable.size())
+    if (index < unsigned(d->colorTable.size()))
         return d->colorTable[index];
     else
         return QColor();
[prev in list] [next in list] [prev in thread] [next in thread]