Allow for building without proxy or renameparser support.

diff --git a/anidbudpclient.pro b/anidbudpclient.pro
index f57faf5f976a0efe868bcf88ee862a98602abada..99a1323bf2af7f8a3ef04fd4c4d0876fd9a1ab09 100644 (file)
--- a/anidbudpclient.pro
+++ b/anidbudpclient.pro
@@ -1,120 +1,136 @@
-# -------------------------------------------------\r
-# Project created by QtCreator 2009-03-22T14:53:52\r
-# -------------------------------------------------\r
-QT += network \\r
-    script\r
-QT -= gui\r
-TEMPLATE = lib\r
-TARGET = anidbudpclient\r
-static { \r
-    message(anidbpudpclinet: Static build)\r
-       DESTDIR = build-static\r
-}\r
-!static { \r
-    message(anidbpudpclinet: Dynamic build)\r
-       DESTDIR = build\r
-}\r
-INCLUDEPATH += renameparser\r
-DEPENDPATH += renameparser\r
-DEFINES += ANIDBUDPCLIENT_LIBRARY\r
-SOURCES += client.cpp \\r
-    abstractcommand.cpp \\r
-    authcommand.cpp \\r
-    rawcommand.cpp \\r
-    mylistaddcommand.cpp \\r
-    logoutcommand.cpp \\r
-    uptimecommand.cpp \\r
-       mylistcommand.cpp \\r
-       filecommand.cpp \\r
-       votecommand.cpp \\r
-       file.cpp \\r
-    hash.cpp \\r
-    hashproducer.cpp \\r
-       hashconsumer.cpp \\r
-    clientsentcommandsmodel.cpp \\r
-       clientqueuedcommandsmodel.cpp \\r
-       filerenamedelegate.cpp \\r
-       clientinterface.cpp \\r
-    myliststate.cpp\r
-\r
-HEADERS += client.h \\r
-    anidbudpclient_global.h \\r
-    abstractcommand.h \\r
-    authcommand.h \\r
-    rawcommand.h \\r
-    mylistaddcommand.h \\r
-    logoutcommand.h \\r
-    uptimecommand.h \\r
-       mylistcommand.h \\r
-       filecommand.h \\r
-       votecommand.h \\r
-       file.h \\r
-    hash.h \\r
-    hashproducer.h \\r
-    hashconsumer.h \\r
-       circularbuffer.h \\r
-    clientsentcommandsmodel.h \\r
-       clientqueuedcommandsmodel.h \\r
-       filerenamedelegate.h \\r
-       clientinterface.h \\r
-    myliststate.h\r
-\r
-CONV_HEADERS += include/AniDBUdpClient/Client \\r
-    include/AniDBUdpClient/AbstractCommand \\r
-    include/AniDBUdpClient/RawCommand \\r
-    include/AniDBUdpClient/MyListCommand \\r
-    include/AniDBUdpClient/MyListAddCommand \\r
-       include/AniDBUdpClient/FileCommand \\r
-       include/AniDBUdpClient/VoteCommand \\r
-       include/AniDBUdpClient/UptimeCommand \\r
-       include/AniDBUdpClient/File \\r
-       include/AniDBUdpClient/Hash \\r
-       include/AniDBUdpClient/ClientSentCommandsModel \\r
-       include/AniDBUdpClient/ClientQueuedCommandsModel \\r
-       include/AniDBUdpClient/FileRenameDelegate\r
-\r
-# proxy files\r
-\r
-CONFIG  += qxt\r
-QXT     *= network\r
-\r
-HEADERS += proxyclient.h \\r
-       proxyserver.h \\r
-\r
-SOURCES += proxyclient.cpp \\r
-       proxyserver.cpp \\r
-\r
-CONV_HEADERS += include/AniDBUdpClient/ProxyClient \\r
-       include/AniDBUdpClient/ProxyServer\r
-\r
-# RenameParser Files\r
-\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
+# -------------------------------------------------
+# Project created by QtCreator 2009-03-22T14:53:52
+# -------------------------------------------------
+QT += network \
+    script
+QT -= gui
+TEMPLATE = lib
+TARGET = anidbudpclient
+static { 
+    message(anidbpudpclinet: Static build)
+       DESTDIR = build-static
+}
+!static { 
+    message(anidbpudpclinet: Dynamic build)
+       DESTDIR = build
+}
+
+DEFINES += ANIDBUDPCLIENT_LIBRARY
+SOURCES += client.cpp \
+    abstractcommand.cpp \
+    authcommand.cpp \
+    rawcommand.cpp \
+    mylistaddcommand.cpp \
+    logoutcommand.cpp \
+    uptimecommand.cpp \
+       mylistcommand.cpp \
+       filecommand.cpp \
+       votecommand.cpp \
+       file.cpp \
+    hash.cpp \
+    hashproducer.cpp \
+       hashconsumer.cpp \
+    clientsentcommandsmodel.cpp \
+       clientqueuedcommandsmodel.cpp \
+       filerenamedelegate.cpp \
+       clientinterface.cpp \
+    myliststate.cpp
+
+HEADERS += client.h \
+    anidbudpclient_global.h \
+    abstractcommand.h \
+    authcommand.h \
+    rawcommand.h \
+    mylistaddcommand.h \
+    logoutcommand.h \
+    uptimecommand.h \
+       mylistcommand.h \
+       filecommand.h \
+       votecommand.h \
+       file.h \
+    hash.h \
+    hashproducer.h \
+    hashconsumer.h \
+       circularbuffer.h \
+    clientsentcommandsmodel.h \
+       clientqueuedcommandsmodel.h \
+       filerenamedelegate.h \
+       clientinterface.h \
+    myliststate.h
+
+CONV_HEADERS += include/AniDBUdpClient/Client \
+    include/AniDBUdpClient/AbstractCommand \
+    include/AniDBUdpClient/RawCommand \
+    include/AniDBUdpClient/MyListCommand \
+    include/AniDBUdpClient/MyListAddCommand \
+       include/AniDBUdpClient/FileCommand \
+       include/AniDBUdpClient/VoteCommand \
+       include/AniDBUdpClient/UptimeCommand \
+       include/AniDBUdpClient/File \
+       include/AniDBUdpClient/Hash \
+       include/AniDBUdpClient/ClientSentCommandsModel \
+       include/AniDBUdpClient/ClientQueuedCommandsModel \
+       include/AniDBUdpClient/FileRenameDelegate
+
+# proxy files
+
+!noproxy {
+
+       CONFIG  += qxt
+       QXT     *= network
+
+       HEADERS += proxyclient.h \
+               proxyserver.h \
+
+       SOURCES += proxyclient.cpp \
+               proxyserver.cpp \
+
+       CONV_HEADERS += include/AniDBUdpClient/ProxyClient \
+               include/AniDBUdpClient/ProxyServer
+}
+noproxy {
+       DEFINES += ANIDBUDPCLIENT_NO_PROXY
+       message(Disabled proxy support)
+}
+
+# RenameParser Files
+
+!norenameparser {
+
+       INCLUDEPATH += renameparser
+       DEPENDPATH += renameparser
+
+       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
+}
+norenameparser {
+       DEFINES += ANIDBUDPCLIENT_NO_RENAMEPARSER
+       message(Disabled renameparser support)
+}

diff --git a/filerenamedelegate.cpp b/filerenamedelegate.cpp
index 9a54f87f156ef2974f6465891b74606165ca5be0..a40ccb69fe20148d9020c9b364b625b19285ebe4 100644 (file)
--- a/filerenamedelegate.cpp
+++ b/filerenamedelegate.cpp
@@ -23,6 +23,10 @@ RenameParser::RenameEngine *FileRenameDelegate::renameEngine() const
 
 void FileRenameDelegate::setRenameEngine(RenameParser::RenameEngine *renameEngine)
 {
+#ifdef ANIDBUDPCLIENT_NO_RENAMEPARSER
+       Q_UNUSED(renameEngine)
+       return;
+#else
        if (m_renameEngine)
        {
                m_renameEngine->disconnect(this);
@@ -34,6 +38,7 @@ void FileRenameDelegate::setRenameEngine(RenameParser::RenameEngine *renameEngin
                return;
 
        connect(m_renameEngine, SIGNAL(renameStringChanged()), this, SLOT(updateMasks()));
+#endif
 }
 
 
@@ -49,6 +54,12 @@ FMask FileRenameDelegate::requiredFMask() const
 
 void FileRenameDelegate::rename(const AniDBUdpClient::FileReply *reply, QString &fileName, QString &filePath)
 {
+#ifdef ANIDBUDPCLIENT_NO_RENAMEPARSER
+       Q_UNUSED(reply)
+       Q_UNUSED(fileName)
+       Q_UNUSED(filePath)
+       return;
+#else
        if (!m_renameEngine || !reply)
                return;
 
@@ -112,10 +123,15 @@ void FileRenameDelegate::rename(const AniDBUdpClient::FileReply *reply, QString
 
        fileName = env.value("FileName", "");
        filePath = env.value("FilePath", "");
+#endif
 }
 
 void FileRenameDelegate::updateMasks()
 {
+#ifdef ANIDBUDPCLIENT_NO_RENAMEPARSER
+       return;
+#else
+
        static bool init = true;
        static QMap<QString, FMask> fMaskVars;
        static QMap<QString, FileAMask> aMaskVars;
@@ -170,6 +186,7 @@ void FileRenameDelegate::updateMasks()
                if (aMaskVars.contains(var))
                        aMask |= aMaskVars[var];
        }
+#endif
 }
 
 } // namespace AniDBUdpClient

diff --git a/filerenamedelegate.h b/filerenamedelegate.h
index 6728ad9aac13b084d3d39295e8bf6fd8e443ddcf..f5e84358d85fcbf9082a9a1643b0b80ce44b5b4f 100644 (file)
--- a/filerenamedelegate.h
+++ b/filerenamedelegate.h
@@ -2,7 +2,13 @@
 #define FILERENAMEDELEGATE_H
 
 #include "anidbudpclient_global.h"
+#ifndef ANIDBUDPCLIENT_NO_RENAMEPARSER
 #include "renameparser/renameengine.h"
+#else
+       namespace RenameParser {
+               class RenameEngine {};
+       }
+#endif
 
 #include <QObject>
 #include <QStringList>