siptwitter: Do proper QTweetLib/ includes

CMakeLists.txt

@@ -73,7 +73,9 @@ macro_log_feature(LIBJREEN_FOUND "Jreen" "Qt XMPP Library" "http://gitorious.org
 # this installs headers and such and should really be handled in a separate package by packagers
 IF( INTERNAL_QTWEETLIB )
     ADD_SUBDIRECTORY( thirdparty/qtweetlib )
-    SET( QTWEETLIB_INCLUDE_DIR  ${CMAKE_SOURCE_DIR}/thirdparty/qtweetlib/QTweetLib/src )
+    # copy headers to build/QTweetLib so we can use proper includes inside the code
+    FILE( COPY ${CMAKE_SOURCE_DIR}/thirdparty/qtweetlib/QTweetLib/src/ DESTINATION ${CMAKE_BINARY_DIR}/QTweetLib )
+    SET( QTWEETLIB_INCLUDE_DIR  ${CMAKE_BINARY_DIR} )
     SET( QTWEETLIB_LIBRARY  tomahawk_qtweetlib )
     SET( QTWEETLIB_LIBRARIES ${QTWEETLIB_LIBRARY} )
     SET( QTWEETLIB_FOUND  true )

src/sip/twitter/tomahawkoauthtwitter.h

@@ -3,8 +3,8 @@
 
 #include "../sipdllmacro.h"
 
-#include <qtweetlib_global.h>
-#include <oauthtwitter.h>
+#include <QTweetLib/qtweetlib_global.h>
+#include <QTweetLib/oauthtwitter.h>
 
 class SIPDLLEXPORT TomahawkOAuthTwitter : public OAuthTwitter
 {

src/sip/twitter/twitter.cpp

@@ -27,10 +27,10 @@
 #include <QNetworkReply>
 #include <QStringList>
 
-#include <qtweetaccountverifycredentials.h>
-#include <qtweetuser.h>
-#include <qtweetstatus.h>
-#include <qtweetusershow.h>
+#include <QTweetLib/qtweetaccountverifycredentials.h>
+#include <QTweetLib/qtweetuser.h>
+#include <QTweetLib/qtweetstatus.h>
+#include <QTweetLib/qtweetusershow.h>
 
 #include <utils/tomahawkutils.h>
 #include <tomahawksettings.h>

src/sip/twitter/twitter.h

@@ -25,14 +25,14 @@
 #include <QWeakPointer>
 #include <QSet>
 
-#include <qtweetuser.h>
-#include <qtweetnetbase.h>
-#include <qtweetfriendstimeline.h>
-#include <qtweetdirectmessages.h>
-#include <qtweetdirectmessagenew.h>
-#include <qtweetdirectmessagedestroy.h>
-#include <qtweetmentions.h>
-#include <qtweetdmstatus.h>
+#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/qtweetmentions.h>
+#include <QTweetLib/qtweetdmstatus.h>
 
 #include "../sipdllmacro.h"
 #include "sip/SipPlugin.h"

src/sip/twitter/twitterconfigwidget.cpp

@@ -25,9 +25,9 @@
 #include "database/database.h"
 
 #include "tomahawkoauthtwitter.h"
-#include <qtweetaccountverifycredentials.h>
-#include <qtweetstatusupdate.h>
-#include <qtweetdirectmessagenew.h>
+#include <QTweetLib/qtweetaccountverifycredentials.h>
+#include <QTweetLib/qtweetstatusupdate.h>
+#include <QTweetLib/qtweetdirectmessagenew.h>
 
 #include <QMessageBox>
 

src/sip/twitter/twitterconfigwidget.h

@@ -21,10 +21,10 @@
 
 #include "sip/SipPlugin.h"
 
-#include <qtweetstatus.h>
-#include <qtweetdmstatus.h>
-#include <qtweetuser.h>
-#include <qtweetnetbase.h>
+#include <QTweetLib/qtweetstatus.h>
+#include <QTweetLib/qtweetdmstatus.h>
+#include <QTweetLib/qtweetuser.h>
+#include <QTweetLib/qtweetnetbase.h>
 
 #include <QWidget>