From 66a5a1484b623a3abe3c3ad681294e8ab2ec7964 Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Fri, 4 Mar 2011 20:50:17 +0000
Subject: [PATCH] Fix libxrme build errors on windows

---
 3rdparty/libxrme/connection.cpp           | 16 ++++++++--------
 3rdparty/libxrme/connection.h             |  4 ++--
 3rdparty/libxrme/mediaplayerhandler.cpp   |  4 ++--
 3rdparty/libxrme/remotecontrolhandler.cpp |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/3rdparty/libxrme/connection.cpp b/3rdparty/libxrme/connection.cpp
index 920c4b40e..5e35b6b3a 100644
--- a/3rdparty/libxrme/connection.cpp
+++ b/3rdparty/libxrme/connection.cpp
@@ -158,36 +158,36 @@ QString Connection::jid_resource() const { return d->jid_resource_; }
 QString Connection::jid_host() const { return d->jid_host_; }
 bool Connection::is_verbose() const { return d->verbose_; }
 
-void Connection::SetMediaPlayer(MediaPlayerInterface* interface) {
+void Connection::SetMediaPlayer(MediaPlayerInterface* iface) {
   if (d->media_player_) {
     qWarning() << "Connection::SetMediaPlayer: this connection already has a"
                   " MediaPlayerInterface set";
     return;
   }
 
-  if (!interface) {
+  if (!iface) {
     qWarning() << "Connection::SetMediaPlayer called with NULL interface";
     return;
   }
 
-  d->media_player_ = interface;
-  d->handlers_ << new MediaPlayerHandler(interface);
+  d->media_player_ = iface;
+  d->handlers_ << new MediaPlayerHandler(iface);
 }
 
-void Connection::SetRemoteControl(RemoteControlInterface* interface) {
+void Connection::SetRemoteControl(RemoteControlInterface* iface) {
   if (d->media_player_) {
     qWarning() << "Connection::RemoteControlInterface: this connection already"
                   " has a RemoteControlInterface set";
     return;
   }
 
-  if (!interface) {
+  if (!iface) {
     qWarning() << "Connection::SetRemoteControl called with NULL interface";
     return;
   }
 
-  d->remote_control_ = interface;
-  d->handlers_ << new RemoteControlHandler(interface);
+  d->remote_control_ = iface;
+  d->handlers_ << new RemoteControlHandler(iface);
 }
 
 bool Connection::is_connected() const {
diff --git a/3rdparty/libxrme/connection.h b/3rdparty/libxrme/connection.h
index cb1e43c02..41d7d860b 100644
--- a/3rdparty/libxrme/connection.h
+++ b/3rdparty/libxrme/connection.h
@@ -92,14 +92,14 @@ public:
   // remote control agents.  Should be called before calling Connect().  The
   // Connection will NOT take ownership of the MediaPlayerInterface, and the
   // MediaPlayerInterface MUST stay alive for as long as the connection.
-  void SetMediaPlayer(MediaPlayerInterface* interface);
+  void SetMediaPlayer(MediaPlayerInterface* iface);
 
   // Sets a remote control on the connection.  Calling this means the XRME agent
   // will advertise itself as a remote control, and will receive state changes
   // from media player agents.  Should be called before calling Connect().  The
   // Connection will NOT take ownership of the RemoteControlInterface, and the
   // RemoteControlInterface MUST stay alive for as long as the connection.
-  void SetRemoteControl(RemoteControlInterface* interface);
+  void SetRemoteControl(RemoteControlInterface* iface);
 
   // Returns true after Connected() is emitted.
   bool is_connected() const;
diff --git a/3rdparty/libxrme/mediaplayerhandler.cpp b/3rdparty/libxrme/mediaplayerhandler.cpp
index 5fe49cb65..191e3d4d3 100644
--- a/3rdparty/libxrme/mediaplayerhandler.cpp
+++ b/3rdparty/libxrme/mediaplayerhandler.cpp
@@ -29,8 +29,8 @@
 
 namespace xrme {
 
-MediaPlayerHandler::MediaPlayerHandler(MediaPlayerInterface* interface)
-    : interface_(interface) {
+MediaPlayerHandler::MediaPlayerHandler(MediaPlayerInterface* iface)
+    : interface_(iface) {
   interface_->Attach(this);
 }
 
diff --git a/3rdparty/libxrme/remotecontrolhandler.cpp b/3rdparty/libxrme/remotecontrolhandler.cpp
index 5db377dee..7160175ea 100644
--- a/3rdparty/libxrme/remotecontrolhandler.cpp
+++ b/3rdparty/libxrme/remotecontrolhandler.cpp
@@ -28,8 +28,8 @@
 
 namespace xrme {
 
-RemoteControlHandler::RemoteControlHandler(RemoteControlInterface* interface)
-    : interface_(interface) {
+RemoteControlHandler::RemoteControlHandler(RemoteControlInterface* iface)
+    : interface_(iface) {
   interface_->Attach(this);
 }