From b730250bdd6cd6db4204ea14ba82f2a50e9dcda8 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 12 Mar 2014 14:18:42 +0100 Subject: Switch to new praxisdif. --- client/docgen/docgen.cc | 13 +++++++++++++ client/docgen/docgen.pro | 18 +++++++++++------- client/docgen/highlight.cc | 1 + 3 files changed, 25 insertions(+), 7 deletions(-) (limited to 'client/docgen') diff --git a/client/docgen/docgen.cc b/client/docgen/docgen.cc index 4eb2e08..181b82c 100644 --- a/client/docgen/docgen.cc +++ b/client/docgen/docgen.cc @@ -41,6 +41,7 @@ #include "generate.h" #define WIDGETS_DIR "../widgets" +#define PRAXISDIF_DIR "../../praxisdif/curl" #define SERVER_DIR "../../server/src" #define CLIENT_DIR ".." #define OUTPUT "html" @@ -204,6 +205,18 @@ int main(int argc, char *argv[]) } } + // Praxisdif + { + QDir dir(PRAXISDIF_DIR); + QStringList filter; filter << "*.h"; + dir.setNameFilters(filter); + if(!dir.exists()) return 1; + QFileInfoList inflst = dir.entryInfoList(QDir::Files); + foreach(QFileInfo inf, inflst) { + files.append(inf.absoluteFilePath()); + } + } + foreach(QString file, files) { Doc doc = parse(file); if(doc.title != "" || doc.tag != "" || doc.classname != "") diff --git a/client/docgen/docgen.pro b/client/docgen/docgen.pro index 4521347..73e7ed2 100644 --- a/client/docgen/docgen.pro +++ b/client/docgen/docgen.pro @@ -7,12 +7,12 @@ INCLUDEPATH += . .. ../widgets QT += core gui xml svg network sql RESOURCES += ../client.qrc -include(../../VERSION) +include(../VERSION) DEFINES+=VERSION=\\\"$$VERSION\\\" win32 { LIBPATH += lua/lib - INCLUDEPATH += lua/include + INCLUDEPATH += lua/include ../../praxisdif/qt LIBS += -llua51 DEFINES += HOST_WIN32 } @@ -34,8 +34,6 @@ SOURCES += \ ../lua.cc \ ../luawidget.cc \ ../luadb.cc \ - ../luapraxisd.cc \ - ../praxisd.cc \ ../messagebox.cc \ ../macrowindow.cc \ ../collapser.cc \ @@ -46,6 +44,7 @@ SOURCES += \ ../header.cc \ ../macrodrawer.cc \ ../aboutbox.cc \ + ../shortcuttooltip.cc \ ../widgets/common.cc \ ../widgets/widget.cc \ ../widgets/label.cc \ @@ -64,7 +63,9 @@ SOURCES += \ ../widgets/checkgroupbox.cc \ ../widgets/window.cc \ ../widgets/altcombobox.cc \ - ../widgets/metawidget.cc + ../widgets/metawidget.cc \ + ../../praxisdif/qt/luapraxisd.cc \ + ../../praxisdif/qt/praxisd.cc HEADERS += \ genimage.h \ @@ -73,7 +74,6 @@ HEADERS += \ doc.h \ highlight.h \ ../expandbutton.h \ - ../praxisd.h \ ../template.h \ ../debug.h \ ../lua.h \ @@ -90,6 +90,7 @@ HEADERS += \ ../header.h \ ../macrodrawer.h \ ../aboutbox.h \ + ../shortcuttooltip.h \ ../widgets.h \ ../widgets/common.h \ ../widgets/widget.h \ @@ -109,4 +110,7 @@ HEADERS += \ ../widgets/checkgroupbox.h \ ../widgets/window.h \ ../widgets/altcombobox.h \ - ../widgets/metawidget.h + ../widgets/metawidget.h \ + ../../praxisdif/qt/luapraxisd.h \ + ../../praxisdif/curl/luapraxisd.h \ + ../../praxisdif/qt/praxisd.h diff --git a/client/docgen/highlight.cc b/client/docgen/highlight.cc index 0857320..018cf4f 100644 --- a/client/docgen/highlight.cc +++ b/client/docgen/highlight.cc @@ -169,4 +169,5 @@ QString highlight(QString code, lang_t lang) case xml: return highlight_xml(code); } + return ""; } -- cgit v1.2.3