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

List:       kde-commits
Subject:    [calligra] /: move the contexts to odf/
From:       Tomas Mecir <mecirt () gmail ! com>
Date:       2016-03-06 17:21:13
Message-ID: E1accMj-0005vS-P3 () scm ! kde ! org
[Download RAW message or body]

Git commit a38c62524bb2dbcb0f9f64dc4357fd39135b3f0a by Tomas Mecir.
Committed on 05/03/2016 at 19:36.
Pushed by mecir into branch 'master'.

move the contexts to odf/

M  +1    -1    filters/sheets/excel/import/ExcelImport.cpp
M  +1    -1    sheets/CMakeLists.txt
R  +3    -0    sheets/odf/OdfLoadingContext.h [from: sheets/OdfLoadingContext.h - \
097% similarity] R  +3    -0    sheets/odf/OdfSavingContext.h [from: \
sheets/OdfSavingContext.h - 099% similarity] M  +3    -2    sheets/odf/SheetsOdf.h
M  +1    -1    sheets/odf/SheetsOdfCell.cpp
M  +2    -2    sheets/tests/TestCell.cpp
M  +0    -1    sheets/tests/TestSheet.cpp

http://commits.kde.org/calligra/a38c62524bb2dbcb0f9f64dc4357fd39135b3f0a

diff --git a/filters/sheets/excel/import/ExcelImport.cpp \
b/filters/sheets/excel/import/ExcelImport.cpp index 5759b6f..ff8d3ef 100644
--- a/filters/sheets/excel/import/ExcelImport.cpp
+++ b/filters/sheets/excel/import/ExcelImport.cpp
@@ -50,7 +50,7 @@
 #include <DocBase.h>
 #include <sheets/Sheet.h>
 #include <sheets/Condition.h>
-#include <OdfLoadingContext.h>
+#include <sheets/odf/OdfLoadingContext.h>
 #include <CalculationSettings.h>
 #include <CellStorage.h>
 #include <HeaderFooter.h>
diff --git a/sheets/CMakeLists.txt b/sheets/CMakeLists.txt
index d3de3f4..fb18fdf 100644
--- a/sheets/CMakeLists.txt
+++ b/sheets/CMakeLists.txt
@@ -386,7 +386,7 @@ install( FILES
     Global.h
     Map.h
     Number.h
-    OdfLoadingContext.h
+    odf/OdfLoadingContext.h
     PointStorage.h
     PrintSettings.h
     ProtectableObject.h
diff --git a/sheets/OdfLoadingContext.h b/sheets/odf/OdfLoadingContext.h
similarity index 97%
rename from sheets/OdfLoadingContext.h
rename to sheets/odf/OdfLoadingContext.h
index db7b3b7..216ccc8 100644
--- a/sheets/OdfLoadingContext.h
+++ b/sheets/odf/OdfLoadingContext.h
@@ -33,6 +33,8 @@ namespace Calligra
 {
 namespace Sheets
 {
+namespace Odf
+{
 
 /**
  * \ingroup OpenDocument
@@ -58,6 +60,7 @@ struct ShapeLoadingData {
     QPointF endPoint;
 };
 
+} // namespace Odf
 } // namespace Sheets
 } // namespace Calligra
 
diff --git a/sheets/OdfSavingContext.h b/sheets/odf/OdfSavingContext.h
similarity index 99%
rename from sheets/OdfSavingContext.h
rename to sheets/odf/OdfSavingContext.h
index 659ae1a..e1eb261 100644
--- a/sheets/OdfSavingContext.h
+++ b/sheets/odf/OdfSavingContext.h
@@ -36,6 +36,8 @@ namespace Calligra
 {
 namespace Sheets
 {
+namespace Odf
+{
 
 /**
  * \ingroup OpenDocument
@@ -107,6 +109,7 @@ private:
     AnchoredShapes m_cellAnchoredShapes;
 };
 
+} // namespace Odf
 } // namespace Sheets
 } // namespace Calligra
 
diff --git a/sheets/odf/SheetsOdf.h b/sheets/odf/SheetsOdf.h
index 99ad10d..bdffcdb 100644
--- a/sheets/odf/SheetsOdf.h
+++ b/sheets/odf/SheetsOdf.h
@@ -54,13 +54,14 @@ class Cell;
 class Conditions;
 class DocBase;
 class Map;
-class OdfLoadingContext;
 class ProtectableObject;
 class Region;
 class Sheet;
-struct ShapeLoadingData;
 
 namespace Odf {
+    class OdfLoadingContext;
+    struct ShapeLoadingData;
+
     CALLIGRA_SHEETS_ODF_EXPORT bool loadDocument(DocBase *doc, KoOdfReadStore \
                &odfStore);
     CALLIGRA_SHEETS_ODF_EXPORT bool saveDocument(DocBase *doc, \
KoDocument::SavingContext &documentContext);  
diff --git a/sheets/odf/SheetsOdfCell.cpp b/sheets/odf/SheetsOdfCell.cpp
index 51d92b0..4e32dda 100644
--- a/sheets/odf/SheetsOdfCell.cpp
+++ b/sheets/odf/SheetsOdfCell.cpp
@@ -786,7 +786,7 @@ void Odf::loadObjects(Cell *cell, const KoXmlElement &parent, \
OdfLoadingContext&  }
 }
 
-ShapeLoadingData Odf::loadObject(Cell *cell, const KoXmlElement &element, \
KoShapeLoadingContext &shapeContext) +Odf::ShapeLoadingData Odf::loadObject(Cell \
*cell, const KoXmlElement &element, KoShapeLoadingContext &shapeContext)  {
     ShapeLoadingData data;
     data.shape = 0;
diff --git a/sheets/tests/TestCell.cpp b/sheets/tests/TestCell.cpp
index 5fb8a64..d80c1fb 100644
--- a/sheets/tests/TestCell.cpp
+++ b/sheets/tests/TestCell.cpp
@@ -31,7 +31,7 @@
 #include <sheets/Map.h>
 #include <sheets/Sheet.h>
 #include <sheets/Style.h>
-#include <sheets/OdfLoadingContext.h>
+#include <sheets/odf/OdfLoadingContext.h>
 #include <sheets/Value.h>
 #include <sheets/odf/SheetsOdf.h>
 
@@ -56,7 +56,7 @@ void CellTest::testRichText()
     KoStore *store = KoStore::createStore(&buffer, KoStore::Read);
 
     KoOdfLoadingContext odfContext(stylesReader, store);
-    OdfLoadingContext context(odfContext);
+    Odf::OdfLoadingContext context(odfContext);
 
     KoDocumentResourceManager documentResources;
     KoShapeLoadingContext shapeContext(odfContext, &documentResources);
diff --git a/sheets/tests/TestSheet.cpp b/sheets/tests/TestSheet.cpp
index 590be21..84d1aa3 100644
--- a/sheets/tests/TestSheet.cpp
+++ b/sheets/tests/TestSheet.cpp
@@ -31,7 +31,6 @@
 #include <Map.h>
 #include <Sheet.h>
 #include <CellStorage.h>
-#include <OdfSavingContext.h>
 
 #include <QPainter>
 #include <QTest>


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