- Add AniDBUdpClient namespace

diff --git a/lib/anidbudpclient/abstractcommand.cpp b/lib/anidbudpclient/abstractcommand.cpp
index ba529def1f50b3c82436e6d0b3a44575b0292730..790f256a9e19e61bde8155dfc1e6f9af31b30664 100644 (file)
--- a/lib/anidbudpclient/abstractcommand.cpp
+++ b/lib/anidbudpclient/abstractcommand.cpp
@@ -1,5 +1,7 @@
 #include "abstractcommand.h"
 
+namespace AniDBUdpClient {
+
 AbstractCommand::AbstractCommand(QObject *parent) : QObject(parent)
 {
        m_replyCode = UNKNOWN_REPLY;
@@ -41,3 +43,5 @@ AbstractCommand::ReplyCode AbstractCommand::replyCode() const
 {
        return m_replyCode;
 }
+
+} // namespace AniDBUdpClient

diff --git a/lib/anidbudpclient/abstractcommand.h b/lib/anidbudpclient/abstractcommand.h
index 91587a3e1906140aed7f3c20f39f07b1efd2ac1a..48b2b332fdfccac0a20fe11acef9968cb5af5f38 100644 (file)
--- a/lib/anidbudpclient/abstractcommand.h
+++ b/lib/anidbudpclient/abstractcommand.h
@@ -6,6 +6,9 @@
 #include <QPair>
 #include <QVariantMap>
 
+
+namespace AniDBUdpClient {
+
 class AniDBUdpClient;
 
 typedef QPair<QString, QVariantMap> Command;
@@ -196,7 +199,9 @@ protected:
        ReplyCode m_replyCode;
 };
 
+} // namespace AniDBUdpClient
+
 #include <QScriptEngine>
-Q_SCRIPT_DECLARE_QMETAOBJECT(AbstractCommand, QObject*);
+Q_SCRIPT_DECLARE_QMETAOBJECT(AniDBUdpClient::AbstractCommand, QObject*);
 
 #endif // ABSTRACTCOMMAND_H

diff --git a/lib/anidbudpclient/anidbudpclient.cpp b/lib/anidbudpclient/anidbudpclient.cpp
index 5b9d207ec015a2be3f4f7120f1d293024df691a8..9e3dc6130884c157548a66ff789369420333bb5d 100644 (file)
--- a/lib/anidbudpclient/anidbudpclient.cpp
+++ b/lib/anidbudpclient/anidbudpclient.cpp
@@ -9,12 +9,14 @@
 #include <QUdpSocket>
 #include <QTimer>
 
-#include <rawcommand.h>
-#include <logoutcommand.h>
-#include <uptimecommand.h>
+#include "rawcommand.h"
+#include "logoutcommand.h"
+#include "uptimecommand.h"
 
 #include <QtDebug>
 
+namespace AniDBUdpClient {
+
 const QByteArray AniDBUdpClient::clientName = CLIENT_NAME;
 const int AniDBUdpClient::clientVersion = CLIENT_VERSION;
 const int AniDBUdpClient::protocolVersion = PROTOCOL_VERSION;
@@ -228,7 +230,7 @@ void AniDBUdpClient::setFloodInterval(int interval)
        m_floodInterval = interval * 1000;
 }
 
-AniDBUdpClient::IdlePolicy AniDBUdpClient::idlePolicy() const
+IdlePolicy AniDBUdpClient::idlePolicy() const
 {
        return m_idlePolicy;
 }
@@ -238,7 +240,7 @@ void AniDBUdpClient::setIdlePolicy(IdlePolicy policy)
        m_idlePolicy = policy;
 }
 
-AniDBUdpClient::Error AniDBUdpClient::error() const
+Error AniDBUdpClient::error() const
 {
        return m_error;
 }
@@ -768,3 +770,5 @@ void CommandData::timerTimeout()
 {
        emit timeout(commandId);
 }
+
+} // namespace AniDBUdpClient

diff --git a/lib/anidbudpclient/anidbudpclient.h b/lib/anidbudpclient/anidbudpclient.h
index f688439acbf83bcc99f815e5e5f6954501ab0f34..7db00a4f582d855538a75a8027d1fbae73f20c41 100644 (file)
--- a/lib/anidbudpclient/anidbudpclient.h
+++ b/lib/anidbudpclient/anidbudpclient.h
@@ -9,16 +9,18 @@
 #include <QHostInfo>
 #include <QVariantMap>
 
+#include "anidbudpclient_global.h"
 #include "authcommand.h"
 
 class QtStateMachine;
 class QtState;
 class QtHistoryState;
 
-
 class QUdpSocket;
 class QTimer;
 
+namespace AniDBUdpClient {
+
 class AbstractCommand;
 class AuthCommand;
 class LogoutCommand;
@@ -53,26 +55,6 @@ public:
        static const int clientVersion;
        static const int protocolVersion;
 
-       enum Error
-       {
-               NoError,
-               BindError,
-               HostLookupError,
-               HostUnreachableError,
-               AuthenticationError,
-               BannedError,
-               ServerError,
-               UnknownError,
-       };
-
-       enum IdlePolicy
-       {
-               DoNothingIdlePolicy,
-               LogoutIdlePolicy,
-               ImmediateLogoutIdlePolicy,
-               KeepAliveIdlePolicy,
-       };
-
        AniDBUdpClient(QObject *parent = 0);
        virtual ~AniDBUdpClient();
 
@@ -256,7 +238,9 @@ private slots:
        void timerTimeout();
 };
 
+} // namespace AniDBUdpClient
+
 #include <QScriptEngine>
-Q_SCRIPT_DECLARE_QMETAOBJECT(AniDBUdpClient, QObject*);
+Q_SCRIPT_DECLARE_QMETAOBJECT(AniDBUdpClient::AniDBUdpClient, QObject*);
 
 #endif // ANIDBUDPCLIENT_H

diff --git a/lib/anidbudpclient/anidbudpclient_global.h b/lib/anidbudpclient/anidbudpclient_global.h
index 2f39cdac9bbb37c24367ba5b8d8bb5b1518fa621..d38c0584f7239bafa2f11cc24576ef68428d76db 100644 (file)
--- a/lib/anidbudpclient/anidbudpclient_global.h
+++ b/lib/anidbudpclient/anidbudpclient_global.h
@@ -13,4 +13,27 @@
 #  define ANIDBUDPCLIENTSHARED_EXPORT Q_DECL_IMPORT
 #endif
 
+namespace AniDBUdpClient
+{
+       enum Error
+       {
+               NoError,
+               BindError,
+               HostLookupError,
+               HostUnreachableError,
+               AuthenticationError,
+               BannedError,
+               ServerError,
+               UnknownError,
+       };
+
+       enum IdlePolicy
+       {
+               DoNothingIdlePolicy,
+               LogoutIdlePolicy,
+               ImmediateLogoutIdlePolicy,
+               KeepAliveIdlePolicy,
+       };
+}
+
 #endif // ANIDBUDPCLIENT_GLOBAL_H

diff --git a/lib/anidbudpclient/authcommand.cpp b/lib/anidbudpclient/authcommand.cpp
index 3b942c6619d1970317de012ab83087e8ada3fef9..fe2e2c129b3ee53fc5eb99562d3717c25b05f228 100644 (file)
--- a/lib/anidbudpclient/authcommand.cpp
+++ b/lib/anidbudpclient/authcommand.cpp
@@ -2,6 +2,8 @@
 
 #include "anidbudpclient.h"
 
+namespace AniDBUdpClient {
+
 AuthCommand::AuthCommand(QObject *parent) : AbstractCommand(parent)
 {
        m_compression = false;
@@ -113,3 +115,5 @@ qDebug() << "ERROR CODE: " << replyCode;
                        emit replyReady(false);
        }
 }
+
+} // namespace AniDBUdpClient

diff --git a/lib/anidbudpclient/authcommand.h b/lib/anidbudpclient/authcommand.h
index b22d10d6b4c4ea119ab58df1930629f21db655ee..972e7c674aedda7853065118d3ce1d4e0ace6131 100644 (file)
--- a/lib/anidbudpclient/authcommand.h
+++ b/lib/anidbudpclient/authcommand.h
@@ -3,6 +3,8 @@
 
 #include "abstractcommand.h"
 
+namespace AniDBUdpClient {
+
 class AuthCommand : public AbstractCommand
 {
        Q_OBJECT
@@ -39,8 +41,6 @@ public:
        Command rawCommand() const;
        void setRawReply(ReplyCode replyCode, const QString &reply, AniDBUdpClient *client);
 
-
-
 private:
        QString m_user;
        QString m_pass;
@@ -50,4 +50,6 @@ private:
        bool m_compression;
 };
 
+} // namespace AniDBUdpClient
+
 #endif // AUTHCOMMAND_H

diff --git a/lib/anidbudpclient/logoutcommand.cpp b/lib/anidbudpclient/logoutcommand.cpp
index a6671e8364172bdc8455ebb312aa70feae1e37b6..dfac7a104ee5205a9273528fa40c990f3c3a00b4 100644 (file)
--- a/lib/anidbudpclient/logoutcommand.cpp
+++ b/lib/anidbudpclient/logoutcommand.cpp
@@ -1,5 +1,7 @@
 #include "logoutcommand.h"
 
+namespace AniDBUdpClient {
+
 LogoutCommand::LogoutCommand(QObject *parent) : AbstractCommand(parent)
 {
 }
@@ -11,3 +13,5 @@ Command LogoutCommand::rawCommand() const
 
        return command;
 }
+
+} // namespace AniDBUdpClient

diff --git a/lib/anidbudpclient/logoutcommand.h b/lib/anidbudpclient/logoutcommand.h
index bb4350bf194b844aa9fd0e5f981461ef6e1a6cbf..949556125283825ea46ce85d3627aa1fbfa6f5c4 100644 (file)
--- a/lib/anidbudpclient/logoutcommand.h
+++ b/lib/anidbudpclient/logoutcommand.h
@@ -3,6 +3,8 @@
 
 #include "abstractcommand.h"
 
+namespace AniDBUdpClient {
+
 class ANIDBUDPCLIENTSHARED_EXPORT LogoutCommand : public AbstractCommand
 {
        Q_OBJECT
@@ -11,4 +13,6 @@ public:
        Command rawCommand() const;
 };
 
+} // namespace AniDBUdpClient
+
 #endif // LOGOUTCOMMAND_H

diff --git a/lib/anidbudpclient/mylistaddcommand.cpp b/lib/anidbudpclient/mylistaddcommand.cpp
index 2ec8708a16d41955a2b3f7d4c6f9053386a756bb..8a50da223cae546a89cafc1b2435e58ace9275ce 100644 (file)
--- a/lib/anidbudpclient/mylistaddcommand.cpp
+++ b/lib/anidbudpclient/mylistaddcommand.cpp
@@ -8,6 +8,8 @@
 
 #include "anidbudpclient.h"
 
+namespace AniDBUdpClient {
+
 MylistAddCommand::MylistAddCommand(QString file, QObject *parent) : AbstractCommand(parent)
 {
        m_file = file;
@@ -164,3 +166,5 @@ qDebug() << "hashing...";
 qDebug() << "hashing... complete!";
        return ed2k.result().toHex();
 }
+
+} // namespace AniDBUdpClient

diff --git a/lib/anidbudpclient/mylistaddcommand.h b/lib/anidbudpclient/mylistaddcommand.h
index 002625b8e12fecaf492bb21d987a0dec047d51ee..56f42682f1491142a9f47d8032bd4d1206fed0dd 100644 (file)
--- a/lib/anidbudpclient/mylistaddcommand.h
+++ b/lib/anidbudpclient/mylistaddcommand.h
@@ -1,12 +1,12 @@
 #ifndef MYLISTADDCOMMAND_H
 #define MYLISTADDCOMMAND_H
 
-#include "anidbudpclient_global.h"
 #include "abstractcommand.h"
 
 #include <QFuture>
 #include <QFutureWatcher>
 
+namespace AniDBUdpClient {
 
 class ANIDBUDPCLIENTSHARED_EXPORT MylistAddCommand : public AbstractCommand
 {
@@ -53,4 +53,6 @@ private:
        static const qint64 ED2K_PART_SIZE = 9728000;
 };
 
+} // namespace AniDBUdpClient
+
 #endif // MYLISTADDCOMMAND_H

diff --git a/lib/anidbudpclient/mylistcommand.cpp b/lib/anidbudpclient/mylistcommand.cpp
index bab42c5b1b6ab28d002c803ac488f42099d09cc5..4834e72766a1492e5a7a51b8444f64c47e9cd82b 100644 (file)
--- a/lib/anidbudpclient/mylistcommand.cpp
+++ b/lib/anidbudpclient/mylistcommand.cpp
@@ -2,6 +2,8 @@
 
 #include <QStringList>
 
+namespace AniDBUdpClient {
+
 MyListCommand::MyListCommand(QObject *parent) : AbstractCommand(parent)
 {
        init();
@@ -311,3 +313,5 @@ void MyListCommand::init()
        m_state = State(0);
        m_fileState = FileState(0);
 }
+
+} // namespace AniDBUdpClient

diff --git a/lib/anidbudpclient/mylistcommand.h b/lib/anidbudpclient/mylistcommand.h
index 67d4ec1b4a0eb1047e646f25b2cf8f9651626738..3cdcf6c1078b0d28d6a83bf40002c35a315d6c9c 100644 (file)
--- a/lib/anidbudpclient/mylistcommand.h
+++ b/lib/anidbudpclient/mylistcommand.h
@@ -1,10 +1,12 @@
 #ifndef MYLISTCOMMAND_H
 #define MYLISTCOMMAND_H
 
+#include "abstractcommand.h"
+
 #include <QDateTime>
 #include <QStringList>
 
-#include "abstractcommand.h"
+namespace AniDBUdpClient {
 
 class ANIDBUDPCLIENTSHARED_EXPORT MyListCommand : public AbstractCommand
 {
@@ -34,6 +36,7 @@ class ANIDBUDPCLIENTSHARED_EXPORT MyListCommand : public AbstractCommand
        Q_PROPERTY(FileState fileState READ fileState);
 
        Q_PROPERTY(QStringList multipleEntries READ multipleEntries);
+
 public:
        MyListCommand(QObject *parent = 0);
        MyListCommand(int lid, QObject *parent = 0);
@@ -111,8 +114,9 @@ private:
 
 };
 
+} // namespace AniDBUdpClient
 
 #include <QScriptEngine>
-Q_SCRIPT_DECLARE_QMETAOBJECT(MyListCommand, QObject*);
+Q_SCRIPT_DECLARE_QMETAOBJECT(AniDBUdpClient::MyListCommand, QObject*);
 
 #endif // MYLISTCOMMAND_H

diff --git a/lib/anidbudpclient/rawcommand.cpp b/lib/anidbudpclient/rawcommand.cpp
index 2b3ebf90d59f0b0fe993e442646d82cb3cf3f8b7..982ac878d934806e24499fb53ecd4384253b658b 100644 (file)
--- a/lib/anidbudpclient/rawcommand.cpp
+++ b/lib/anidbudpclient/rawcommand.cpp
@@ -1,5 +1,7 @@
 #include "rawcommand.h"
 
+namespace AniDBUdpClient {
+
 RawCommand::RawCommand(const QString &command, QObject *parent) : AbstractCommand(parent)
 {
        m_command = command;
@@ -9,3 +11,5 @@ Command RawCommand::rawCommand() const
 {
        return Command(m_command, QVariantMap());
 }
+
+} // namespace AniDBUdpClient

diff --git a/lib/anidbudpclient/rawcommand.h b/lib/anidbudpclient/rawcommand.h
index 990ffa4fc3d40858c751779bf24b779d7d588098..fb18ab469d56dc913854d3906e28d159c3aa0307 100644 (file)
--- a/lib/anidbudpclient/rawcommand.h
+++ b/lib/anidbudpclient/rawcommand.h
@@ -1,20 +1,23 @@
 #ifndef RAWCOMMAND_H
 #define RAWCOMMAND_H
 
-#include "anidbudpclient_global.h"
 #include "abstractcommand.h"
 
+namespace AniDBUdpClient {
+
 class ANIDBUDPCLIENTSHARED_EXPORT RawCommand : public AbstractCommand
 {
        Q_OBJECT
 
 public:
-
        RawCommand(const QString &command, QObject *parent = 0);
 
        Command rawCommand() const;
+
 private:
        QString m_command;
 };
 
+} // namespace AniDBUdpClient
+
 #endif // RAWCOMMAND_H

diff --git a/lib/anidbudpclient/uptimecommand.cpp b/lib/anidbudpclient/uptimecommand.cpp
index 7e2aa737bc7d85b50cfdebbf5069151852de4184..0b1f3dec73db6ebf04d2df23a2b689fc2207141d 100644 (file)
--- a/lib/anidbudpclient/uptimecommand.cpp
+++ b/lib/anidbudpclient/uptimecommand.cpp
@@ -1,5 +1,7 @@
 #include "uptimecommand.h"
 
+namespace AniDBUdpClient {
+
 UptimeCommand::UptimeCommand(QObject *parent) : AbstractCommand(parent)
 {
        m_uptime = 0;
@@ -39,3 +41,5 @@ void UptimeCommand::setRawReply(ReplyCode replyCode, const QString &reply, AniDB
                break;
        }
 }
+
+} // namespace AniDBUdpClient

diff --git a/lib/anidbudpclient/uptimecommand.h b/lib/anidbudpclient/uptimecommand.h
index 6b1f07b7d27535b43cd048a7ce2effdef58fb0d1..0eb131e22585cb12e2b784d376525726659c4961 100644 (file)
--- a/lib/anidbudpclient/uptimecommand.h
+++ b/lib/anidbudpclient/uptimecommand.h
@@ -3,6 +3,8 @@
 
 #include "abstractcommand.h"
 
+namespace AniDBUdpClient {
+
 class ANIDBUDPCLIENTSHARED_EXPORT UptimeCommand : public AbstractCommand
 {
        Q_OBJECT
@@ -20,7 +22,9 @@ private:
        int m_uptime;
 };
 
+} // namespace AniDBUdpClient
+
 #include <QScriptEngine>
-Q_SCRIPT_DECLARE_QMETAOBJECT(UptimeCommand, QObject*);
+Q_SCRIPT_DECLARE_QMETAOBJECT(AniDBUdpClient::UptimeCommand, QObject*);
 
 #endif // UPTIMECOMMAND_H

diff --git a/src/videowindow.cpp b/src/videowindow.cpp
index f4066654fa6d0a95c90f0529bd231bf6db7b0284..444d333947e08cdca6f537e6e502197e5862f26c 100644 (file)
--- a/src/videowindow.cpp
+++ b/src/videowindow.cpp
@@ -45,7 +45,7 @@ VideoWindow::VideoWindow(QWidget *parent) : QMainWindow(parent)
        destroyed = menuMoving = windowMoving = m_closeOnStop = false;
 
 #ifndef NO_ANIDBUDPCLIENT
-       anidb = new AniDBUdpClient(this);
+       anidb = new AniDBUdpClient::AniDBUdpClient(this);
        addCommand = 0;
        m_marked = true;
        m_automark = 0;
@@ -376,7 +376,7 @@ qDebug() << "Media changed state from" << oldstate << "to" << newstate;
                        if (!m_marked)
                                addCommand->deleteLater();
 
-                       addCommand = new MylistAddCommand(videoPlayer->currentFile(), this);
+                       addCommand = new AniDBUdpClient::MylistAddCommand(videoPlayer->currentFile(), this);
                        m_marked = false;
 #endif
                        break;
@@ -542,7 +542,7 @@ qDebug() << "hashing file...";
 
 void VideoWindow::doMarkWatched()
 {
-       MylistAddCommand *cmd = qobject_cast<MylistAddCommand *>(sender());
+       AniDBUdpClient::MylistAddCommand *cmd = qobject_cast<AniDBUdpClient::MylistAddCommand *>(sender());
        if (!cmd)
                return;
 
@@ -553,7 +553,7 @@ void VideoWindow::doMarkWatched()
 
 void VideoWindow::showMarkResult(bool success)
 {
-       MylistAddCommand *cmd = qobject_cast<MylistAddCommand *>(sender());
+       AniDBUdpClient::MylistAddCommand *cmd = qobject_cast<AniDBUdpClient::MylistAddCommand *>(sender());
        if (!cmd)
                return;
 

diff --git a/src/videowindow.h b/src/videowindow.h
index 11a2a5dd0f618103176e734bd0475582e511fe70..01aa553a6caeda406d194def9bcfcd68d0828be2 100644 (file)
--- a/src/videowindow.h
+++ b/src/videowindow.h
@@ -33,8 +33,10 @@ class Menu;
 class DirectoryPlaylist;
 
 #ifndef NO_ANIDBUDPCLIENT
-class AniDBUdpClient;
-class MylistAddCommand;
+namespace AniDBUdpClient {
+       class AniDBUdpClient;
+       class MylistAddCommand;
+}
 #endif
 
 class VideoWindow : public QMainWindow
@@ -146,8 +148,8 @@ private:
 #ifndef NO_ANIDBUDPCLIENT
        int m_automark;
        bool m_marked;
-       AniDBUdpClient *anidb;
-       MylistAddCommand *addCommand;
+       AniDBUdpClient::AniDBUdpClient *anidb;
+       AniDBUdpClient::MylistAddCommand *addCommand;
 #endif
 
        DirectoryPlaylist *playlist;