From 68b44ce2adff1d8de050d9a4e66aa6f038344be7 Mon Sep 17 00:00:00 2001
From: Debao Zhang <hello@debao.me>
Date: Sat, 26 Oct 2013 01:18:39 +0800
Subject: [PATCH] Fix warning: unused variable

---
 src/xlsx/xlsxdocument.cpp  | 2 --
 src/xlsx/xlsxpackage.cpp   | 1 +
 src/xlsx/xlsxstyles.cpp    | 1 +
 src/xlsx/xlsxworkbook.cpp  | 3 ++-
 src/xlsx/xlsxworksheet.cpp | 5 +++--
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/xlsx/xlsxdocument.cpp b/src/xlsx/xlsxdocument.cpp
index 5ca994f..a59688b 100644
--- a/src/xlsx/xlsxdocument.cpp
+++ b/src/xlsx/xlsxdocument.cpp
@@ -351,8 +351,6 @@ bool Document::saveAs(const QString &name)
  */
 bool Document::saveAs(QIODevice *device)
 {
-    Q_D(Document);
-
 //    activedWorksheet()->setHidden(false);
 //    activedWorksheet()->setSelected(true);
 
diff --git a/src/xlsx/xlsxpackage.cpp b/src/xlsx/xlsxpackage.cpp
index 925a91c..94abde9 100644
--- a/src/xlsx/xlsxpackage.cpp
+++ b/src/xlsx/xlsxpackage.cpp
@@ -268,6 +268,7 @@ void Package::writeContentTypesFile(ZipWriter &zipWriter)
 
     int drawing_index = 1;
     foreach (Drawing *drawing, m_workbook->drawings()) {
+        Q_UNUSED(drawing);
         content.addDrawingName(QStringLiteral("drawing%1").arg(drawing_index));
         drawing_index += 1;
     }
diff --git a/src/xlsx/xlsxstyles.cpp b/src/xlsx/xlsxstyles.cpp
index ebf693a..9846b13 100755
--- a/src/xlsx/xlsxstyles.cpp
+++ b/src/xlsx/xlsxstyles.cpp
@@ -527,6 +527,7 @@ void Styles::writeDxfs(XmlStreamWriter &writer)
     writer.writeAttribute(QStringLiteral("count"), QString::number(m_dxf_formatsList.size()));
     foreach (Format *format, m_dxf_formatsList) {
         writer.writeStartElement(QStringLiteral("dxf"));
+        Q_UNUSED(format)
         writer.writeEndElement();//dxf
     }
     writer.writeEndElement(); //dxfs
diff --git a/src/xlsx/xlsxworkbook.cpp b/src/xlsx/xlsxworkbook.cpp
index fafc931..83ae267 100755
--- a/src/xlsx/xlsxworkbook.cpp
+++ b/src/xlsx/xlsxworkbook.cpp
@@ -126,7 +126,8 @@ void Workbook::setDefaultDateFormat(const QString &format)
 
 void Workbook::defineName(const QString &name, const QString &formula)
 {
-
+    Q_UNUSED(name);
+    Q_UNUSED(formula);
 }
 
 Worksheet *Workbook::addWorksheet(const QString &name)
diff --git a/src/xlsx/xlsxworksheet.cpp b/src/xlsx/xlsxworksheet.cpp
index 96a559a..063e5fe 100755
--- a/src/xlsx/xlsxworksheet.cpp
+++ b/src/xlsx/xlsxworksheet.cpp
@@ -536,7 +536,6 @@ int Worksheet::insertImage(int row, int column, const QImage &image, const QPoin
 
 int Worksheet::mergeCells(const QString &range)
 {
-    Q_D(Worksheet);
     QStringList cells = range.split(QLatin1Char(':'));
     if (cells.size() != 2)
         return -1;
@@ -572,7 +571,6 @@ int Worksheet::mergeCells(int row_begin, int column_begin, int row_end, int colu
 
 int Worksheet::unmergeCells(const QString &range)
 {
-    Q_D(Worksheet);
     QStringList cells = range.split(QLatin1Char(':'));
     if (cells.size() != 2)
         return -1;
@@ -1309,6 +1307,9 @@ void WorksheetPrivate::readMergeCells(XmlStreamReader &reader)
             }
         }
     }
+
+    if (merges.size() != count)
+        qDebug("read merge cells error");
 }
 
 bool Worksheet::loadFromXmlFile(QIODevice *device)