Refactor: Follow Qt5 module's file directories style

Xlsx Shared library can be used now
dbzhang800 · Aug 29, 2013 · 929db3d · 929db3d
1 parent a563809
commit 929db3d
Show file tree

Hide file tree

Showing 47 changed files with 95 additions and 47 deletions.
diff --git a/.qmake.conf b/.qmake.conf
@@ -0,0 +1,3 @@
+load(qt_build_config)
+
+MODULE_VERSION = 0.0.1
diff --git a/examples/examples.pro b/examples/examples.pro
@@ -1,6 +1,3 @@
 TEMPLATE = subdirs
-SUBDIRS = hello
-
-SUBDIRS += \
-    style
+SUBDIRS = xlsx
 
diff --git a/examples/hello/hello.pro b/examples/hello/hello.pro
diff --git a/examples/style/style.pro b/examples/style/style.pro
diff --git a/examples/xlsx/hello/hello.pro b/examples/xlsx/hello/hello.pro
@@ -0,0 +1,6 @@
+TARGET = hello
+
+#include(../../../src/xlsx/qtxlsx.pri)
+QT+=xlsx
+
+SOURCES += main.cpp
diff --git a/examples/hello/main.cpp → examples/xlsx/hello/main.cpp b/examples/hello/main.cpp → examples/xlsx/hello/main.cpp
diff --git a/examples/style/main.cpp → examples/xlsx/style/main.cpp b/examples/style/main.cpp → examples/xlsx/style/main.cpp
diff --git a/examples/xlsx/style/style.pro b/examples/xlsx/style/style.pro
@@ -0,0 +1,6 @@
+TARGET = style
+
+#include(../../../src/xlsx/qtxlsx.pri)
+QT += xlsx
+
+SOURCES += main.cpp
diff --git a/examples/xlsx/xlsx.pro b/examples/xlsx/xlsx.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+SUBDIRS = hello style
+
diff --git a/qtxlsx.pro b/qtxlsx.pro
@@ -0,0 +1 @@
+load(qt_parts)
diff --git a/qtxlsxwriter.pro b/qtxlsxwriter.pro
diff --git a/src/qxlsxwriter.cpp b/src/qxlsxwriter.cpp
diff --git a/src/qxlsxwriter.h b/src/qxlsxwriter.h
diff --git a/src/src.pro b/src/src.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+
+SUBDIRS = xlsx
diff --git a/src/qtxlsxwriter.pri → src/xlsx/qtxlsx.pri b/src/qtxlsxwriter.pri → src/xlsx/qtxlsx.pri
@@ -2,6 +2,7 @@ INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 
 QT += core gui gui-private
+!build_xlsx_lib:DEFINES += XLSX_NO_LIB
 
 HEADERS += $$PWD/xlsxdocprops_p.h \
     $$PWD/xlsxrelationships_p.h \
@@ -18,7 +19,8 @@ HEADERS += $$PWD/xlsxdocprops_p.h \
     $$PWD/xlsxpackage_p.h \
     $$PWD/xlsxworkbook_p.h \
     $$PWD/xlsxworksheet_p.h \
-    $$PWD/xlsxformat_p.h
+    $$PWD/xlsxformat_p.h \
+    $$PWD/xlsxglobal.h
 
 SOURCES += $$PWD/xlsxdocprops.cpp \
     $$PWD/xlsxrelationships.cpp \

diff --git a/src/xlsx/xlsx.pro b/src/xlsx/xlsx.pro
@@ -0,0 +1,13 @@
+TARGET = QtXlsx
+
+#QMAKE_DOCS = $$PWD/doc/qtxlsx.qdocconf
+
+load(qt_module)
+
+CONFIG += build_xlsx_lib
+include(qtxlsx.pri)
+
+QMAKE_TARGET_COMPANY = "Debao Zhang"
+QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2013 Debao Zhang <hello@debao.me>"
+QMAKE_TARGET_DESCRIPTION = ".Xlsx file wirter for Qt5"
+
diff --git a/src/xlsxcontenttypes.cpp → src/xlsx/xlsxcontenttypes.cpp b/src/xlsxcontenttypes.cpp → src/xlsx/xlsxcontenttypes.cpp
diff --git a/src/xlsxcontenttypes_p.h → src/xlsx/xlsxcontenttypes_p.h b/src/xlsxcontenttypes_p.h → src/xlsx/xlsxcontenttypes_p.h
diff --git a/src/xlsxdocprops.cpp → src/xlsx/xlsxdocprops.cpp b/src/xlsxdocprops.cpp → src/xlsx/xlsxdocprops.cpp
diff --git a/src/xlsxdocprops_p.h → src/xlsx/xlsxdocprops_p.h b/src/xlsxdocprops_p.h → src/xlsx/xlsxdocprops_p.h
diff --git a/src/xlsxformat.cpp → src/xlsx/xlsxformat.cpp b/src/xlsxformat.cpp → src/xlsx/xlsxformat.cpp
diff --git a/src/xlsxformat.h → src/xlsx/xlsxformat.h b/src/xlsxformat.h → src/xlsx/xlsxformat.h
@@ -25,6 +25,7 @@
 #ifndef QXLSX_FORMAT_H
 #define QXLSX_FORMAT_H
 
+#include "xlsxglobal.h"
 #include <QFont>
 #include <QColor>
 #include <QByteArray>
@@ -37,7 +38,7 @@ class Worksheet;
 class WorksheetPrivate;
 
 class FormatPrivate;
-class Format
+class Q_XLSX_EXPORT Format
 {
     Q_DECLARE_PRIVATE(Format)
 public:

diff --git a/src/xlsxformat_p.h → src/xlsx/xlsxformat_p.h b/src/xlsxformat_p.h → src/xlsx/xlsxformat_p.h
diff --git a/src/xlsx/xlsxglobal.h b/src/xlsx/xlsxglobal.h
@@ -0,0 +1,43 @@
+/****************************************************************************
+** Copyright (c) 2013 Debao Zhang <hello@debao.me>
+** All right reserved.
+**
+** Permission is hereby granted, free of charge, to any person obtaining
+** a copy of this software and associated documentation files (the
+** "Software"), to deal in the Software without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Software, and to
+** permit persons to whom the Software is furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be
+** included in all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+** NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+** LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+** OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+** WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+**
+****************************************************************************/
+#ifndef XLSXGLOBAL_H
+#define XLSXGLOBAL_H
+#include <QtGlobal>
+
+namespace QXlsx {
+
+#if !defined(QT_STATIC) && !defined(XLSX_NO_LIB)
+#  if defined(QT_BUILD_XLSX_LIB)
+#    define Q_XLSX_EXPORT Q_DECL_EXPORT
+#  else
+#    define Q_XLSX_EXPORT Q_DECL_IMPORT
+#  endif
+#else
+#  define Q_XLSX_EXPORT
+#endif
+
+}
+
+#endif // XLSXGLOBAL_H
diff --git a/src/xlsxpackage.cpp → src/xlsx/xlsxpackage.cpp b/src/xlsxpackage.cpp → src/xlsx/xlsxpackage.cpp
diff --git a/src/xlsxpackage_p.h → src/xlsx/xlsxpackage_p.h b/src/xlsxpackage_p.h → src/xlsx/xlsxpackage_p.h
diff --git a/src/xlsxrelationships.cpp → src/xlsx/xlsxrelationships.cpp b/src/xlsxrelationships.cpp → src/xlsx/xlsxrelationships.cpp
diff --git a/src/xlsxrelationships_p.h → src/xlsx/xlsxrelationships_p.h b/src/xlsxrelationships_p.h → src/xlsx/xlsxrelationships_p.h
diff --git a/src/xlsxsharedstrings.cpp → src/xlsx/xlsxsharedstrings.cpp b/src/xlsxsharedstrings.cpp → src/xlsx/xlsxsharedstrings.cpp
diff --git a/src/xlsxsharedstrings_p.h → src/xlsx/xlsxsharedstrings_p.h b/src/xlsxsharedstrings_p.h → src/xlsx/xlsxsharedstrings_p.h
diff --git a/src/xlsxstyles.cpp → src/xlsx/xlsxstyles.cpp b/src/xlsxstyles.cpp → src/xlsx/xlsxstyles.cpp
diff --git a/src/xlsxstyles_p.h → src/xlsx/xlsxstyles_p.h b/src/xlsxstyles_p.h → src/xlsx/xlsxstyles_p.h
diff --git a/src/xlsxtheme.cpp → src/xlsx/xlsxtheme.cpp b/src/xlsxtheme.cpp → src/xlsx/xlsxtheme.cpp
diff --git a/src/xlsxtheme_p.h → src/xlsx/xlsxtheme_p.h b/src/xlsxtheme_p.h → src/xlsx/xlsxtheme_p.h
diff --git a/src/xlsxutility.cpp → src/xlsx/xlsxutility.cpp b/src/xlsxutility.cpp → src/xlsx/xlsxutility.cpp
diff --git a/src/xlsxutility_p.h → src/xlsx/xlsxutility_p.h b/src/xlsxutility_p.h → src/xlsx/xlsxutility_p.h
diff --git a/src/xlsxworkbook.cpp → src/xlsx/xlsxworkbook.cpp b/src/xlsxworkbook.cpp → src/xlsx/xlsxworkbook.cpp
diff --git a/src/xlsxworkbook.h → src/xlsx/xlsxworkbook.h b/src/xlsxworkbook.h → src/xlsx/xlsxworkbook.h
@@ -25,6 +25,7 @@
 #ifndef XLSXWORKBOOK_H
 #define XLSXWORKBOOK_H
 
+#include "xlsxglobal.h"
 #include <QObject>
 #include <QList>
 class QIODevice;
@@ -38,7 +39,7 @@ class Styles;
 class Package;
 
 class WorkbookPrivate;
-class Workbook : public QObject
+class Q_XLSX_EXPORT Workbook : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(Workbook)

diff --git a/src/xlsxworkbook_p.h → src/xlsx/xlsxworkbook_p.h b/src/xlsxworkbook_p.h → src/xlsx/xlsxworkbook_p.h
diff --git a/src/xlsxworksheet.cpp → src/xlsx/xlsxworksheet.cpp b/src/xlsxworksheet.cpp → src/xlsx/xlsxworksheet.cpp
diff --git a/src/xlsxworksheet.h → src/xlsx/xlsxworksheet.h b/src/xlsxworksheet.h → src/xlsx/xlsxworksheet.h
@@ -25,6 +25,7 @@
 #ifndef XLSXWORKSHEET_H
 #define XLSXWORKSHEET_H
 
+#include "xlsxglobal.h"
 #include <QObject>
 #include <QStringList>
 #include <QMap>
@@ -39,7 +40,7 @@ class XmlStreamWriter;
 class Format;
 
 class WorksheetPrivate;
-class Worksheet : public QObject
+class Q_XLSX_EXPORT Worksheet : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(Worksheet)

diff --git a/src/xlsxworksheet_p.h → src/xlsx/xlsxworksheet_p.h b/src/xlsxworksheet_p.h → src/xlsx/xlsxworksheet_p.h
diff --git a/src/xmlstreamwriter.cpp → src/xlsx/xmlstreamwriter.cpp b/src/xmlstreamwriter.cpp → src/xlsx/xmlstreamwriter.cpp
diff --git a/src/xmlstreamwriter_p.h → src/xlsx/xmlstreamwriter_p.h b/src/xmlstreamwriter_p.h → src/xlsx/xmlstreamwriter_p.h
diff --git a/src/zipwriter.cpp → src/xlsx/zipwriter.cpp b/src/zipwriter.cpp → src/xlsx/zipwriter.cpp
diff --git a/src/zipwriter_p.h → src/xlsx/zipwriter_p.h b/src/zipwriter_p.h → src/xlsx/zipwriter_p.h
diff --git a/sync.profile b/sync.profile
@@ -0,0 +1,7 @@
+%modules = (
+    "QtXlsx" => "$basedir/src/xlsx",
+);
+
+%dependencies = (
+        "qtbase" => "",
+);