Change API to support AbstractSheet

examples/xlsx/demo/main.cpp

@@ -94,7 +94,7 @@ int main()
 
     //---------------------------------------------------------------
     //The default sheet is "Sheet1"
-    xlsx.renameWorksheet("Sheet1", "Aligns & Borders");
+    xlsx.renameSheet("Sheet1", "Aligns & Borders");
     xlsx.setColumn("B", "B", 20);
     xlsx.setColumn("H", "H", 12);
     xlsx.currentWorksheet()->setGridLinesVisible(false);
@@ -138,7 +138,7 @@ int main()
 
     //---------------------------------------------------------------
     //Create the second sheet.
-    xlsx.addWorksheet("Fonts");
+    xlsx.addSheet("Fonts");
 
     xlsx.write("B3", "Normal");
     Format font_bold;
@@ -178,7 +178,7 @@ int main()
 
     //---------------------------------------------------------------
     //Create the third sheet.
-    xlsx.addWorksheet("Formulas");
+    xlsx.addSheet("Formulas");
     xlsx.setColumn("A", "B", 40);
     Format rAlign;
     rAlign.setHorizontalAlignment(Format::AlignRight);
@@ -241,7 +241,7 @@ int main()
 
     //---------------------------------------------------------------
     //Create the fourth sheet.
-    xlsx.addWorksheet("NumFormats");
+    xlsx.addSheet("NumFormats");
     xlsx.setColumn("B", "B", 40);
     writeInternalNumFormatsCell(xlsx, 4, 2.5681, 2);
     writeInternalNumFormatsCell(xlsx, 5, 2500000, 3);
@@ -259,7 +259,7 @@ int main()
 
     //---------------------------------------------------------------
     //Create the fifth sheet.
-    xlsx.addWorksheet("Merging");
+    xlsx.addSheet("Merging");
     Format centerAlign;
     centerAlign.setHorizontalAlignment(Format::AlignHCenter);
     centerAlign.setVerticalAlignment(Format::AlignVCenter);
@@ -272,7 +272,7 @@ int main()
 
     //---------------------------------------------------------------
     //Create the fifth sheet.
-    xlsx.addWorksheet("Grouping");
+    xlsx.addSheet("Grouping");
     qsrand(QDateTime::currentMSecsSinceEpoch());
     for (int row=2; row<31; ++row) {
         for (int col=1; col<=10; ++col)

examples/xlsx/formulas/main.cpp

@@ -50,7 +50,7 @@ int main()
     //![1]
 
     //![2]
-    xlsx.addWorksheet("ArrayFormula");
+    xlsx.addSheet("ArrayFormula");
     Worksheet *sheet = xlsx.currentWorksheet();
 
     for (int row=2; row<20; ++row) {

examples/xlsx/numberformat/main.cpp

@@ -32,7 +32,7 @@ int main(int argc, char** argv)
     }
 
     //Builtin number formats
-    xlsx.addWorksheet();
+    xlsx.addSheet();
     xlsx.setColumn(1, 4, 20.0);
     xlsx.write(1, 1, "Raw data", header);
     xlsx.write(1, 2, "Builtin Format", header);

examples/xlsx/worksheetoperations/main.cpp

@@ -5,27 +5,27 @@ int main()
 {
     QXlsx::Document xlsx;
 
-    xlsx.renameWorksheet("Sheet1", "TheFirstSheet");
+    xlsx.renameSheet("Sheet1", "TheFirstSheet");
 
     for (int i=1; i<20; ++i) {
         for (int j=1; j<15; ++j)
             xlsx.write(i, j, QString("R %1 C %2").arg(i).arg(j));
     }
 
-    xlsx.addWorksheet("TheSecondSheet");
+    xlsx.addSheet("TheSecondSheet");
     xlsx.write(2, 2, "Hello Qt Xlsx");
 
-    xlsx.copyWorksheet("TheFirstSheet", "CopyOfTheFirst");
+    xlsx.copySheet("TheFirstSheet", "CopyOfTheFirst");
 
-    xlsx.addWorksheet("TheForthSheet");
+    xlsx.addSheet("TheForthSheet");
     xlsx.write(3, 3, "This will be deleted...");
 
-    xlsx.selectWorksheet("CopyOfTheFirst");
+    xlsx.selectSheet("CopyOfTheFirst");
     xlsx.write(25, 2, "On the Copy Sheet");
 
-    xlsx.deleteWorksheet("TheForthSheet");
+    xlsx.deleteSheet("TheForthSheet");
 
-    xlsx.moveWorksheet("TheSecondSheet", 0);
+    xlsx.moveSheet("TheSecondSheet", 0);
 
     xlsx.save();
 

examples/xlsx/xlsxwidget/main.cpp

@@ -24,13 +24,15 @@ int main(int argc, char **argv)
 
     //![2]
     Document xlsx(filePath);
-    foreach (QString sheetName, xlsx.worksheetNames()) {
-        Worksheet *sheet = xlsx.worksheet(sheetName);
-        QTableView *view = new QTableView(&tabWidget);
-        view->setModel(new SheetModel(sheet, view));
-        foreach (CellRange range, sheet->mergedCells())
-            view->setSpan(range.firstRow()-1, range.firstColumn()-1, range.rowCount(), range.columnCount());
-        tabWidget.addTab(view, sheetName);
+    foreach (QString sheetName, xlsx.sheetNames()) {
+        Worksheet *sheet = dynamic_cast<Worksheet *>(xlsx.sheet(sheetName));
+        if (sheet) {
+            QTableView *view = new QTableView(&tabWidget);
+            view->setModel(new SheetModel(sheet, view));
+            foreach (CellRange range, sheet->mergedCells())
+                view->setSpan(range.firstRow()-1, range.firstColumn()-1, range.rowCount(), range.columnCount());
+            tabWidget.addTab(view, sheetName);
+        }
     }
     //![2]