From 9059dd4782fb57d95320bf30dd901d9eb6cbaf93 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <tomahawk@jefferai.org>
Date: Wed, 16 Feb 2011 07:44:49 -0500
Subject: [PATCH] Remove unused qtweetlib_export.h, move our custom
 tomahawkoauthtwitter to the tomahawk_qtweetlib library where it belongs.

Probably broke Windows again. Sorry domme  :-)
---
 src/CMakeLists.txt                             |  1 +
 src/settingsdialog.cpp                         |  2 +-
 src/sip/twitter/CMakeLists.txt                 |  5 ++---
 thirdparty/qtweetlib/CMakeLists.txt            |  6 +++++-
 thirdparty/qtweetlib/qtweetlib_export.h        | 18 ------------------
 .../tomahawk-custom}/tomahawkoauthtwitter.cpp  |  0
 .../tomahawk-custom}/tomahawkoauthtwitter.h    |  4 ++--
 7 files changed, 11 insertions(+), 25 deletions(-)
 delete mode 100644 thirdparty/qtweetlib/qtweetlib_export.h
 rename {src/sip/twitter => thirdparty/qtweetlib/tomahawk-custom}/tomahawkoauthtwitter.cpp (100%)
 rename {src/sip/twitter => thirdparty/qtweetlib/tomahawk-custom}/tomahawkoauthtwitter.h (71%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 14eaefa01..04b52a148 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 344e264a6..4cf9f318a 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -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"
 
diff --git a/src/sip/twitter/CMakeLists.txt b/src/sip/twitter/CMakeLists.txt
index 8405955be..4dd746ccc 100644
--- a/src/sip/twitter/CMakeLists.txt
+++ b/src/sip/twitter/CMakeLists.txt
@@ -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} )
diff --git a/thirdparty/qtweetlib/CMakeLists.txt b/thirdparty/qtweetlib/CMakeLists.txt
index 77bc9f38c..2f93871af 100644
--- a/thirdparty/qtweetlib/CMakeLists.txt
+++ b/thirdparty/qtweetlib/CMakeLists.txt
@@ -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 )
 
diff --git a/thirdparty/qtweetlib/qtweetlib_export.h b/thirdparty/qtweetlib/qtweetlib_export.h
deleted file mode 100644
index ed4504dd7..000000000
--- a/thirdparty/qtweetlib/qtweetlib_export.h
+++ /dev/null
@@ -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
-
diff --git a/src/sip/twitter/tomahawkoauthtwitter.cpp b/thirdparty/qtweetlib/tomahawk-custom/tomahawkoauthtwitter.cpp
similarity index 100%
rename from src/sip/twitter/tomahawkoauthtwitter.cpp
rename to thirdparty/qtweetlib/tomahawk-custom/tomahawkoauthtwitter.cpp
diff --git a/src/sip/twitter/tomahawkoauthtwitter.h b/thirdparty/qtweetlib/tomahawk-custom/tomahawkoauthtwitter.h
similarity index 71%
rename from src/sip/twitter/tomahawkoauthtwitter.h
rename to thirdparty/qtweetlib/tomahawk-custom/tomahawkoauthtwitter.h
index 5d56b889a..22690ac3c 100644
--- a/src/sip/twitter/tomahawkoauthtwitter.h
+++ b/thirdparty/qtweetlib/tomahawk-custom/tomahawkoauthtwitter.h
@@ -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