From 419a3f1cd2a7b3262d744e200aad5488d9f36daa Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <uwelk@xhochy.com>
Date: Fri, 14 Jun 2013 19:04:05 +0200
Subject: [PATCH] Prefix HTTP API v1.0 members

---
 src/tomahawk/TomahawkApp.cpp | 46 ++++++++++++++++++------------------
 src/tomahawk/TomahawkApp.h   |  4 ++--
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/tomahawk/TomahawkApp.cpp b/src/tomahawk/TomahawkApp.cpp
index b5239a051..0f17c6ca8 100644
--- a/src/tomahawk/TomahawkApp.cpp
+++ b/src/tomahawk/TomahawkApp.cpp
@@ -269,10 +269,10 @@ TomahawkApp::~TomahawkApp()
 {
     tDebug( LOGVERBOSE ) << "Shutting down Tomahawk...";
 
-    if ( !m_session.isNull() )
-        delete m_session.data();
-    if ( !m_connector.isNull() )
-        delete m_connector.data();
+    if ( !m_httpv1_session.isNull() )
+        delete m_httpv1_session.data();
+    if ( !m_httpv1_connector.isNull() )
+        delete m_httpv1_connector.data();
 
     if ( Pipeline::instance() )
         Pipeline::instance()->stop();
@@ -468,40 +468,40 @@ TomahawkApp::initHTTP()
     if ( !TomahawkSettings::instance()->httpEnabled() )
     {
         tLog() << "Stopping HTTPd, not enabled";
-        if ( !m_session.isNull() )
-            delete m_session.data();
-        if ( !m_connector.isNull() )
-            delete m_connector.data();
+        if ( !m_httpv1_session.isNull() )
+            delete m_httpv1_session.data();
+        if ( !m_httpv1_connector.isNull() )
+            delete m_httpv1_connector.data();
         return;
     }
 
-    if ( m_session )
+    if ( m_httpv1_session )
     {
         tLog() << "HTTPd session already exists, returning";
         return;
     }
 
-    m_session = QPointer< QxtHttpSessionManager >( new QxtHttpSessionManager() );
-    m_connector = QPointer< QxtHttpServerConnector >( new QxtHttpServerConnector );
-    if ( m_session.isNull() || m_connector.isNull() )
+    m_httpv1_session = QPointer< QxtHttpSessionManager >( new QxtHttpSessionManager() );
+    m_httpv1_connector = QPointer< QxtHttpServerConnector >( new QxtHttpServerConnector );
+    if ( m_httpv1_session.isNull() || m_httpv1_connector.isNull() )
     {
-        if ( !m_session.isNull() )
-            delete m_session.data();
-        if ( !m_connector.isNull() )
-            delete m_connector.data();
+        if ( !m_httpv1_session.isNull() )
+            delete m_httpv1_session.data();
+        if ( !m_httpv1_connector.isNull() )
+            delete m_httpv1_connector.data();
         tLog() << "Failed to start HTTPd, could not create object";
         return;
     }
 
-    m_session.data()->setPort( 60210 ); //TODO config
-    m_session.data()->setListenInterface( QHostAddress::LocalHost );
-    m_session.data()->setConnector( m_connector.data() );
+    m_httpv1_session.data()->setPort( 60210 ); //TODO config
+    m_httpv1_session.data()->setListenInterface( QHostAddress::LocalHost );
+    m_httpv1_session.data()->setConnector( m_httpv1_connector.data() );
 
-    Api_v1* api = new Api_v1( m_session.data() );
-    m_session.data()->setStaticContentService( api );
+    Api_v1* api = new Api_v1( m_httpv1_session.data() );
+    m_httpv1_session.data()->setStaticContentService( api );
 
-    tLog() << "Starting HTTPd on" << m_session.data()->listenInterface().toString() << m_session.data()->port();
-    m_session.data()->start();
+    tLog() << "Starting HTTPd on" << m_httpv1_session.data()->listenInterface().toString() << m_httpv1_session.data()->port();
+    m_httpv1_session.data()->start();
 }
 
 
diff --git a/src/tomahawk/TomahawkApp.h b/src/tomahawk/TomahawkApp.h
index 3286e58f7..39611b4c7 100644
--- a/src/tomahawk/TomahawkApp.h
+++ b/src/tomahawk/TomahawkApp.h
@@ -144,8 +144,8 @@ private:
 
     bool m_headless;
 
-    QPointer< QxtHttpServerConnector > m_connector;
-    QPointer< QxtHttpSessionManager > m_session;
+    QPointer< QxtHttpServerConnector > m_httpv1_connector;
+    QPointer< QxtHttpSessionManager > m_httpv1_session;
 };
 
 Q_DECLARE_METATYPE( PairList )