Remove unused qtweetlib_export.h, move our custom tomahawkoauthtwitter

to the tomahawk_qtweetlib library where it belongs.

Probably broke Windows again. Sorry domme  :-)

src/CMakeLists.txt

@@ -125,6 +125,7 @@ INCLUDE_DIRECTORIES(
     ../rtaudio
     ../qxt/qxtweb-standalone/qxtweb
     ../thirdparty/qtweetlib/qtweetlib/src
+    ../thirdparty/qtweetlib/tomahawk-custom
 
     /usr/include/taglib
     /usr/local/include/taglib

src/settingsdialog.cpp

@@ -20,7 +20,7 @@
 #include "musicscanner.h"
 #include "tomahawksettings.h"
 #include "sip/SipHandler.h"
-#include "sip/twitter/tomahawkoauthtwitter.h"
+#include "tomahawkoauthtwitter.h"
 #include <database/database.h>
 #include "scanmanager.h"
 

src/sip/twitter/CMakeLists.txt

@@ -8,17 +8,16 @@ add_definitions( -DSIPDLLEXPORT_PRO )
 
 set( twitterSources
     twitter.cpp
-    tomahawkoauthtwitter.cpp
 )
 
 set( twitterHeaders
     twitter.h
-    tomahawkoauthtwitter.h
 )
 
 include_directories( . ${CMAKE_CURRENT_BINARY_DIR} .. 
    ${QT_INCLUDE_DIR}
-   ${CMAKE_SOURCE_DIR}/thirdparty/qtweetlib/src
+   ${CMAKE_SOURCE_DIR}/thirdparty/qtweetlib/qtweetlib/src
+   ${CMAKE_SOURCE_DIR}/thirdparty/qtweetlib/tomahawk-custom
 )
 
 qt4_wrap_cpp( twitterMoc ${twitterHeaders} )

src/sip/twitter/tomahawkoauthtwitter.cpp

@@ -1,18 +0,0 @@
-#include "tomahawkoauthtwitter.h"
-#include <QInputDialog>
-
-TomahawkOAuthTwitter::TomahawkOAuthTwitter( QObject* parent )
-    : OAuthTwitter( parent )
-{
-}
-
-
-int TomahawkOAuthTwitter::authorizationWidget()
-{
-    bool ok;
-    int i = QInputDialog::getInt(0, QString( "Twitter PIN" ), QString( "After authenticating on Twitter's web site,\nenter the displayed PIN number here:" ), 0, 0, 2147483647, 1, &ok);
-    if (ok)
-        return i;
-    
-    return 0;
-}

src/sip/twitter/tomahawkoauthtwitter.h

@@ -1,21 +0,0 @@
-#ifndef TOMAHAWKOAUTHTWITTER
-#define TOMAHAWKOAUTHTWITTER
-
-#include <oauthtwitter.h>
-
-#include "../sipdllmacro.h"
-
-class SIPDLLEXPORT TomahawkOAuthTwitter : public OAuthTwitter
-{
-    Q_OBJECT
-    
-public:
-    TomahawkOAuthTwitter( QObject *parent = 0 );
-
-    ~TomahawkOAuthTwitter() {}
-    
-protected:
-    virtual int authorizationWidget();
-};
-
-#endif