Screw .pri files and add export macro to classes that should be exported.

diff --git a/anidbudpclient.pro b/anidbudpclient.pro
index 9c291dde8417cb14039225bcd4dbbd414cd1ca38..3985504523e9da24709a0d71b8cf7ee5c60153f5 100644 (file)
--- a/anidbudpclient.pro
+++ b/anidbudpclient.pro
@@ -14,8 +14,8 @@ static {
     message(anidbpudpclinet: Dynamic build)\r
        DESTDIR = build\r
 }\r
-INCLUDEPATH += $$PWD\r
-DEPENDPATH += $$PWD\r
+INCLUDEPATH += renameparser\r
+DEPENDPATH += renameparser\r
 DEFINES += ANIDBUDPCLIENT_LIBRARY\r
 SOURCES += client.cpp \\r
     abstractcommand.cpp \\r
@@ -68,4 +68,32 @@ CONV_HEADERS += include/AniDBUdpClient/Client \
 \r
 # RenameParser Files\r
 \r
-include(renameparser/parser.pri)\r
+HEADERS += renameparser/renameengine.h \\r
+       renameparser/functions.h \\r
+       renameparser/abstractparser.h \\r
+       renameparser/ast.h \\r
+       renameparser/debugwalk.h \\r
+       renameparser/abstractwalk.h \\r
+       renameparser/evaluatewalk.h \\r
+       renameparser/analyzewalk.h\r
+SOURCES += renameparser/renameengine.cpp \\r
+       renameparser/functions.cpp \\r
+       renameparser/abstractparser.cpp \\r
+       renameparser/ast.cpp \\r
+       renameparser/debugwalk.cpp \\r
+       renameparser/abstractwalk.cpp \\r
+       renameparser/evaluatewalk.cpp \\r
+       renameparser/analyzewalk.cpp\r
+\r
+HEADERS += renameparser/AniAdd/renameparser.h \\r
+       renameparser/AniAdd/renamegrammar_p.h \\r
+       renameparser/AniAdd/lexer.h\r
+SOURCES += renameparser/AniAdd/renameparser.cpp \\r
+       renameparser/AniAdd/renamegrammar.cpp \\r
+       renameparser/AniAdd/lexer.cpp\r
+\r
+QT *= script\r
+HEADERS += renameparser/ECMAScript/parser.h\r
+SOURCES += renameparser/ECMAScript/parser.cpp\r
+\r
+CONV_HEADERS += include/RenameParser/RenameEngine\r

diff --git a/renameparser/abstractparser.h b/renameparser/abstractparser.h
index ceb9fa696796e9e7db788f0702a399a0007a4bd7..7ea65738a53719d4b38be13535552158f231fb6d 100644 (file)
--- a/renameparser/abstractparser.h
+++ b/renameparser/abstractparser.h
@@ -1,6 +1,7 @@
 #ifndef ABSTRACTPARSER_H
 #define ABSTRACTPARSER_H
 
+#include "../anidbudpclient_global.h"
 #include <QString>
 #include <QStringList>
 #include <QMap>
@@ -9,7 +10,7 @@ namespace RenameParser {
 
 typedef QMap<QString, QString> Environment;
 
-class AbstractParser
+class ANIDBUDPCLIENTSHARED_EXPORT AbstractParser
 {
 public:
        AbstractParser();

diff --git a/renameparser/abstractwalk.h b/renameparser/abstractwalk.h
index 3c06b507d93650593c9c4865f85393dbe3210f01..ce47944b3d3ae5b7c84a41f7d018de0f75a99c8e 100644 (file)
--- 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 <QSharedPointer>
 #include <QMap>
@@ -9,7 +10,7 @@ namespace RenameParser {
 
 typedef QMap<QString, QString> Environment;
 
-class AbstractWalk
+class ANIDBUDPCLIENTSHARED_EXPORT AbstractWalk
 {
 public:
        AbstractWalk(QSharedPointer<AST::Node> ast);

diff --git a/renameparser/analyzewalk.cpp b/renameparser/analyzewalk.cpp
index 751d8f56a96b877fbb12127a26d591bc002e38f2..9248462d0701ce27495203a57ced7f467fa85fee 100644 (file)
--- a/renameparser/analyzewalk.cpp
+++ b/renameparser/analyzewalk.cpp
@@ -12,6 +12,7 @@ AnalyzeWalk::AnalyzeWalk(QSharedPointer<AST::Node> 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 634e9b64d3c3f71b7071262040e487bfc4a1f2bb..478de1152896d073f9fc2cc6872ef1e20a11eab0 100644 (file)
--- 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 <QStringList>
 
 namespace RenameParser {
 
-class AnalyzeWalk : public AbstractWalk
+class ANIDBUDPCLIENTSHARED_EXPORT AnalyzeWalk : public AbstractWalk
 {
 public:
        AnalyzeWalk(QSharedPointer<AST::Node> ast);

diff --git a/renameparser/debugwalk.h b/renameparser/debugwalk.h
index 1d75cba070ca10caa664112c3dcc578021af9f2e..b9906328ad6c56ff60acfee46fc79734392e625f 100644 (file)
--- 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::Node> ast);

diff --git a/renameparser/evaluatewalk.h b/renameparser/evaluatewalk.h
index 67a74ce466f807e40f575d96123ad5162210d1a6..3d59b5e1abc9ac9ff8a9c9734748a28439359174 100644 (file)
--- 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 <QStack>
 
 namespace RenameParser {
 
-class EvaluateWalk : public AbstractWalk
+class ANIDBUDPCLIENTSHARED_EXPORT EvaluateWalk : public AbstractWalk
 {
 public:
        EvaluateWalk(QSharedPointer<AST::Node> ast);

diff --git a/renameparser/functions.h b/renameparser/functions.h
index 0e801a4144114cc6ff9331411e322c9802911290..664562af414d958c23a47418a76670a328aa3cf6 100644 (file)
--- 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 ded6db5e100675ede345280da8bd8d3c7caa5993..1356033ae1a5712b06830e3bd07da91a2c145150 100644 (file)
--- a/renameparser/renameengine.h
+++ b/renameparser/renameengine.h
@@ -4,6 +4,7 @@
 #include <QString>
 #include <QMap>
 
+#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 {