From 37ca79aa61427b1a1a32f77931cb67ebbe2090d7 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <tomahawk@jefferai.org>
Date: Wed, 23 May 2012 09:04:07 -0400
Subject: [PATCH] All post-0.5 changes so far

---
 src/accounts/twitter/sip/TwitterSip.cpp | 12 ++++++------
 src/accounts/twitter/sip/TwitterSip.h   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/accounts/twitter/sip/TwitterSip.cpp b/src/accounts/twitter/sip/TwitterSip.cpp
index 6bcdcba0d..d2658bcf4 100644
--- a/src/accounts/twitter/sip/TwitterSip.cpp
+++ b/src/accounts/twitter/sip/TwitterSip.cpp
@@ -137,8 +137,8 @@ TwitterSipPlugin::disconnectPlugin()
     m_checkTimer.stop();
     m_connectTimer.stop();
     m_dmPollTimer.stop();
-    if( !m_friendsTimeline.isNull() )
-        delete m_friendsTimeline.data();
+    if( !m_homeTimeline.isNull() )
+        delete m_homeTimeline.data();
     if( !m_mentions.isNull() )
         delete m_mentions.data();
     if( !m_directMessages.isNull() )
@@ -167,12 +167,12 @@ TwitterSipPlugin::accountAuthenticated( const QWeakPointer< TomahawkOAuthTwitter
 
     m_cachedTwitterAuth = twitterAuth;
 
-    m_friendsTimeline = QWeakPointer<QTweetFriendsTimeline>( new QTweetFriendsTimeline( m_cachedTwitterAuth.data(), this ) );
+    m_homeTimeline = QWeakPointer<QTweetHomeTimeline>( new QTweetHomeTimeline( m_cachedTwitterAuth.data(), this ) );
     m_mentions = QWeakPointer<QTweetMentions>( new QTweetMentions( m_cachedTwitterAuth.data(), this ) );
     m_directMessages = QWeakPointer<QTweetDirectMessages>( new QTweetDirectMessages( m_cachedTwitterAuth.data(), this ) );
     m_directMessageNew = QWeakPointer<QTweetDirectMessageNew>( new QTweetDirectMessageNew( m_cachedTwitterAuth.data(), this ) );
     m_directMessageDestroy = QWeakPointer<QTweetDirectMessageDestroy>( new QTweetDirectMessageDestroy( m_cachedTwitterAuth.data(), this ) );
-    connect( m_friendsTimeline.data(), SIGNAL( parsedStatuses(const QList< QTweetStatus > &) ), SLOT( friendsTimelineStatuses(const QList<QTweetStatus> &) ) );
+    connect( m_homeTimeline.data(), SIGNAL( parsedStatuses(const QList< QTweetStatus > &) ), SLOT( friendsTimelineStatuses(const QList<QTweetStatus> &) ) );
     connect( m_mentions.data(), SIGNAL( parsedStatuses(const QList< QTweetStatus > &) ), SLOT( mentionsStatuses(const QList<QTweetStatus> &) ) );
     connect( m_directMessages.data(), SIGNAL( parsedDirectMessages(const QList<QTweetDMStatus> &)), SLOT( directMessages(const QList<QTweetDMStatus> &) ) );
     connect( m_directMessageNew.data(), SIGNAL( parsedDirectMessage(const QTweetDMStatus &)), SLOT( directMessagePosted(const QTweetDMStatus &) ) );
@@ -203,8 +203,8 @@ TwitterSipPlugin::checkTimerFired()
 
     qDebug() << "TwitterSipPlugin looking at friends timeline since id " << m_cachedFriendsSinceId;
 
-    if ( !m_friendsTimeline.isNull() )
-        m_friendsTimeline.data()->fetch( m_cachedFriendsSinceId, 0, 800 );
+    if ( !m_homeTimeline.isNull() )
+        m_homeTimeline.data()->fetch( m_cachedFriendsSinceId, 0, 800 );
 
     if ( m_cachedMentionsSinceId == 0 )
         m_cachedMentionsSinceId = m_configuration[ "cachedmentionssinceid" ].toLongLong();
diff --git a/src/accounts/twitter/sip/TwitterSip.h b/src/accounts/twitter/sip/TwitterSip.h
index 57b4833f0..1e56e1992 100644
--- a/src/accounts/twitter/sip/TwitterSip.h
+++ b/src/accounts/twitter/sip/TwitterSip.h
@@ -27,10 +27,10 @@
 
 #include <QTweetLib/qtweetuser.h>
 #include <QTweetLib/qtweetnetbase.h>
-#include <QTweetLib/qtweetfriendstimeline.h>
 #include <QTweetLib/qtweetdirectmessages.h>
 #include <QTweetLib/qtweetdirectmessagenew.h>
 #include <QTweetLib/qtweetdirectmessagedestroy.h>
+#include <QTweetLib/qtweethometimeline.h>
 #include <QTweetLib/qtweetmentions.h>
 #include <QTweetLib/qtweetdmstatus.h>
 
@@ -104,7 +104,7 @@ private:
 
     QWeakPointer< TomahawkOAuthTwitter > m_cachedTwitterAuth;
 
-    QWeakPointer< QTweetFriendsTimeline > m_friendsTimeline;
+    QWeakPointer< QTweetHomeTimeline > m_homeTimeline;
     QWeakPointer< QTweetMentions > m_mentions;
     QWeakPointer< QTweetDirectMessages > m_directMessages;
     QWeakPointer< QTweetDirectMessageNew > m_directMessageNew;