mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-13 17:43:59 +02:00
Update qtweetlib; removes need to compile in oauth consumer token/secret and fixes bug needing custom qtweetstatus
This commit is contained in:
Jeff Mitchell
4
thirdparty/qtweetlib/CMakeLists.txt
vendored
4
thirdparty/qtweetlib/CMakeLists.txt
vendored
@@ -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})
|
||||
|
||||
|
||||
|
||||
2
thirdparty/qtweetlib/QTweetLib
vendored
2
thirdparty/qtweetlib/QTweetLib
vendored
Submodule thirdparty/qtweetlib/QTweetLib updated: a52c0c6f30...cb2c8d6525
@@ -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 <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* Contact e-mail: Antonie Jovanoski <minimoog77_at_gmail.com>
|
||||
*/
|
||||
|
||||
#include <QSharedData>
|
||||
#include <QDateTime>
|
||||
#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<QTweetEntityUrl> urlEntities;
|
||||
QList<QTweetEntityHashtag> hashtagEntities;
|
||||
QList<QTweetEntityUserMentions> 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<QTweetEntityUrl> QTweetStatus::urlEntities() const
|
||||
{
|
||||
return d->urlEntities;
|
||||
}
|
||||
|
||||
QList<QTweetEntityHashtag> QTweetStatus::hashtagEntities() const
|
||||
{
|
||||
return d->hashtagEntities;
|
||||
}
|
||||
|
||||
QList<QTweetEntityUserMentions> 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);
|
||||
}
|
||||
@@ -2,9 +2,13 @@
|
||||
#include <QInputDialog>
|
||||
#include <QDebug>
|
||||
|
||||
#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 );
|
||||
}
|
||||
|
||||
|
||||
|
||||
9
thirdparty/qtweetlib/twitter-api-keys
vendored
9
thirdparty/qtweetlib/twitter-api-keys
vendored
@@ -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"
|
||||
)
|
||||
Reference in New Issue
Block a user