Update precompiled win32 gloox lib to 1.0.13 and rebuild glooxwrapper…

… with VC++ 2013. git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@16515 3db68df2-c116-0410-a063-a993310a9797
0ad · Apr 8, 2015 · 2c08e09 · 2c08e09
1 parent b275035
commit 2c08e09
Show file tree

Hide file tree

Showing 175 changed files with 628 additions and 369 deletions.
diff --git a/binaries/system/gloox-1.0.dll b/binaries/system/gloox-1.0.dll
diff --git a/binaries/system/gloox-1.0d.dll b/binaries/system/gloox-1.0d.dll
diff --git a/binaries/system/glooxwrapper.dll b/binaries/system/glooxwrapper.dll
diff --git a/binaries/system/glooxwrapper.lib b/binaries/system/glooxwrapper.lib
diff --git a/binaries/system/glooxwrapper.pdb b/binaries/system/glooxwrapper.pdb
diff --git a/binaries/system/glooxwrapper_dbg.dll b/binaries/system/glooxwrapper_dbg.dll
diff --git a/binaries/system/glooxwrapper_dbg.lib b/binaries/system/glooxwrapper_dbg.lib
diff --git a/binaries/system/glooxwrapper_dbg.pdb b/binaries/system/glooxwrapper_dbg.pdb
diff --git a/libraries/win32/gloox/include/gloox/adhoc.h b/libraries/win32/gloox/include/gloox/adhoc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2004-2014 by Jakob Schroeter <js@camaya.net>
+  Copyright (c) 2004-2015 by Jakob Schröter <js@camaya.net>
   This file is part of the gloox library. http://camaya.net/gloox
 
   This software is distributed under a license. The full license
@@ -15,7 +15,7 @@
 #ifndef ADHOC_H__
 #define ADHOC_H__
 
-#include "dataform.h"
+#include "adhocplugin.h"
 #include "disco.h"
 #include "disconodehandler.h"
 #include "discohandler.h"
@@ -76,7 +76,7 @@ namespace gloox
    * ...TBC...
    *
    * XEP version: 1.2
-   * @author Jakob Schroeter <js@camaya.net>
+   * @author Jakob Schröter <js@camaya.net>
    */
   class GLOOX_API Adhoc : public DiscoNodeHandler, public DiscoHandler, public IqHandler
   {
@@ -85,7 +85,7 @@ namespace gloox
        * @brief An abstraction of an Adhoc Command element (from Adhoc Commands, @xep{0050})
        * as a StanzaExtension.
        *
-       * @author Jakob Schroeter <js@camaya.net>
+       * @author Jakob Schröter <js@camaya.net>
        * @since 1.0
        */
       class GLOOX_API Command : public StanzaExtension
@@ -124,7 +124,7 @@ namespace gloox
           /**
            * An abstraction of a command note.
            *
-           * @author Jakob Schroeter <js@camaya.net>
+           * @author Jakob Schröter <js@camaya.net>
            * @since 1.0
            */
           class GLOOX_API Note
@@ -204,23 +204,23 @@ namespace gloox
            * @param node The node (command) to perform the action on.
            * @param sessionid The session ID of an already running adhoc command session.
            * @param action The action to perform.
-           * @param form An optional DataForm to include in the request. Will be deleted in Command's
+           * @param plugin An optional AdhocPlugin (e.g. DataForm) to include in the request. Will be deleted in Command's
            * destructor.
            */
           Command( const std::string& node, const std::string& sessionid, Action action,
-                   DataForm* form = 0 );
+                   AdhocPlugin* plugin = 0 );
 
           /**
            * Creates a Command object that can be used to perform the provided Action.
            * This constructor is used best to reply to an execute request.
            * @param node The node (command) to perform the action on.
            * @param sessionid The (possibly newly created) session ID of the adhoc command session.
            * @param status The execution status.
-           * @param form An optional DataForm to include in the reply. Will be deleted in Command's
+           * @param plugin An optional AdhocPlugin (e.g. DataForm) to include in the reply. Will be deleted in Command's
            * destructor.
            */
           Command( const std::string& node, const std::string& sessionid, Status status,
-                   DataForm* form = 0 );
+                   AdhocPlugin* plugin = 0 );
 
           /**
            * Creates a Command object that can be used to perform the provided Action.
@@ -231,24 +231,24 @@ namespace gloox
            * @param status The execution status.
            * @param executeAction The action to execute.
            * @param allowedActions Allowed reply actions.
-           * @param form An optional DataForm to include in the reply. Will be deleted in Command's
+           * @param plugin An optional AdhocPlugin (e.g. DataForm) to include in the reply. Will be deleted in Command's
            * destructor.
            */
           Command( const std::string& node, const std::string& sessionid, Status status,
                    Action executeAction, int allowedActions = Complete,
-                   DataForm* form = 0 );
+                   AdhocPlugin* plugin = 0 );
 
           /**
            * Creates a Command object that can be used to perform the provided Action.
            * This constructor is used best to execute the initial step of a command
            * (single or multi stage).
            * @param node The node (command) to perform the action on.
            * @param action The action to perform.
-           * @param form An optional DataForm to include in the request. Will be deleted in Command's
+           * @param plugin An optional AdhocPlugin (e.g. DataForm) to include in the request. Will be deleted in Command's
            * destructor.
            */
           Command( const std::string& node, Action action,
-                   DataForm* form = 0 );
+                   AdhocPlugin* plugin = 0 );
 
           /**
            * Creates a Command object from the given Tag.
@@ -307,10 +307,17 @@ namespace gloox
           void addNote( const Note* note ) { m_notes.push_back( note ); }
 
           /**
-           * Returns the command's embedded DataForm.
-           * @return The command's embedded DataForm. May be 0.
+           * Returns the command's embedded AdhocPlugin (e.g. DataForm).
+           * @return The command's embedded AdhocPlugin (e.g. DataForm). May be 0.
+           * @note This will be removed in 1.1. Use plugin() instead.
            */
-          const DataForm* form() const { return m_form; }
+          GLOOX_DEPRECATED const AdhocPlugin* form() const { return m_plugin; }
+
+          /**
+           * Returns the command's embedded AdhocPlugin (e.g. DataForm).
+           * @return The command's embedded AdhocPlugin (e.g. DataForm). May be 0.
+           */
+          const AdhocPlugin* plugin() const { return m_plugin; }
 
           // reimplemented from StanzaExtension
           virtual const std::string& filterString() const;
@@ -335,7 +342,7 @@ namespace gloox
 
             c->m_node = m_node;
             c->m_sessionid = m_sessionid;
-            c->m_form = m_form ? static_cast<DataForm*>( m_form->clone() ) : 0;
+            c->m_plugin = m_plugin ? static_cast<AdhocPlugin*>( m_plugin->clone() ) : 0;
             c->m_action = m_action;
             c->m_status = m_status;
             c->m_actions = m_actions;
@@ -351,7 +358,7 @@ namespace gloox
 
           std::string m_node;
           std::string m_sessionid;
-          DataForm* m_form;
+          AdhocPlugin* m_plugin;
           Action m_action;
           Status m_status;
           int m_actions;
@@ -403,7 +410,7 @@ namespace gloox
        * Use this function to respond to an execution request submitted by means
        * of AdhocCommandProvider::handleAdhocCommand().
        * It is recommended to use
-       * Command( const std::string&, const std::string&, Status, DataForm* )
+       * Command( const std::string&, const std::string&, Status, AdhocPlugin* )
        * to construct the @c command object.
        * Optionally, an Error object can be included. In that case the IQ sent is of type @c error.
        * @param remote The requester's JID.

diff --git a/libraries/win32/gloox/include/gloox/adhoccommandprovider.h b/libraries/win32/gloox/include/gloox/adhoccommandprovider.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2004-2014 by Jakob Schroeter <js@camaya.net>
+  Copyright (c) 2004-2015 by Jakob Schröter <js@camaya.net>
   This file is part of the gloox library. http://camaya.net/gloox
 
   This software is distributed under a license. The full license
@@ -31,7 +31,7 @@ namespace gloox
    *
    * Derived classes can be registered as Command Providers with the Adhoc object.
    *
-   * @author Jakob Schroeter <js@camaya.net>
+   * @author Jakob Schröter <js@camaya.net>
    */
   class GLOOX_API AdhocCommandProvider
   {

diff --git a/libraries/win32/gloox/include/gloox/adhochandler.h b/libraries/win32/gloox/include/gloox/adhochandler.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2004-2014 by Jakob Schroeter <js@camaya.net>
+  Copyright (c) 2004-2015 by Jakob Schröter <js@camaya.net>
   This file is part of the gloox library. http://camaya.net/gloox
 
   This software is distributed under a license. The full license
@@ -26,7 +26,7 @@ namespace gloox
    * Derived classes can be registered with the Adhoc object to receive notifications
    * about Adhoc Commands remote entities support.
    *
-   * @author Jakob Schroeter <js@camaya.net>
+   * @author Jakob Schröter <js@camaya.net>
    * @since 0.9
    */
   class GLOOX_API AdhocHandler

diff --git a/libraries/win32/gloox/include/gloox/adhocplugin.h b/libraries/win32/gloox/include/gloox/adhocplugin.h
@@ -0,0 +1,61 @@
+/*
+  Copyright (c) 2015 by Jakob Schröter <js@camaya.net>
+  This file is part of the gloox library. http://camaya.net/gloox
+
+  This software is distributed under a license. The full license
+  agreement can be found in the file LICENSE in this distribution.
+  This software may not be copied, modified, sold or distributed
+  other than expressed in the named license agreement.
+
+  This software is distributed without any warranty.
+*/
+
+
+
+#ifndef ADHOCPLUGIN_H__
+#define ADHOCPLUGIN_H__
+
+#include "gloox.h"
+#include "stanzaextension.h"
+
+namespace gloox
+{
+
+  class Tag;
+
+  /**
+   * @brief A base class for Adhoc Command plugins (DataForm, IO Data, ...).
+   *
+   * This is just a common base class for abstractions of protocols that can be embedded into Adhoc Commands.
+   * You should not need to use this class directly unless you're extending Adhoc Commands further.
+   *
+   * This class exists purely as an additional abstraction layer, to limit the type of objects that can be
+   * added to an Adhoc Command.
+   *
+   * @author Jakob Schröter <js@camaya.net>
+   * @since 1.0.13
+   */
+  class GLOOX_API AdhocPlugin : public StanzaExtension
+  {
+    public:
+
+      /**
+       *
+       */
+      AdhocPlugin( int type ) : StanzaExtension( type ) {}
+
+      /**
+       * Virtual destructor.
+       */
+      virtual ~AdhocPlugin() {}
+
+      /**
+       * Converts to  @b true if the plugin is valid, @b false otherwise.
+       */
+      virtual operator bool() const = 0;
+
+  };
+
+}
+
+#endif // ADHOCPLUGIN_H__
diff --git a/libraries/win32/gloox/include/gloox/amp.h b/libraries/win32/gloox/include/gloox/amp.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2014 by Jakob Schroeter <js@camaya.net>
+  Copyright (c) 2006-2015 by Jakob Schröter <js@camaya.net>
   This file is part of the gloox library. http://camaya.net/gloox
 
   This software is distributed under a license. The full license
@@ -32,7 +32,7 @@ namespace gloox
    * as a StanzaExtension.
    *
    * XEP Version: 1.2
-   * @author Jakob Schroeter <js@camaya.net>
+   * @author Jakob Schröter <js@camaya.net>
    * @author Vincent Thomasset
    * @since 1.0
    */
@@ -110,7 +110,7 @@ namespace gloox
       /**
        * Describes an AMP rule.
        *
-       * @author Jakob Schroeter <js@camaya.net>
+       * @author Jakob Schröter <js@camaya.net>
        * @since 1.0
        */
       class GLOOX_API Rule

diff --git a/libraries/win32/gloox/include/gloox/annotations.h b/libraries/win32/gloox/include/gloox/annotations.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2005-2014 by Jakob Schroeter <js@camaya.net>
+  Copyright (c) 2005-2015 by Jakob Schröter <js@camaya.net>
   This file is part of the gloox library. http://camaya.net/gloox
 
   This software is distributed under a license. The full license
@@ -88,7 +88,7 @@ namespace gloox
    * }
    * @endcode
    *
-   * @author Jakob Schroeter <js@camaya.net>
+   * @author Jakob Schröter <js@camaya.net>
    * @since 0.3
    */
   class GLOOX_API Annotations : public PrivateXML, public PrivateXMLHandler

diff --git a/libraries/win32/gloox/include/gloox/annotationshandler.h b/libraries/win32/gloox/include/gloox/annotationshandler.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2005-2014 by Jakob Schroeter <js@camaya.net>
+  Copyright (c) 2005-2015 by Jakob Schröter <js@camaya.net>
   This file is part of the gloox library. http://camaya.net/gloox
 
   This software is distributed under a license. The full license
@@ -43,7 +43,7 @@ namespace gloox
    * @brief A virtual interface which can be reimplemented to receive notes with help of
    * the Annotations object.
    *
-   * @author Jakob Schroeter <js@camaya.net>
+   * @author Jakob Schröter <js@camaya.net>
    * @since 0.3
    */
   class GLOOX_API AnnotationsHandler

diff --git a/libraries/win32/gloox/include/gloox/atomicrefcount.h b/libraries/win32/gloox/include/gloox/atomicrefcount.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2007-2014 by Jakob Schroeter <js@camaya.net>
+  Copyright (c) 2007-2015 by Jakob Schröter <js@camaya.net>
   This file is part of the gloox library. http://camaya.net/gloox
 
   This software is distributed under a license. The full license

diff --git a/libraries/win32/gloox/include/gloox/attention.h b/libraries/win32/gloox/include/gloox/attention.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2009-2014 by Jakob Schroeter <js@camaya.net>
+  Copyright (c) 2009-2015 by Jakob Schröter <js@camaya.net>
   This file is part of the gloox library. http://camaya.net/gloox
 
   This software is distributed under a license. The full license
@@ -28,7 +28,7 @@ namespace gloox
   /**
    * @brief This is an implementation of @xep{0224} as a StanzaExtension.
    *
-   * @author Jakob Schroeter <js@camaya.net>
+   * @author Jakob Schröter <js@camaya.net>
    * @since 1.0
    */
   class GLOOX_API Attention : public StanzaExtension

diff --git a/libraries/win32/gloox/include/gloox/base64.h b/libraries/win32/gloox/include/gloox/base64.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2005-2014 by Jakob Schroeter <js@camaya.net>
+  Copyright (c) 2005-2015 by Jakob Schröter <js@camaya.net>
   This file is part of the gloox library. http://camaya.net/gloox
 
   This software is distributed under a license. The full license
@@ -24,7 +24,7 @@ namespace gloox
   /**
    * @brief An implementation of the Base64 data encoding (RFC 3548)
    *
-   * @author Jakob Schroeter <js@camaya.net>
+   * @author Jakob Schröter <js@camaya.net>
    * @since 0.8
    */
   namespace Base64

diff --git a/libraries/win32/gloox/include/gloox/bookmarkhandler.h b/libraries/win32/gloox/include/gloox/bookmarkhandler.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2005-2014 by Jakob Schroeter <js@camaya.net>
+  Copyright (c) 2005-2015 by Jakob Schröter <js@camaya.net>
   This file is part of the gloox library. http://camaya.net/gloox
 
   This software is distributed under a license. The full license
@@ -58,7 +58,7 @@ namespace gloox
    * @brief A virtual interface which can be reimplemented to receive bookmarks with help of a
    * BookmarkStorage object.
    *
-   * @author Jakob Schroeter <js@camaya.net>
+   * @author Jakob Schröter <js@camaya.net>
    * @since 0.3
    */
   class GLOOX_API BookmarkHandler

diff --git a/libraries/win32/gloox/include/gloox/bookmarkstorage.h b/libraries/win32/gloox/include/gloox/bookmarkstorage.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2005-2014 by Jakob Schroeter <js@camaya.net>
+  Copyright (c) 2005-2015 by Jakob Schröter <js@camaya.net>
   This file is part of the gloox library. http://camaya.net/gloox
 
   This software is distributed under a license. The full license
@@ -91,7 +91,7 @@ namespace gloox
    * }
    * @endcode
    *
-   * @author Jakob Schroeter <js@camaya.net>
+   * @author Jakob Schröter <js@camaya.net>
    * @since 0.3
    */
   class GLOOX_API BookmarkStorage : public PrivateXML, public PrivateXMLHandler

diff --git a/libraries/win32/gloox/include/gloox/bytestream.h b/libraries/win32/gloox/include/gloox/bytestream.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2014 by Jakob Schroeter <js@camaya.net>
+  Copyright (c) 2006-2015 by Jakob Schröter <js@camaya.net>
   This file is part of the gloox library. http://camaya.net/gloox
 
   This software is distributed under a license. The full license
@@ -30,7 +30,7 @@ namespace gloox
    * Used as a base class for InBand Bytestreams as well as SOCKS5 Bytestreams.
    * You should not need to use this class directly.
    *
-   * @author Jakob Schroeter <js@camaya.net>
+   * @author Jakob Schröter <js@camaya.net>
    * @since 1.0
    */
   class GLOOX_API Bytestream