diff --git a/thirdparty/qtweetlib/CMakeLists.txt b/thirdparty/qtweetlib/CMakeLists.txt index 6b9642e26..e3f401e3f 100644 --- a/thirdparty/qtweetlib/CMakeLists.txt +++ b/thirdparty/qtweetlib/CMakeLists.txt @@ -25,7 +25,7 @@ set(TOMAHAWK_QTWEETLIB_SOURCES QTweetLib/src/qtweetretweetbyme.cpp QTweetLib/src/qtweetretweetsofme.cpp QTweetLib/src/qtweetretweettome.cpp - tomahawk-custom/qtweetstatus.cpp + QTweetLib/src/qtweetstatus.cpp QTweetLib/src/qtweetstatusshow.cpp QTweetLib/src/qtweetstatusupdate.cpp QTweetLib/src/qtweetuser.cpp @@ -194,8 +194,6 @@ target_link_libraries(tomahawk_qtweetlib ${QJSON_LIBRARIES} ) -INCLUDE( ${CMAKE_CURRENT_SOURCE_DIR}/twitter-api-keys ) - INSTALL(TARGETS tomahawk_qtweetlib DESTINATION lib${LIB_SUFFIX}) diff --git a/thirdparty/qtweetlib/QTweetLib b/thirdparty/qtweetlib/QTweetLib index a52c0c6f3..cb2c8d652 160000 --- a/thirdparty/qtweetlib/QTweetLib +++ b/thirdparty/qtweetlib/QTweetLib @@ -1 +1 @@ -Subproject commit a52c0c6f30fecd2de288f095e31d629027271895 +Subproject commit cb2c8d65250582b35d7655bae4850e02b13112fe diff --git a/thirdparty/qtweetlib/tomahawk-custom/qtweetstatus.cpp b/thirdparty/qtweetlib/tomahawk-custom/qtweetstatus.cpp deleted file mode 100644 index b2d7bdced..000000000 --- a/thirdparty/qtweetlib/tomahawk-custom/qtweetstatus.cpp +++ /dev/null @@ -1,259 +0,0 @@ -/* Copyright (c) 2010, Antonie Jovanoski - * - * All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - * - * Contact e-mail: Antonie Jovanoski - */ - -#include -#include -#include "qtweetstatus.h" -#include "qtweetuser.h" -#include "qtweetplace.h" -#include "qtweetentityurl.h" -#include "qtweetentityhashtag.h" -#include "qtweetentityusermentions.h" - -class QTweetStatusData : public QSharedData -{ -public: - QTweetStatusData() : id(0), inReplyToStatusId(0), retweetedStatus(0) {} - - QTweetStatusData(const QTweetStatusData& other) : QSharedData(other) - { - id = other.id; - text = other.text; - createdAt = other.createdAt; - inReplyToUserId = other.inReplyToUserId; - inReplyToScreenName = other.inReplyToScreenName; - inReplyToStatusId = other.inReplyToStatusId; - favorited = other.favorited; - source = other.source; - user = other.user; - place = other.place; - - if (other.retweetedStatus) { - retweetedStatus = new QTweetStatus(*other.retweetedStatus); - } else { - retweetedStatus = 0; - } - } - - ~QTweetStatusData() - { - delete retweetedStatus; - } - - qint64 id; - QString text; - QDateTime createdAt; - qint64 inReplyToUserId; - QString inReplyToScreenName; - qint64 inReplyToStatusId; - bool favorited; - QString source; - QTweetUser user; - QTweetStatus *retweetedStatus; - QTweetPlace place; - QList urlEntities; - QList hashtagEntities; - QList userMentionEntities; -}; - -QTweetStatus::QTweetStatus() : - d(new QTweetStatusData) -{ -} - -QTweetStatus::QTweetStatus(const QTweetStatus &other) : - d(other.d) -{ -} - -QTweetStatus& QTweetStatus::operator=(const QTweetStatus &rhs) -{ - if (this != &rhs) - d.operator=(rhs.d); - return *this; -} - -QTweetStatus::~QTweetStatus() -{ -} - -void QTweetStatus::setId(qint64 id) -{ - d->id = id; -} - -qint64 QTweetStatus::id() const -{ - return d->id; -} - -void QTweetStatus::setText(const QString &text) -{ - d->text = text; -} - -QString QTweetStatus::text() const -{ - return d->text; -} - -void QTweetStatus::setCreatedAt(const QString &twitterDate) -{ - d->createdAt = QTweetUser::twitterDateToQDateTime(twitterDate); -} - -void QTweetStatus::setCreatedAt(const QDateTime &dateTime) -{ - d->createdAt = dateTime; -} - -QDateTime QTweetStatus::createdAt() const -{ - return d->createdAt; -} - -void QTweetStatus::setInReplyToUserId(qint64 id) -{ - d->inReplyToUserId = id; -} - -qint64 QTweetStatus::inReplyToUserId() const -{ - return d->inReplyToUserId; -} - -void QTweetStatus::setInReplyToScreenName(const QString &screenName) -{ - d->inReplyToScreenName = screenName; -} - -QString QTweetStatus::inReplyToScreenName() const -{ - return d->inReplyToScreenName; -} - -void QTweetStatus::setInReplyToStatusId(qint64 id) -{ - d->inReplyToStatusId = id; -} - -qint64 QTweetStatus::inReplyToStatusId() const -{ - return d->inReplyToStatusId; -} - -void QTweetStatus::setFavorited(bool fav) -{ - d->favorited = fav; -} - -bool QTweetStatus::favorited() const -{ - return d->favorited; -} - -void QTweetStatus::setSource(const QString &source) -{ - d->source = source; -} - -QString QTweetStatus::source() const -{ - return d->source; -} - -void QTweetStatus::setUser(const QTweetUser &user) -{ - d->user = user; -} - -QTweetUser QTweetStatus::user() const -{ - return d->user; -} - -qint64 QTweetStatus::userid() const -{ - return d->user.id(); -} - -void QTweetStatus::setRetweetedStatus(const QTweetStatus &status) -{ - if (!d->retweetedStatus) - d->retweetedStatus = new QTweetStatus; - - *d->retweetedStatus = status; -} - -QTweetStatus QTweetStatus::retweetedStatus() const -{ - if (!d->retweetedStatus) - return QTweetStatus(); - - return *d->retweetedStatus; -} - -void QTweetStatus::setPlace(const QTweetPlace &place) -{ - d->place = place; -} - -QTweetPlace QTweetStatus::place() const -{ - return d->place; -} - -bool QTweetStatus::isRetweet() const -{ - if (d->retweetedStatus) - return true; - - return false; -} - -QList QTweetStatus::urlEntities() const -{ - return d->urlEntities; -} - -QList QTweetStatus::hashtagEntities() const -{ - return d->hashtagEntities; -} - -QList QTweetStatus::userMentionsEntities() const -{ - return d->userMentionEntities; -} - -void QTweetStatus::addUrlEntity(const QTweetEntityUrl &urlEntity) -{ - d->urlEntities.append(urlEntity); -} - -void QTweetStatus::addHashtagEntity(const QTweetEntityHashtag &hashtagEntity) -{ - d->hashtagEntities.append(hashtagEntity); -} - -void QTweetStatus::addUserMentionsEntity(const QTweetEntityUserMentions &userMentionsEntity) -{ - d->userMentionEntities.append(userMentionsEntity); -} diff --git a/thirdparty/qtweetlib/tomahawk-custom/tomahawkoauthtwitter.cpp b/thirdparty/qtweetlib/tomahawk-custom/tomahawkoauthtwitter.cpp index 9ae9749b4..144ce8c8c 100644 --- a/thirdparty/qtweetlib/tomahawk-custom/tomahawkoauthtwitter.cpp +++ b/thirdparty/qtweetlib/tomahawk-custom/tomahawkoauthtwitter.cpp @@ -2,9 +2,13 @@ #include #include +#define CONSUMER_KEY "C4v4Wfa21rfIDck4HMR3A" +#define CONSUMER_SECRET "zXSjU6bjrvg6UVMJX4JufqHyjj3iextY14SR9uBEAo" + TomahawkOAuthTwitter::TomahawkOAuthTwitter( QNetworkAccessManager *nam, QObject* parent ) - : OAuthTwitter( nam, parent ) + : OAuthTwitter( CONSUMER_KEY, CONSUMER_SECRET, parent ) { + setNetworkAccessManager( nam ); } diff --git a/thirdparty/qtweetlib/twitter-api-keys b/thirdparty/qtweetlib/twitter-api-keys deleted file mode 100644 index b4b664840..000000000 --- a/thirdparty/qtweetlib/twitter-api-keys +++ /dev/null @@ -1,9 +0,0 @@ -set_property( - TARGET tomahawk_qtweetlib - APPEND PROPERTY COMPILE_DEFINITIONS CONSUMER_KEY="C4v4Wfa21rfIDck4HMR3A" -) - -set_property( - TARGET tomahawk_qtweetlib - APPEND PROPERTY COMPILE_DEFINITIONS CONSUMER_SECRET="zXSjU6bjrvg6UVMJX4JufqHyjj3iextY14SR9uBEAo" -)