1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-22 13:43:11 +02:00

Remove unused qtweetlib_export.h, move our custom tomahawkoauthtwitter

to the tomahawk_qtweetlib library where it belongs.

Probably broke Windows again. Sorry domme  :-)
This commit is contained in:
Jeff Mitchell
2011-02-16 07:44:49 -05:00
parent 0953dc93db
commit 9059dd4782
7 changed files with 11 additions and 25 deletions

View File

@@ -83,6 +83,8 @@ set(TOMAHAWK_QTWEETLIB_SOURCES
qtweetlib/src/qtweetentityurl.cpp
qtweetlib/src/qtweetentityhashtag.cpp
qtweetlib/src/qtweetentityusermentions.cpp
tomahawk-custom/tomahawkoauthtwitter.cpp
)
set(TOMAHAWK_QTWEETLIB_HEADERS
@@ -154,6 +156,8 @@ set(TOMAHAWK_QTWEETLIB_HEADERS
qtweetlib/src/qtweetentityurl.h
qtweetlib/src/qtweetentityhashtag.h
qtweetlib/src/qtweetentityusermentions.h
tomahawk-custom/tomahawkoauthtwitter.h
)
include_directories(
@@ -172,7 +176,7 @@ target_link_libraries(tomahawk_qtweetlib
qjson
)
SET_TARGET_PROPERTIES( tomahawk_qtweetlib PROPERTIES DEFINE_SYMBOL MAKE_QTWEETLIB_LIB )
#SET_TARGET_PROPERTIES( tomahawk_qtweetlib PROPERTIES DEFINE_SYMBOL MAKE_QTWEETLIB_LIB )
INCLUDE( ${CMAKE_CURRENT_SOURCE_DIR}/twitter-api-keys )

View File

@@ -1,18 +0,0 @@
#ifndef QTWEETLIB_EXPORT_H
#define QTWEETLIB_EXPORT_H
#include <QtCore/QtGlobal>
#ifdef Q_WS_WIN
# define QTWEETLIB_MAKEDLL
# if defined(MAKE_QTWEETLIB_LIB)
# define QTWEETLIB_EXPORT Q_DECL_EXPORT
# else
# define QTWEETLIB_EXPORT Q_DECL_IMPORT
# endif
#else
# define QTWEETLIB_EXPORT Q_DECL_EXPORT
#endif
#endif

View File

@@ -0,0 +1,18 @@
#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;
}

View File

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