From 1f7257e0616270221ff6cbeb065a441a6d68ea3d Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Fri, 13 May 2011 11:54:02 -0400 Subject: [PATCH] Add qtweetlib blocks files --- src/sip/twitter/CMakeLists.txt | 2 +- src/sip/twitter/twitter.cpp | 1 + thirdparty/qtweetlib/CMakeLists.txt | 282 ++++++++++++++-------------- 3 files changed, 148 insertions(+), 137 deletions(-) diff --git a/src/sip/twitter/CMakeLists.txt b/src/sip/twitter/CMakeLists.txt index 7944173fd..dd4185fd9 100644 --- a/src/sip/twitter/CMakeLists.txt +++ b/src/sip/twitter/CMakeLists.txt @@ -22,7 +22,7 @@ set( twitterUI include_directories( . ${CMAKE_CURRENT_BINARY_DIR} .. ${QT_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/thirdparty/qtweetlib/qtweetlib/src + ${CMAKE_SOURCE_DIR}/thirdparty/qtweetlib/QTweetLib/src ${CMAKE_SOURCE_DIR}/thirdparty/qtweetlib/tomahawk-custom ) diff --git a/src/sip/twitter/twitter.cpp b/src/sip/twitter/twitter.cpp index 9592d8cd1..35f85a827 100644 --- a/src/sip/twitter/twitter.cpp +++ b/src/sip/twitter/twitter.cpp @@ -143,6 +143,7 @@ QWidget* TwitterPlugin::configWidget() bool TwitterPlugin::connectPlugin( bool startup ) { + Q_UNUSED( startup ); qDebug() << Q_FUNC_INFO; m_cachedPeers = twitterCachedPeers(); diff --git a/thirdparty/qtweetlib/CMakeLists.txt b/thirdparty/qtweetlib/CMakeLists.txt index f3beb6c46..c39caa6b2 100644 --- a/thirdparty/qtweetlib/CMakeLists.txt +++ b/thirdparty/qtweetlib/CMakeLists.txt @@ -16,146 +16,156 @@ if(WIN32) endif(WIN32) set(TOMAHAWK_QTWEETLIB_SOURCES - qtweetlib/src/oauth.cpp - qtweetlib/src/oauthtwitter.cpp - qtweetlib/src/qtweetfriendstimeline.cpp - qtweetlib/src/qtweethometimeline.cpp - qtweetlib/src/qtweetmentions.cpp - qtweetlib/src/qtweetnetbase.cpp - qtweetlib/src/qtweetretweetbyme.cpp - qtweetlib/src/qtweetretweetsofme.cpp - qtweetlib/src/qtweetretweettome.cpp - qtweetlib/src/qtweetstatus.cpp - qtweetlib/src/qtweetstatusshow.cpp - qtweetlib/src/qtweetstatusupdate.cpp - qtweetlib/src/qtweetuser.cpp - qtweetlib/src/qtweetusertimeline.cpp - qtweetlib/src/qtweetstatusdestroy.cpp - qtweetlib/src/qtweetstatusretweet.cpp - qtweetlib/src/qtweetstatusretweets.cpp - qtweetlib/src/qtweetusershow.cpp - qtweetlib/src/qtweetuserlookup.cpp - qtweetlib/src/qtweetdirectmessages.cpp - qtweetlib/src/qtweetuserstream.cpp - qtweetlib/src/qtweetdmstatus.cpp - qtweetlib/src/qtweetusersearch.cpp - qtweetlib/src/qtweetuserstatusesfriends.cpp - qtweetlib/src/qtweetuserstatusesfollowers.cpp - qtweetlib/src/qtweetlist.cpp - qtweetlib/src/qtweetlistcreate.cpp - qtweetlib/src/qtweetlistupdate.cpp - qtweetlib/src/qtweetlistgetlists.cpp - qtweetlib/src/qtweetlistshowlist.cpp - qtweetlib/src/qtweetlistdeletelist.cpp - qtweetlib/src/qtweetliststatuses.cpp - qtweetlib/src/qtweetlistmemberships.cpp - qtweetlib/src/qtweetlistsubscriptions.cpp - qtweetlib/src/qtweetlistgetmembers.cpp - qtweetlib/src/qtweetlistaddmember.cpp - qtweetlib/src/qtweetlistdeletemember.cpp - qtweetlib/src/qtweetlistsubscribers.cpp - qtweetlib/src/qtweetlistsubscribe.cpp - qtweetlib/src/qtweetlistunsubscribe.cpp - qtweetlib/src/qtweetdirectmessagessent.cpp - qtweetlib/src/qtweetdirectmessagenew.cpp - qtweetlib/src/qtweetdirectmessagedestroy.cpp - qtweetlib/src/qtweetfriendshipcreate.cpp - qtweetlib/src/qtweetfriendshipdestroy.cpp - qtweetlib/src/qtweetfriendsid.cpp - qtweetlib/src/qtweetfollowersid.cpp - qtweetlib/src/qtweetaccountverifycredentials.cpp - qtweetlib/src/qtweetaccountratelimitstatus.cpp - qtweetlib/src/qtweetfavorites.cpp - qtweetlib/src/qtweetfavoritescreate.cpp - qtweetlib/src/qtweetfavoritesdestroy.cpp - qtweetlib/src/qtweetsearch.cpp - qtweetlib/src/qtweetsearchresult.cpp - qtweetlib/src/qtweetsearchpageresults.cpp - qtweetlib/src/qtweetplace.cpp - qtweetlib/src/qtweetgeoreversegeocode.cpp - qtweetlib/src/qtweetgeosearch.cpp - qtweetlib/src/qtweetgeosimilarplaces.cpp - qtweetlib/src/qtweetgeoplaceid.cpp - qtweetlib/src/qtweetgeoplacecreate.cpp - qtweetlib/src/qtweetgeocoord.cpp - qtweetlib/src/qtweetgeoboundingbox.cpp - qtweetlib/src/qtweetconvert.cpp - qtweetlib/src/qtweetentityurl.cpp - qtweetlib/src/qtweetentityhashtag.cpp - qtweetlib/src/qtweetentityusermentions.cpp + QTweetLib/src/oauth.cpp + QTweetLib/src/oauthtwitter.cpp + QTweetLib/src/qtweetfriendstimeline.cpp + QTweetLib/src/qtweethometimeline.cpp + QTweetLib/src/qtweetmentions.cpp + QTweetLib/src/qtweetnetbase.cpp + QTweetLib/src/qtweetretweetbyme.cpp + QTweetLib/src/qtweetretweetsofme.cpp + QTweetLib/src/qtweetretweettome.cpp + QTweetLib/src/qtweetstatus.cpp + QTweetLib/src/qtweetstatusshow.cpp + QTweetLib/src/qtweetstatusupdate.cpp + QTweetLib/src/qtweetuser.cpp + QTweetLib/src/qtweetusertimeline.cpp + QTweetLib/src/qtweetstatusdestroy.cpp + QTweetLib/src/qtweetstatusretweet.cpp + QTweetLib/src/qtweetstatusretweets.cpp + QTweetLib/src/qtweetusershow.cpp + QTweetLib/src/qtweetuserlookup.cpp + QTweetLib/src/qtweetdirectmessages.cpp + QTweetLib/src/qtweetuserstream.cpp + QTweetLib/src/qtweetdmstatus.cpp + QTweetLib/src/qtweetusersearch.cpp + QTweetLib/src/qtweetuserstatusesfriends.cpp + QTweetLib/src/qtweetuserstatusesfollowers.cpp + QTweetLib/src/qtweetlist.cpp + QTweetLib/src/qtweetlistcreate.cpp + QTweetLib/src/qtweetlistupdate.cpp + QTweetLib/src/qtweetlistgetlists.cpp + QTweetLib/src/qtweetlistshowlist.cpp + QTweetLib/src/qtweetlistdeletelist.cpp + QTweetLib/src/qtweetliststatuses.cpp + QTweetLib/src/qtweetlistmemberships.cpp + QTweetLib/src/qtweetlistsubscriptions.cpp + QTweetLib/src/qtweetlistgetmembers.cpp + QTweetLib/src/qtweetlistaddmember.cpp + QTweetLib/src/qtweetlistdeletemember.cpp + QTweetLib/src/qtweetlistsubscribers.cpp + QTweetLib/src/qtweetlistsubscribe.cpp + QTweetLib/src/qtweetlistunsubscribe.cpp + QTweetLib/src/qtweetdirectmessagessent.cpp + QTweetLib/src/qtweetdirectmessagenew.cpp + QTweetLib/src/qtweetdirectmessagedestroy.cpp + QTweetLib/src/qtweetfriendshipcreate.cpp + QTweetLib/src/qtweetfriendshipdestroy.cpp + QTweetLib/src/qtweetfriendsid.cpp + QTweetLib/src/qtweetfollowersid.cpp + QTweetLib/src/qtweetaccountverifycredentials.cpp + QTweetLib/src/qtweetaccountratelimitstatus.cpp + QTweetLib/src/qtweetfavorites.cpp + QTweetLib/src/qtweetfavoritescreate.cpp + QTweetLib/src/qtweetfavoritesdestroy.cpp + QTweetLib/src/qtweetsearch.cpp + QTweetLib/src/qtweetsearchresult.cpp + QTweetLib/src/qtweetsearchpageresults.cpp + QTweetLib/src/qtweetplace.cpp + QTweetLib/src/qtweetgeoreversegeocode.cpp + QTweetLib/src/qtweetgeosearch.cpp + QTweetLib/src/qtweetgeosimilarplaces.cpp + QTweetLib/src/qtweetgeoplaceid.cpp + QTweetLib/src/qtweetgeoplacecreate.cpp + QTweetLib/src/qtweetgeocoord.cpp + QTweetLib/src/qtweetgeoboundingbox.cpp + QTweetLib/src/qtweetconvert.cpp + QTweetLib/src/qtweetentityurl.cpp + QTweetLib/src/qtweetentityhashtag.cpp + QTweetLib/src/qtweetentityusermentions.cpp + QTweetLib/src/qtweetblocksblocking.cpp + QTweetLib/src/qtweetblocksblockingids.cpp + QTweetLib/src/qtweetblockscreate.cpp + QTweetLib/src/qtweetblocksdestroy.cpp + QTweetLib/src/qtweetblocksexists.cpp tomahawk-custom/tomahawkoauthtwitter.cpp ) set(TOMAHAWK_QTWEETLIB_HEADERS - qtweetlib/src/oauth.h - qtweetlib/src/oauthtwitter.h - qtweetlib/src/qtweetfriendstimeline.h - qtweetlib/src/qtweetlib_global.h - qtweetlib/src/qtweethometimeline.h - qtweetlib/src/qtweetmentions.h - qtweetlib/src/qtweetnetbase.h - qtweetlib/src/qtweetretweetbyme.h - qtweetlib/src/qtweetretweetsofme.h - qtweetlib/src/qtweetretweettome.h - qtweetlib/src/qtweetstatus.h - qtweetlib/src/qtweetstatusshow.h - qtweetlib/src/qtweetstatusupdate.h - qtweetlib/src/qtweetuser.h - qtweetlib/src/qtweetusertimeline.h - qtweetlib/src/qtweetstatusdestroy.h - qtweetlib/src/qtweetstatusretweet.h - qtweetlib/src/qtweetstatusretweets.h - qtweetlib/src/qtweetusershow.h - qtweetlib/src/qtweetuserlookup.h - qtweetlib/src/qtweetdirectmessages.h - qtweetlib/src/qtweetuserstream.h - qtweetlib/src/qtweetdmstatus.h - qtweetlib/src/qtweetusersearch.h - qtweetlib/src/qtweetuserstatusesfriends.h - qtweetlib/src/qtweetuserstatusesfollowers.h - qtweetlib/src/qtweetlist.h - qtweetlib/src/qtweetlistcreate.h - qtweetlib/src/qtweetlistupdate.h - qtweetlib/src/qtweetlistgetlists.h - qtweetlib/src/qtweetlistshowlist.h - qtweetlib/src/qtweetlistdeletelist.h - qtweetlib/src/qtweetliststatuses.h - qtweetlib/src/qtweetlistmemberships.h - qtweetlib/src/qtweetlistsubscriptions.h - qtweetlib/src/qtweetlistgetmembers.h - qtweetlib/src/qtweetlistaddmember.h - qtweetlib/src/qtweetlistdeletemember.h - qtweetlib/src/qtweetlistsubscribers.h - qtweetlib/src/qtweetlistsubscribe.h - qtweetlib/src/qtweetlistunsubscribe.h - qtweetlib/src/qtweetdirectmessagessent.h - qtweetlib/src/qtweetdirectmessagenew.h - qtweetlib/src/qtweetdirectmessagedestroy.h - qtweetlib/src/qtweetfriendshipcreate.h - qtweetlib/src/qtweetfriendshipdestroy.h - qtweetlib/src/qtweetfriendsid.h - qtweetlib/src/qtweetfollowersid.h - qtweetlib/src/qtweetaccountverifycredentials.h - qtweetlib/src/qtweetaccountratelimitstatus.h - qtweetlib/src/qtweetfavorites.h - qtweetlib/src/qtweetfavoritescreate.h - qtweetlib/src/qtweetfavoritesdestroy.h - qtweetlib/src/qtweetsearch.h - qtweetlib/src/qtweetsearchresult.h - qtweetlib/src/qtweetsearchpageresults.h - qtweetlib/src/qtweetplace.h - qtweetlib/src/qtweetgeoreversegeocode.h - qtweetlib/src/qtweetgeosearch.h - qtweetlib/src/qtweetgeosimilarplaces.h - qtweetlib/src/qtweetgeoplaceid.h - qtweetlib/src/qtweetgeoplacecreate.h - qtweetlib/src/qtweetgeocoord.h - qtweetlib/src/qtweetgeoboundingbox.h - qtweetlib/src/qtweetconvert.h - qtweetlib/src/qtweetentityurl.h - qtweetlib/src/qtweetentityhashtag.h - qtweetlib/src/qtweetentityusermentions.h + QTweetLib/src/oauth.h + QTweetLib/src/oauthtwitter.h + QTweetLib/src/qtweetfriendstimeline.h + QTweetLib/src/qtweetlib_global.h + QTweetLib/src/qtweethometimeline.h + QTweetLib/src/qtweetmentions.h + QTweetLib/src/qtweetnetbase.h + QTweetLib/src/qtweetretweetbyme.h + QTweetLib/src/qtweetretweetsofme.h + QTweetLib/src/qtweetretweettome.h + QTweetLib/src/qtweetstatus.h + QTweetLib/src/qtweetstatusshow.h + QTweetLib/src/qtweetstatusupdate.h + QTweetLib/src/qtweetuser.h + QTweetLib/src/qtweetusertimeline.h + QTweetLib/src/qtweetstatusdestroy.h + QTweetLib/src/qtweetstatusretweet.h + QTweetLib/src/qtweetstatusretweets.h + QTweetLib/src/qtweetusershow.h + QTweetLib/src/qtweetuserlookup.h + QTweetLib/src/qtweetdirectmessages.h + QTweetLib/src/qtweetuserstream.h + QTweetLib/src/qtweetdmstatus.h + QTweetLib/src/qtweetusersearch.h + QTweetLib/src/qtweetuserstatusesfriends.h + QTweetLib/src/qtweetuserstatusesfollowers.h + QTweetLib/src/qtweetlist.h + QTweetLib/src/qtweetlistcreate.h + QTweetLib/src/qtweetlistupdate.h + QTweetLib/src/qtweetlistgetlists.h + QTweetLib/src/qtweetlistshowlist.h + QTweetLib/src/qtweetlistdeletelist.h + QTweetLib/src/qtweetliststatuses.h + QTweetLib/src/qtweetlistmemberships.h + QTweetLib/src/qtweetlistsubscriptions.h + QTweetLib/src/qtweetlistgetmembers.h + QTweetLib/src/qtweetlistaddmember.h + QTweetLib/src/qtweetlistdeletemember.h + QTweetLib/src/qtweetlistsubscribers.h + QTweetLib/src/qtweetlistsubscribe.h + QTweetLib/src/qtweetlistunsubscribe.h + QTweetLib/src/qtweetdirectmessagessent.h + QTweetLib/src/qtweetdirectmessagenew.h + QTweetLib/src/qtweetdirectmessagedestroy.h + QTweetLib/src/qtweetfriendshipcreate.h + QTweetLib/src/qtweetfriendshipdestroy.h + QTweetLib/src/qtweetfriendsid.h + QTweetLib/src/qtweetfollowersid.h + QTweetLib/src/qtweetaccountverifycredentials.h + QTweetLib/src/qtweetaccountratelimitstatus.h + QTweetLib/src/qtweetfavorites.h + QTweetLib/src/qtweetfavoritescreate.h + QTweetLib/src/qtweetfavoritesdestroy.h + QTweetLib/src/qtweetsearch.h + QTweetLib/src/qtweetsearchresult.h + QTweetLib/src/qtweetsearchpageresults.h + QTweetLib/src/qtweetplace.h + QTweetLib/src/qtweetgeoreversegeocode.h + QTweetLib/src/qtweetgeosearch.h + QTweetLib/src/qtweetgeosimilarplaces.h + QTweetLib/src/qtweetgeoplaceid.h + QTweetLib/src/qtweetgeoplacecreate.h + QTweetLib/src/qtweetgeocoord.h + QTweetLib/src/qtweetgeoboundingbox.h + QTweetLib/src/qtweetconvert.h + QTweetLib/src/qtweetentityurl.h + QTweetLib/src/qtweetentityhashtag.h + QTweetLib/src/qtweetentityusermentions.h + QTweetLib/src/qtweetblocksblocking.h + QTweetLib/src/qtweetblocksblockingids.h + QTweetLib/src/qtweetblockscreate.h + QTweetLib/src/qtweetblocksdestroy.h + QTweetLib/src/qtweetblocksexists.h tomahawk-custom/tomahawkoauthtwitter.h ) @@ -165,7 +175,7 @@ include_directories( ${QT_INCLUDE_DIR} ${QT_INCLUDES} ${QJSON_INCLUDE_DIR} - qtweetlib/src + QTweetLib/src ) qt4_wrap_cpp( TOMAHAWK_QTWEETLIB_MOC ${TOMAHAWK_QTWEETLIB_HEADERS} )