mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-21 13:21:52 +02:00
Code Issues Releases Wiki Activity

Make siptwitter optional and rely on system qtweetlib on default

Browse Source
This commit is contained in:
Dominik Schmidt
2011-05-21 04:38:55 +02:00
parent a564d53ff3
commit 2590ae4ece
11 changed files with 65 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
thirdparty/CMakeLists.txt vendored
View File

@@ -1,5 +1,4 @@
ADD_SUBDIRECTORY( jdns )
ADD_SUBDIRECTORY( qtweetlib )
ADD_SUBDIRECTORY( libportfwd )
ADD_SUBDIRECTORY( qxt )
ADD_SUBDIRECTORY( liblastfm2 )

4
thirdparty/qtweetlib/CMakeLists.txt vendored
View File

@@ -88,8 +88,6 @@ set(TOMAHAWK_QTWEETLIB_SOURCES
QTweetLib/src/qtweetblockscreate.cpp
QTweetLib/src/qtweetblocksdestroy.cpp
QTweetLib/src/qtweetblocksexists.cpp
tomahawk-custom/tomahawkoauthtwitter.cpp
)
set(TOMAHAWK_QTWEETLIB_HEADERS
@@ -166,8 +164,6 @@ set(TOMAHAWK_QTWEETLIB_HEADERS
QTweetLib/src/qtweetblockscreate.h
QTweetLib/src/qtweetblocksdestroy.h
QTweetLib/src/qtweetblocksexists.h
tomahawk-custom/tomahawkoauthtwitter.h
)
include_directories(

32
thirdparty/qtweetlib/tomahawk-custom/tomahawkoauthtwitter.cpp vendored
View File

@@ -1,32 +0,0 @@
#include "tomahawkoauthtwitter.h"
#include <QInputDialog>
#include <QDebug>
#define CONSUMER_KEY "C4v4Wfa21rfIDck4HMR3A"
#define CONSUMER_SECRET "zXSjU6bjrvg6UVMJX4JufqHyjj3iextY14SR9uBEAo"
TomahawkOAuthTwitter::TomahawkOAuthTwitter( QNetworkAccessManager *nam, QObject* parent )
: OAuthTwitter( CONSUMER_KEY, CONSUMER_SECRET, parent )
{
setNetworkAccessManager( nam );
}
int
TomahawkOAuthTwitter::authorizationWidget()
{
bool ok;
int i = QInputDialog::getInt(0, tr( "Twitter PIN" ), tr( "After authenticating on Twitter's web site,\nenter the displayed PIN number here:" ), 0, 0, 2147483647, 1, &ok);
if (ok)
return i;
return 0;
}
void
TomahawkOAuthTwitter::error()
{
qDebug() << Q_FUNC_INFO;
setOAuthToken( QString().toLatin1() );
setOAuthTokenSecret( QString().toLatin1() );
}

24
thirdparty/qtweetlib/tomahawk-custom/tomahawkoauthtwitter.h vendored
View File

@@ -1,24 +0,0 @@
#ifndef TOMAHAWKOAUTHTWITTER
#define TOMAHAWKOAUTHTWITTER
#include <oauthtwitter.h>
#include "qtweetlib_global.h"
class QTWEETLIBSHARED_EXPORT TomahawkOAuthTwitter : public OAuthTwitter
{
Q_OBJECT
public:
TomahawkOAuthTwitter( QNetworkAccessManager *nam, QObject *parent = 0 );
~TomahawkOAuthTwitter() {}
protected:
virtual int authorizationWidget();
private slots:
void error();
};
#endif