Update docgen to build with new files.

2 files changed, 8 insertions, 10 deletions

diff --git a/client/docgen/docgen.pro b/client/docgen/docgen.pro
index a99c43a..4521347 100644
--- a/client/docgen/docgen.pro
+++ b/client/docgen/docgen.pro
@@ -15,13 +15,10 @@ win32 {
   INCLUDEPATH += lua/include
   LIBS += -llua51
   DEFINES += HOST_WIN32
-  LIBS += -lcurl -lexpat
 }
 
 unix {
   LIBS += -llua
-  LIBS += -lqjson
-  LIBS += -lcurl -lexpat
 }
 
 # Input
@@ -31,13 +28,14 @@ SOURCES += \
 	generate.cc \
 	parse.cc \
 	highlight.cc \
+	../expandbutton.cc \
+	../template.cc \
 	../debug.cc \
 	../lua.cc \
 	../luawidget.cc \
 	../luadb.cc \
 	../luapraxisd.cc \
-	../../server/src/praxisd.cc \
-	../../server/src/saxparser.cc \
+	../praxisd.cc \
 	../messagebox.cc \
 	../macrowindow.cc \
 	../collapser.cc \
@@ -46,8 +44,8 @@ SOURCES += \
 	../mainwindow.cc \
 	../macro.cc \
 	../header.cc \
-	../viewer.cc \
 	../macrodrawer.cc \
+	../aboutbox.cc \
 	../widgets/common.cc \
 	../widgets/widget.cc \
 	../widgets/label.cc \
@@ -74,6 +72,9 @@ HEADERS += \
 	parse.h \
 	doc.h \
 	highlight.h \
+	../expandbutton.h \
+	../praxisd.h \
+	../template.h \
 	../debug.h \
 	../lua.h \
 	../luawidget.h \
@@ -87,8 +88,8 @@ HEADERS += \
 	../entity.h \
 	../macro.h \
 	../header.h \
-	../viewer.h \
 	../macrodrawer.h \
+	../aboutbox.h \
 	../widgets.h \
 	../widgets/common.h \
 	../widgets/widget.h \
diff --git a/client/docgen/genimage.cc b/client/docgen/genimage.cc
index 02f1243..5e6ad95 100644
--- a/client/docgen/genimage.cc
+++ b/client/docgen/genimage.cc
@@ -33,15 +33,12 @@
 #include <QDir>
 #include <QDomDocument>
 
-#include <viewer.h>
 #include <widgets.h>
 
 QString cpr;
 QString user;
 QFont fixedfont;
 
-Viewer *viewer = NULL;
-
 extern QString output;
 
 QString genImage(QString xml, int idx)