Refactored object tree dumping framework into a separate DLL

10 files changed, 88 insertions, 14 deletions

diff --git a/src/3rdparty/phonon/mmf/objectdump.cpp b/src/3rdparty/phonon/mmf/objectdump/objectdump.cpp
index 50c6bf8..50c6bf8 100644
--- a/src/3rdparty/phonon/mmf/objectdump.cpp
+++ b/src/3rdparty/phonon/mmf/objectdump/objectdump.cpp
diff --git a/src/3rdparty/phonon/mmf/objectdump.h b/src/3rdparty/phonon/mmf/objectdump/objectdump.h
index 4efc015..cbd9bea 100644
--- a/src/3rdparty/phonon/mmf/objectdump.h
+++ b/src/3rdparty/phonon/mmf/objectdump/objectdump.h
@@ -19,6 +19,8 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef OBJECTDUMP_H
 #define OBJECTDUMP_H
 
+#include "objectdump_global.h"
+
 #include <QObject>
 #include <QList>
 #include <QByteArray>
@@ -32,7 +34,7 @@ namespace ObjectDump
 /**
  * Abstract base for annotator classes invoked by QVisitor. 
  */
-class QAnnotator : public QObject
+class OBJECTDUMP_EXPORT QAnnotator : public QObject
 {
     Q_OBJECT
 public:
@@ -43,7 +45,7 @@ public:
 /**
  * Annotator which replicates QObject::dumpObjectTree functionality.
  */
-class QAnnotatorBasic : public QAnnotator
+class OBJECTDUMP_EXPORT QAnnotatorBasic : public QAnnotator
 {
     Q_OBJECT
 public:
@@ -53,7 +55,7 @@ public:
 /**
  * Annotator which returns widget information.
  */
-class QAnnotatorWidget : public QAnnotator
+class OBJECTDUMP_EXPORT QAnnotatorWidget : public QAnnotator
 {
     Q_OBJECT
 public:
@@ -66,7 +68,7 @@ class QDumperPrivate;
 /**
  * Class used to dump information about individual QObjects.
  */
-class QDumper : public QObject
+class OBJECTDUMP_EXPORT QDumper : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDumper)
@@ -101,7 +103,7 @@ class QVisitorPrivate;
 /**
  * Visitor class which dumps information about nodes in the object tree.
  */
-class QVisitor : public QObject
+class OBJECTDUMP_EXPORT QVisitor : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QVisitor)
@@ -150,12 +152,12 @@ private:
 // Utility functions
 //-----------------------------------------------------------------------------
 
-void addDefaultAnnotators(QDumper& dumper);
-void addDefaultAnnotators(QVisitor& visitor);
+void OBJECTDUMP_EXPORT addDefaultAnnotators(QDumper& dumper);
+void OBJECTDUMP_EXPORT addDefaultAnnotators(QVisitor& visitor);
 
-void dumpTreeFromRoot(const QObject& root, QVisitor& visitor);
-void dumpTreeFromLeaf(const QObject& leaf, QVisitor& visitor);
-void dumpAncestors(const QObject& leaf, QVisitor& visitor);
+void OBJECTDUMP_EXPORT dumpTreeFromRoot(const QObject& root, QVisitor& visitor);
+void OBJECTDUMP_EXPORT dumpTreeFromLeaf(const QObject& leaf, QVisitor& visitor);
+void OBJECTDUMP_EXPORT dumpAncestors(const QObject& leaf, QVisitor& visitor);
 
 } // namespace ObjectDump
 
diff --git a/src/3rdparty/phonon/mmf/objectdump/objectdump_global.h b/src/3rdparty/phonon/mmf/objectdump/objectdump_global.h
new file mode 100644
index 0000000..ff031c4
--- /dev/null
+++ b/src/3rdparty/phonon/mmf/objectdump/objectdump_global.h
@@ -0,0 +1,30 @@
+/*  This file is part of the KDE project.
+
+Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+
+This library is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 2.1 or 3 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef OBJECTDUMP_GLOBAL_H
+#define OBJECTDUMP_GLOBAL_H
+
+#include <QtCore/QtGlobal>
+
+#if defined(OBJECTDUMP_LIBRARY)
+#  define OBJECTDUMP_EXPORT Q_DECL_EXPORT
+#else
+#  define OBJECTDUMP_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif
diff --git a/src/3rdparty/phonon/mmf/objectdump/objectdump_stub.cpp b/src/3rdparty/phonon/mmf/objectdump/objectdump_stub.cpp
new file mode 100644
index 0000000..6207dac
--- /dev/null
+++ b/src/3rdparty/phonon/mmf/objectdump/objectdump_stub.cpp
@@ -0,0 +1,40 @@
+/*  This file is part of the KDE project.
+
+Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+
+This library is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 2.1 or 3 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "objectdump.h"
+
+QT_BEGIN_NAMESPACE
+
+namespace ObjectDump
+{
+
+void addDefaultAnnotators_sys(QDumper& /*dumper*/)
+{
+
+}
+
+void addDefaultAnnotators_sys(QVisitor& /*visitor*/)
+{
+
+}
+
+} // namespace ObjectDump
+
+QT_END_NAMESPACE
+
+
diff --git a/src/3rdparty/phonon/mmf/objectdump_symbian.cpp b/src/3rdparty/phonon/mmf/objectdump/objectdump_symbian.cpp
index 54ebc55..54ebc55 100644
--- a/src/3rdparty/phonon/mmf/objectdump_symbian.cpp
+++ b/src/3rdparty/phonon/mmf/objectdump/objectdump_symbian.cpp
diff --git a/src/3rdparty/phonon/mmf/objectdump_symbian.h b/src/3rdparty/phonon/mmf/objectdump/objectdump_symbian.h
index 26ab308..26ab308 100644
--- a/src/3rdparty/phonon/mmf/objectdump_symbian.h
+++ b/src/3rdparty/phonon/mmf/objectdump/objectdump_symbian.h
diff --git a/src/3rdparty/phonon/mmf/objecttree.cpp b/src/3rdparty/phonon/mmf/objectdump/objecttree.cpp
index f9d1c93..f9d1c93 100644
--- a/src/3rdparty/phonon/mmf/objecttree.cpp
+++ b/src/3rdparty/phonon/mmf/objectdump/objecttree.cpp
diff --git a/src/3rdparty/phonon/mmf/objecttree.h b/src/3rdparty/phonon/mmf/objectdump/objecttree.h
index 0c2031d..f2729fa 100644
--- a/src/3rdparty/phonon/mmf/objecttree.h
+++ b/src/3rdparty/phonon/mmf/objectdump/objecttree.h
@@ -19,6 +19,8 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef OBJECTTREE_H
 #define OBJECTTREE_H
 
+#include "objectdump_global.h"
+
 #include <QObject>
 #include <QStack>
 
@@ -30,7 +32,7 @@ namespace ObjectTree
 /**
  * Depth-first iterator for QObject tree
  */
-class DepthFirstConstIterator
+class OBJECTDUMP_EXPORT DepthFirstConstIterator
 {
 public:   
     DepthFirstConstIterator();
@@ -58,7 +60,7 @@ private:
 /**
  * Ancestor iterator for QObject tree
  */
-class AncestorConstIterator
+class OBJECTDUMP_EXPORT AncestorConstIterator
 {
 public:   
     AncestorConstIterator();
diff --git a/src/3rdparty/phonon/mmf/videooutput.cpp b/src/3rdparty/phonon/mmf/videooutput.cpp
index 2544a97..3f14f19 100644
--- a/src/3rdparty/phonon/mmf/videooutput.cpp
+++ b/src/3rdparty/phonon/mmf/videooutput.cpp
@@ -21,7 +21,7 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include "videooutputobserver.h"
 
 #ifdef _DEBUG
-#include "objectdump.h"
+#include "objectdump/objectdump.h"
 #endif
 
 #include <QPaintEvent>
diff --git a/src/3rdparty/phonon/mmf/videoplayer.cpp b/src/3rdparty/phonon/mmf/videoplayer.cpp
index e8b792f..b4f3d35 100644
--- a/src/3rdparty/phonon/mmf/videoplayer.cpp
+++ b/src/3rdparty/phonon/mmf/videoplayer.cpp
@@ -27,7 +27,7 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include "utils.h"
 
 #ifdef _DEBUG
-#include "objectdump.h"
+#include "objectdump/objectdump.h"
 #endif
 
 QT_BEGIN_NAMESPACE