Removed QtDocGenerator dependence from BoostPythonGenerator, so a lot

of function were moved from BoostPythonGenerator to the Generator class.

In other words, QtDocGenerator finally compiles and their unit test pass :-)

3 files changed, 6 insertions, 6 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9099adff8..89cf34fc2 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -3,7 +3,7 @@ project(sphinxtabletest)
 # TODO
 set(sphinxtabletest_SRC sphinxtabletest.cpp)
 qt4_automoc(${sphinxtabletest_SRC})
-include_directories(${QT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${boostpythongenerator_SOURCE_DIR})
+include_directories(${QT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${qtdoc_generator_SOURCE_DIR})
 add_executable(sphinxtabletest ${sphinxtabletest_SRC})
-target_link_libraries(sphinxtabletest ${QT_QTTEST_LIBRARY} ${APIEXTRACTOR_LIBRARY} libboostpythongenerator)
+target_link_libraries(sphinxtabletest ${QT_QTTEST_LIBRARY} ${APIEXTRACTOR_LIBRARY} qtdoc_generator generator)
 add_test("sphinxtable" sphinxtabletest)
diff --git a/tests/sphinxtabletest.cpp b/tests/sphinxtabletest.cpp
index 058a3b522..a35d11926 100644
--- a/tests/sphinxtabletest.cpp
+++ b/tests/sphinxtabletest.cpp
@@ -22,7 +22,7 @@
 */
 
 #include "sphinxtabletest.h"
-#include "docgenerator.h"
+#include "qtdocgenerator.h"
 #include <QtTest/QTest>
 #include <QDebug>
 
@@ -33,7 +33,7 @@ QString SphinxTableTest::transformXml(const char* xml)
 
 void SphinxTableTest::setUp()
 {
-    m_generator = new DocGenerator;
+    m_generator = new QtDocGenerator;
 }
 
 void SphinxTableTest::tearDown()
diff --git a/tests/sphinxtabletest.h b/tests/sphinxtabletest.h
index 163cc5337..57d8937d0 100644
--- a/tests/sphinxtabletest.h
+++ b/tests/sphinxtabletest.h
@@ -26,7 +26,7 @@
 
 #include <QObject>
 
-class DocGenerator;
+class QtDocGenerator;
 class SphinxTableTest : public QObject {
     Q_OBJECT
 
@@ -40,7 +40,7 @@ private slots:
     void testComplexTable();
     void testRowSpan2();
 private:
-    DocGenerator* m_generator;
+    QtDocGenerator* m_generator;
 
     QString transformXml(const char* xml);
 };