mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-04-21 16:31:58 +02:00
Code Issues Releases Wiki Activity

Remove unused qtweetlib_export.h, move our custom tomahawkoauthtwitter

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@ -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

2
src/settingsdialog.cpp
View File

@ -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"

5
src/sip/twitter/CMakeLists.txt
View File

@ -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} )

6
thirdparty/qtweetlib/CMakeLists.txt vendored
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 )

18
thirdparty/qtweetlib/qtweetlib_export.h vendored
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

0
src/sip/twitter/tomahawkoauthtwitter.cpp → thirdparty/qtweetlib/tomahawk-custom/tomahawkoauthtwitter.cpp vendored
View File

4
src/sip/twitter/tomahawkoauthtwitter.h → thirdparty/qtweetlib/tomahawk-custom/tomahawkoauthtwitter.h vendored
View File

@ -3,9 +3,9 @@
#include <oauthtwitter.h>
#include "../sipdllmacro.h"
#include "qtweetlib_global.h"
class SIPDLLEXPORT TomahawkOAuthTwitter : public OAuthTwitter
class QTWEETLIBSHARED_EXPORT TomahawkOAuthTwitter : public OAuthTwitter
{
Q_OBJECT