From 9491a3f03f99ff0b50cc999e275177f2d1619c82 Mon Sep 17 00:00:00 2001 From: APTX Date: Sun, 12 Dec 2010 09:44:18 +0100 Subject: [PATCH] Screw .pri files and add export macro to classes that should be exported. --- anidbudpclient.pro | 34 +++++++++++++++++++++++++++++++--- renameparser/abstractparser.h | 3 ++- renameparser/abstractwalk.h | 3 ++- renameparser/analyzewalk.cpp | 1 + renameparser/analyzewalk.h | 3 ++- renameparser/debugwalk.h | 3 ++- renameparser/evaluatewalk.h | 3 ++- renameparser/functions.h | 2 +- renameparser/renameengine.h | 3 ++- 9 files changed, 45 insertions(+), 10 deletions(-) diff --git a/anidbudpclient.pro b/anidbudpclient.pro index 9c291dd..3985504 100644 --- a/anidbudpclient.pro +++ b/anidbudpclient.pro @@ -14,8 +14,8 @@ static { message(anidbpudpclinet: Dynamic build) DESTDIR = build } -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD +INCLUDEPATH += renameparser +DEPENDPATH += renameparser DEFINES += ANIDBUDPCLIENT_LIBRARY SOURCES += client.cpp \ abstractcommand.cpp \ @@ -68,4 +68,32 @@ CONV_HEADERS += include/AniDBUdpClient/Client \ # RenameParser Files -include(renameparser/parser.pri) +HEADERS += renameparser/renameengine.h \ + renameparser/functions.h \ + renameparser/abstractparser.h \ + renameparser/ast.h \ + renameparser/debugwalk.h \ + renameparser/abstractwalk.h \ + renameparser/evaluatewalk.h \ + renameparser/analyzewalk.h +SOURCES += renameparser/renameengine.cpp \ + renameparser/functions.cpp \ + renameparser/abstractparser.cpp \ + renameparser/ast.cpp \ + renameparser/debugwalk.cpp \ + renameparser/abstractwalk.cpp \ + renameparser/evaluatewalk.cpp \ + renameparser/analyzewalk.cpp + +HEADERS += renameparser/AniAdd/renameparser.h \ + renameparser/AniAdd/renamegrammar_p.h \ + renameparser/AniAdd/lexer.h +SOURCES += renameparser/AniAdd/renameparser.cpp \ + renameparser/AniAdd/renamegrammar.cpp \ + renameparser/AniAdd/lexer.cpp + +QT *= script +HEADERS += renameparser/ECMAScript/parser.h +SOURCES += renameparser/ECMAScript/parser.cpp + +CONV_HEADERS += include/RenameParser/RenameEngine diff --git a/renameparser/abstractparser.h b/renameparser/abstractparser.h index ceb9fa6..7ea6573 100644 --- a/renameparser/abstractparser.h +++ b/renameparser/abstractparser.h @@ -1,6 +1,7 @@ #ifndef ABSTRACTPARSER_H #define ABSTRACTPARSER_H +#include "../anidbudpclient_global.h" #include #include #include @@ -9,7 +10,7 @@ namespace RenameParser { typedef QMap Environment; -class AbstractParser +class ANIDBUDPCLIENTSHARED_EXPORT AbstractParser { public: AbstractParser(); diff --git a/renameparser/abstractwalk.h b/renameparser/abstractwalk.h index 3c06b50..ce47944 100644 --- a/renameparser/abstractwalk.h +++ b/renameparser/abstractwalk.h @@ -1,6 +1,7 @@ #ifndef ABSTRACTWALK_H #define ABSTRACTWALK_H +#include "../anidbudpclient_global.h" #include "ast.h" #include #include @@ -9,7 +10,7 @@ namespace RenameParser { typedef QMap Environment; -class AbstractWalk +class ANIDBUDPCLIENTSHARED_EXPORT AbstractWalk { public: AbstractWalk(QSharedPointer ast); diff --git a/renameparser/analyzewalk.cpp b/renameparser/analyzewalk.cpp index 751d8f5..9248462 100644 --- a/renameparser/analyzewalk.cpp +++ b/renameparser/analyzewalk.cpp @@ -12,6 +12,7 @@ AnalyzeWalk::AnalyzeWalk(QSharedPointer ast) : AbstractWalk(ast) QString AnalyzeWalk::walk(Environment &env) { using namespace AST; + Q_UNUSED(env); /* switch (node->type()) { diff --git a/renameparser/analyzewalk.h b/renameparser/analyzewalk.h index 634e9b6..478de11 100644 --- a/renameparser/analyzewalk.h +++ b/renameparser/analyzewalk.h @@ -1,12 +1,13 @@ #ifndef ANALYZEWALK_H #define ANALYZEWALK_H +#include "../anidbudpclient_global.h" #include "abstractwalk.h" #include namespace RenameParser { -class AnalyzeWalk : public AbstractWalk +class ANIDBUDPCLIENTSHARED_EXPORT AnalyzeWalk : public AbstractWalk { public: AnalyzeWalk(QSharedPointer ast); diff --git a/renameparser/debugwalk.h b/renameparser/debugwalk.h index 1d75cba..b990632 100644 --- a/renameparser/debugwalk.h +++ b/renameparser/debugwalk.h @@ -1,11 +1,12 @@ #ifndef DEBUGWALK_H #define DEBUGWALK_H +#include "../anidbudpclient_global.h" #include "abstractwalk.h" namespace RenameParser { -class DebugWalk : public AbstractWalk +class ANIDBUDPCLIENTSHARED_EXPORT DebugWalk : public AbstractWalk { public: DebugWalk(QSharedPointer ast); diff --git a/renameparser/evaluatewalk.h b/renameparser/evaluatewalk.h index 67a74ce..3d59b5e 100644 --- a/renameparser/evaluatewalk.h +++ b/renameparser/evaluatewalk.h @@ -1,13 +1,14 @@ #ifndef EVALUATEWALK_H #define EVALUATEWALK_H +#include "../anidbudpclient_global.h" #include "abstractwalk.h" #include namespace RenameParser { -class EvaluateWalk : public AbstractWalk +class ANIDBUDPCLIENTSHARED_EXPORT EvaluateWalk : public AbstractWalk { public: EvaluateWalk(QSharedPointer ast); diff --git a/renameparser/functions.h b/renameparser/functions.h index 0e801a4..664562a 100644 --- a/renameparser/functions.h +++ b/renameparser/functions.h @@ -8,7 +8,7 @@ namespace RenameParser { namespace RenameFunctions { - QString max(const QStringList &args); + QString _max(const QStringList &args); QString len(const QStringList &args); QString pad(const QStringList &args); QString repl(const QStringList &args); diff --git a/renameparser/renameengine.h b/renameparser/renameengine.h index ded6db5..1356033 100644 --- a/renameparser/renameengine.h +++ b/renameparser/renameengine.h @@ -4,6 +4,7 @@ #include #include +#include "../anidbudpclient_global.h" #include "abstractparser.h" #include "functions.h" @@ -11,7 +12,7 @@ namespace RenameParser { typedef QString (*RenameFunction)(const QStringList &args); -class RenameEngine +class ANIDBUDPCLIENTSHARED_EXPORT RenameEngine { public: enum ParserType { -- 2.52.0