Clean up qtweetlib a bit, and put API keys back...can change them at some point if it becomes a problem

examples/twitter-api-keys.example

@@ -1,9 +0,0 @@
-set_property(
-    TARGET tomahawk_qtweetlib
-    APPEND PROPERTY COMPILE_DEFINITIONS CONSUMER_KEY="aaaaaaaaaaaaaaa"
-)
-
-set_property(
-    TARGET tomahawk_qtweetlib
-    APPEND PROPERTY COMPILE_DEFINITIONS CONSUMER_SECRET="bbbbbbbbbbbbbbbbb"
-)

src/CMakeLists.txt

@@ -124,7 +124,7 @@ INCLUDE_DIRECTORIES(
     ../alsa-playback
     ../rtaudio
     ../qxt/qxtweb-standalone/qxtweb
-    ../thirdparty/qtweetlib/src
+    ../thirdparty/qtweetlib/qtweetlib/src
 
     /usr/include/taglib
     /usr/local/include/taglib

thirdparty/qtweetlib/CMakeLists.txt

@@ -15,151 +15,151 @@ if(WIN32)
 endif(WIN32)
 
 set(TOMAHAWK_QTWEETLIB_SOURCES
-    src/oauth.cpp
-    src/oauthtwitter.cpp
-    src/qtweetfriendstimeline.cpp
-    src/qtweethometimeline.cpp
-    src/qtweetmentions.cpp
-    src/qtweetnetbase.cpp
-    src/qtweetretweetbyme.cpp
-    src/qtweetretweetsofme.cpp
-    src/qtweetretweettome.cpp
-    src/qtweetstatus.cpp
-    src/qtweetstatusshow.cpp
-    src/qtweetstatusupdate.cpp
-    src/qtweetuser.cpp
-    src/qtweetusertimeline.cpp
-    src/qtweetstatusdestroy.cpp
-    src/qtweetstatusretweet.cpp
-    src/qtweetstatusretweets.cpp
-    src/qtweetusershow.cpp
-    src/qtweetuserlookup.cpp
-    src/qtweetdirectmessages.cpp
-    src/qtweetuserstream.cpp
-    src/qtweetdmstatus.cpp
-    src/qtweetusersearch.cpp
-    src/qtweetuserstatusesfriends.cpp
-    src/qtweetuserstatusesfollowers.cpp
-    src/qtweetlist.cpp
-    src/qtweetlistcreate.cpp
-    src/qtweetlistupdate.cpp
-    src/qtweetlistgetlists.cpp
-    src/qtweetlistshowlist.cpp
-    src/qtweetlistdeletelist.cpp
-    src/qtweetliststatuses.cpp
-    src/qtweetlistmemberships.cpp
-    src/qtweetlistsubscriptions.cpp
-    src/qtweetlistgetmembers.cpp
-    src/qtweetlistaddmember.cpp
-    src/qtweetlistdeletemember.cpp
-    src/qtweetlistsubscribers.cpp
-    src/qtweetlistsubscribe.cpp
-    src/qtweetlistunsubscribe.cpp
-    src/qtweetdirectmessagessent.cpp
-    src/qtweetdirectmessagenew.cpp
-    src/qtweetdirectmessagedestroy.cpp
-    src/qtweetfriendshipcreate.cpp
-    src/qtweetfriendshipdestroy.cpp
-    src/qtweetfriendsid.cpp
-    src/qtweetfollowersid.cpp
-    src/qtweetaccountverifycredentials.cpp
-    src/qtweetaccountratelimitstatus.cpp
-    src/qtweetfavorites.cpp
-    src/qtweetfavoritescreate.cpp
-    src/qtweetfavoritesdestroy.cpp
-    src/qtweetsearch.cpp
-    src/qtweetsearchresult.cpp
-    src/qtweetsearchpageresults.cpp
-    src/qtweetplace.cpp
-    src/qtweetgeoreversegeocode.cpp
-    src/qtweetgeosearch.cpp
-    src/qtweetgeosimilarplaces.cpp
-    src/qtweetgeoplaceid.cpp
-    src/qtweetgeoplacecreate.cpp
-    src/qtweetgeocoord.cpp
-    src/qtweetgeoboundingbox.cpp
-    src/qtweetconvert.cpp
-    src/qtweetentityurl.cpp
-    src/qtweetentityhashtag.cpp
-    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
 )
 
 set(TOMAHAWK_QTWEETLIB_HEADERS
-    src/oauth.h
-    src/oauthtwitter.h
-    src/qtweetfriendstimeline.h
-    src/qtweetlib_global.h
-    src/qtweethometimeline.h
-    src/qtweetmentions.h
-    src/qtweetnetbase.h
-    src/qtweetretweetbyme.h
-    src/qtweetretweetsofme.h
-    src/qtweetretweettome.h
-    src/qtweetstatus.h
-    src/qtweetstatusshow.h
-    src/qtweetstatusupdate.h
-    src/qtweetuser.h
-    src/qtweetusertimeline.h
-    src/qtweetstatusdestroy.h
-    src/qtweetstatusretweet.h
-    src/qtweetstatusretweets.h
-    src/qtweetusershow.h
-    src/qtweetuserlookup.h
-    src/qtweetdirectmessages.h
-    src/qtweetuserstream.h
-    src/qtweetdmstatus.h
-    src/qtweetusersearch.h
-    src/qtweetuserstatusesfriends.h
-    src/qtweetuserstatusesfollowers.h
-    src/qtweetlist.h
-    src/qtweetlistcreate.h
-    src/qtweetlistupdate.h
-    src/qtweetlistgetlists.h
-    src/qtweetlistshowlist.h
-    src/qtweetlistdeletelist.h
-    src/qtweetliststatuses.h
-    src/qtweetlistmemberships.h
-    src/qtweetlistsubscriptions.h
-    src/qtweetlistgetmembers.h
-    src/qtweetlistaddmember.h
-    src/qtweetlistdeletemember.h
-    src/qtweetlistsubscribers.h
-    src/qtweetlistsubscribe.h
-    src/qtweetlistunsubscribe.h
-    src/qtweetdirectmessagessent.h
-    src/qtweetdirectmessagenew.h
-    src/qtweetdirectmessagedestroy.h
-    src/qtweetfriendshipcreate.h
-    src/qtweetfriendshipdestroy.h
-    src/qtweetfriendsid.h
-    src/qtweetfollowersid.h
-    src/qtweetaccountverifycredentials.h
-    src/qtweetaccountratelimitstatus.h
-    src/qtweetfavorites.h
-    src/qtweetfavoritescreate.h
-    src/qtweetfavoritesdestroy.h
-    src/qtweetsearch.h
-    src/qtweetsearchresult.h
-    src/qtweetsearchpageresults.h
-    src/qtweetplace.h
-    src/qtweetgeoreversegeocode.h
-    src/qtweetgeosearch.h
-    src/qtweetgeosimilarplaces.h
-    src/qtweetgeoplaceid.h
-    src/qtweetgeoplacecreate.h
-    src/qtweetgeocoord.h
-    src/qtweetgeoboundingbox.h
-    src/qtweetconvert.h
-    src/qtweetentityurl.h
-    src/qtweetentityhashtag.h
-    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
 )
 
 include_directories(
     .
     ${QT_INCLUDE_DIR}
     ${QT_INCLUDES}
-    src
+    qtweetlib/src
 )
 
 qt4_wrap_cpp( TOMAHAWK_QTWEETLIB_MOC ${TOMAHAWK_QTWEETLIB_HEADERS} )
@@ -173,11 +173,7 @@ target_link_libraries(tomahawk_qtweetlib
 
 SET_TARGET_PROPERTIES( tomahawk_qtweetlib PROPERTIES DEFINE_SYMBOL  MAKE_QTWEETLIB_LIB )
 
-IF( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/WARNING-twitter-api-keys )
-  INCLUDE( ${CMAKE_CURRENT_SOURCE_DIR}/WARNING-twitter-api-keys )
-ELSE()
-  MESSAGE( WARNING "Twitter Consumer Key/Secret OAuth keys not found; Twitter SIP support will not be available" )
-ENDIF()
+INCLUDE( ${CMAKE_CURRENT_SOURCE_DIR}/twitter-api-keys )
 
 INSTALL(TARGETS tomahawk_qtweetlib DESTINATION lib)