Fix support for GCC hidden visibility.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/10/head
Slávek Banko 5 years ago
parent 950c4357e8
commit 7ee42b7b38
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -172,7 +172,7 @@ namespace Amarok
* See bug #103750 for more information. * See bug #103750 for more information.
*/ */
//TODO ugly hack, fix TDEProcess for KDE 4.0 //TODO ugly hack, fix TDEProcess for KDE 4.0
void closeOpenFiles(int out, int in, int err); //defined in scriptmanager.cpp LIBAMAROK_EXPORT void closeOpenFiles(int out, int in, int err); //defined in scriptmanager.cpp
/** /**
* Returns internal code for database type, DbConnection::sqlite, DbConnection::mysql, or DbConnection::postgresql * Returns internal code for database type, DbConnection::sqlite, DbConnection::mysql, or DbConnection::postgresql
@ -255,14 +255,14 @@ namespace Amarok
* @param url the url. * @param url the url.
* @return The url of the proxy, or a empty string if no proxy should be used. * @return The url of the proxy, or a empty string if no proxy should be used.
*/ */
TQString proxyForUrl(const TQString& url); LIBAMAROK_EXPORT TQString proxyForUrl(const TQString& url);
/** /**
* Returns the proxy that should be used for a given protocol. * Returns the proxy that should be used for a given protocol.
* @param protocol the protocol. * @param protocol the protocol.
* @return The url of the proxy, or a empty string if no proxy should be used. * @return The url of the proxy, or a empty string if no proxy should be used.
*/ */
TQString proxyForProtocol(const TQString& protocol); LIBAMAROK_EXPORT TQString proxyForProtocol(const TQString& protocol);
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// class Amarok::ProcIO // class Amarok::ProcIO

@ -110,7 +110,7 @@ class CollectionBrowser: public TQVBox
bool m_returnPressed; bool m_returnPressed;
static CollectionBrowser *s_instance; LIBAMAROK_EXPORT static CollectionBrowser *s_instance;
// for CatMenuId // for CatMenuId
friend class CollectionItem; friend class CollectionItem;
@ -216,7 +216,7 @@ class CollectionView : public TDEListView, public DropProxyTarget
int viewMode() const { return m_viewMode; } int viewMode() const { return m_viewMode; }
// Transform "The Who" -> "Who, The" or the other way // Transform "The Who" -> "Who, The" or the other way
static void manipulateThe( TQString &str, bool reverse ); LIBAMAROK_EXPORT static void manipulateThe( TQString &str, bool reverse );
void setShowDivider(bool show); void setShowDivider(bool show);

@ -751,10 +751,10 @@ class QueryBuilder
// Likewise, modes between and notBetween are only supported for numeric filters // Likewise, modes between and notBetween are only supported for numeric filters
enum qBuilderFilter { modeNormal = 0, modeLess = 1, modeGreater = 2, modeEndMatch = 3, modeBeginMatch = 4, modeBetween = 5, modeNotBetween = 6}; enum qBuilderFilter { modeNormal = 0, modeLess = 1, modeGreater = 2, modeEndMatch = 3, modeBeginMatch = 4, modeBetween = 5, modeNotBetween = 6};
QueryBuilder(); LIBAMAROK_EXPORT QueryBuilder();
void addReturnValue( int table, TQ_INT64 value, bool caseSensitive = false /* unless value refers to a string */ ); LIBAMAROK_EXPORT void addReturnValue( int table, TQ_INT64 value, bool caseSensitive = false /* unless value refers to a string */ );
void addReturnFunctionValue( int function, int table, TQ_INT64 value); LIBAMAROK_EXPORT void addReturnFunctionValue( int function, int table, TQ_INT64 value);
uint countReturnValues(); uint countReturnValues();
// Note: the filter chain begins in AND mode // Note: the filter chain begins in AND mode
@ -774,7 +774,7 @@ class QueryBuilder
void excludeFilter( int tables, TQ_INT64 value, const TQString& filter, int mode = modeNormal, bool exact = false ); void excludeFilter( int tables, TQ_INT64 value, const TQString& filter, int mode = modeNormal, bool exact = false );
void addMatch( int tables, const TQString& match, bool interpretUnknown = true, bool caseSensitive = true ); void addMatch( int tables, const TQString& match, bool interpretUnknown = true, bool caseSensitive = true );
void addMatch( int tables, TQ_INT64 value, const TQString& match, bool interpretUnknown = true, bool caseSensitive = true ); LIBAMAROK_EXPORT void addMatch( int tables, TQ_INT64 value, const TQString& match, bool interpretUnknown = true, bool caseSensitive = true );
void addMatches( int tables, const TQStringList& match, bool interpretUnknown = true, bool caseSensitive = true ); void addMatches( int tables, const TQStringList& match, bool interpretUnknown = true, bool caseSensitive = true );
void excludeMatch( int tables, const TQString& match ); void excludeMatch( int tables, const TQString& match );
void having( int table, TQ_INT64 value, int function, int mode, const TQString& match ); void having( int table, TQ_INT64 value, int function, int mode, const TQString& match );
@ -812,7 +812,7 @@ class QueryBuilder
TQString query( bool withDeviceidPlaceholder = false ) { buildQuery( withDeviceidPlaceholder ); return m_query; }; TQString query( bool withDeviceidPlaceholder = false ) { buildQuery( withDeviceidPlaceholder ); return m_query; };
void clear(); void clear();
TQStringList run(); LIBAMAROK_EXPORT TQStringList run();
// Transform a string table.value "field" into enum values // Transform a string table.value "field" into enum values
// @return true if we succeeded // @return true if we succeeded

@ -12,6 +12,9 @@
#include <tqobject.h> #include <tqobject.h>
#include <sys/time.h> #include <sys/time.h>
#include "amarok_export.h"
class TQApplication; class TQApplication;
extern TQApplication *tqApp; ///@see Debug::Indent extern TQApplication *tqApp; ///@see Debug::Indent
@ -46,7 +49,7 @@ extern TQApplication *tqApp; ///@see Debug::Indent
* @see ListStream * @see ListStream
*/ */
namespace Debug namespace Debug LIBAMAROK_EXPORT
{ {
extern TQMutex mutex; // defined in app.cpp extern TQMutex mutex; // defined in app.cpp
@ -133,7 +136,7 @@ using Debug::DebugStream;
#define AMAROK_DEPRECATED warning() << "DEPRECATED: " << __PRETTY_FUNCTION__ << endl; #define AMAROK_DEPRECATED warning() << "DEPRECATED: " << __PRETTY_FUNCTION__ << endl;
namespace Debug namespace Debug LIBAMAROK_EXPORT
{ {
/** /**
* @class Debug::Block * @class Debug::Block
@ -230,7 +233,7 @@ namespace Debug
#include <tqvariant.h> #include <tqvariant.h>
namespace Debug namespace Debug LIBAMAROK_EXPORT
{ {
/** /**
* @class Debug::List * @class Debug::List

@ -61,7 +61,7 @@ public:
* @param openmode The mode of the album * @param openmode The mode of the album
* @param album The album to export * @param album The album to export
*/ */
void exportAlbum( const TQString &album, int openmode=-1 ); LIBAMAROK_EXPORT void exportAlbum( const TQString &album, int openmode=-1 );
/** /**
* Exports the album @p album by artist @ artist to K3B. The mode @p openmode will be used * Exports the album @p album by artist @ artist to K3B. The mode @p openmode will be used
@ -75,7 +75,7 @@ public:
* @param openmode The mode of the album * @param openmode The mode of the album
* @param artist The artists which tracks to export * @param artist The artists which tracks to export
*/ */
void exportArtist( const TQString &artist, int openmode=-1 ); LIBAMAROK_EXPORT void exportArtist( const TQString &artist, int openmode=-1 );
/** /**
* Exports all tracks of the composer @p composer to K3B. The mode @p openmode will be used * Exports all tracks of the composer @p composer to K3B. The mode @p openmode will be used

@ -144,7 +144,7 @@ class MediaQueue : public TDEListView, public DropProxyTarget
void syncPlaylist( const TQString &playlistName, const TQString &sql, bool loading=false ); void syncPlaylist( const TQString &playlistName, const TQString &sql, bool loading=false );
void syncPlaylist( const TQString &playlistName, const KURL &url, bool loading=false ); void syncPlaylist( const TQString &playlistName, const KURL &url, bool loading=false );
void addURL( const KURL& url, MetaBundle *bundle=NULL, const TQString &playlistName=TQString() ); void addURL( const KURL& url, MetaBundle *bundle=NULL, const TQString &playlistName=TQString() );
void addURL( const KURL& url, MediaItem *item ); LIBAMAROK_EXPORT void addURL( const KURL& url, MediaItem *item );
void addURLs( const KURL::List urls, const TQString &playlistName=TQString() ); void addURLs( const KURL::List urls, const TQString &playlistName=TQString() );
void URLsAdded(); // call after finishing adding single urls void URLsAdded(); // call after finishing adding single urls
@ -169,10 +169,10 @@ class MediaQueue : public TDEListView, public DropProxyTarget
}; };
class MediaBrowser : public TQVBox class LIBAMAROK_EXPORT MediaBrowser : public TQVBox
{ {
Q_OBJECT Q_OBJECT
friend class DeviceConfigureDialog; friend class DeviceConfigureDialog;
friend class MediaDevice; friend class MediaDevice;
friend class MediaView; friend class MediaView;
@ -184,8 +184,8 @@ class MediaBrowser : public TQVBox
enum { CONNECT, DISCONNECT, TRANSFER, CONFIGURE, CUSTOM }; enum { CONNECT, DISCONNECT, TRANSFER, CONFIGURE, CUSTOM };
static bool isAvailable(); static bool isAvailable();
LIBAMAROK_EXPORT static MediaBrowser *instance() { return s_instance; } static MediaBrowser *instance() { return s_instance; }
LIBAMAROK_EXPORT static MediaQueue *queue() { return s_instance ? s_instance->m_queue : 0; } static MediaQueue *queue() { return s_instance ? s_instance->m_queue : 0; }
MediaBrowser( const char *name ); MediaBrowser( const char *name );
virtual ~MediaBrowser(); virtual ~MediaBrowser();
@ -244,7 +244,7 @@ class MediaBrowser : public TQVBox
KLineEdit* m_searchEdit; KLineEdit* m_searchEdit;
TQTimer *m_timer; TQTimer *m_timer;
LIBAMAROK_EXPORT static MediaBrowser *s_instance; static MediaBrowser *s_instance;
TQValueList<MediaDevice *> m_devices; TQValueList<MediaDevice *> m_devices;
TQValueList<MediaDevice *>::iterator m_currentDevice; TQValueList<MediaDevice *>::iterator m_currentDevice;
@ -280,7 +280,7 @@ class MediaBrowser : public TQVBox
class MediaView : public TDEListView class MediaView : public TDEListView
{ {
Q_OBJECT Q_OBJECT
friend class MediaBrowser; friend class MediaBrowser;
friend class MediaDevice; friend class MediaDevice;
@ -295,7 +295,7 @@ class MediaView : public TDEListView
MediaView( TQWidget *parent, MediaDevice *device ); MediaView( TQWidget *parent, MediaDevice *device );
virtual ~MediaView(); virtual ~MediaView();
LIBAMAROK_EXPORT KURL::List nodeBuildDragList( MediaItem* item, int flags=OnlySelected ); LIBAMAROK_EXPORT KURL::List nodeBuildDragList( MediaItem* item, int flags=OnlySelected );
int getSelectedLeaves(MediaItem *parent, TQPtrList<MediaItem> *list, int flags=OnlySelected ); LIBAMAROK_EXPORT int getSelectedLeaves(MediaItem *parent, TQPtrList<MediaItem> *list, int flags=OnlySelected );
LIBAMAROK_EXPORT MediaItem *newDirectory( MediaItem* parent ); LIBAMAROK_EXPORT MediaItem *newDirectory( MediaItem* parent );
bool setFilter( const TQString &filter, MediaItem *parent=NULL ); bool setFilter( const TQString &filter, MediaItem *parent=NULL );
@ -328,7 +328,7 @@ class MediaView : public TDEListView
class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin
{ {
Q_OBJECT Q_OBJECT
friend class DeviceConfigureDialog; friend class DeviceConfigureDialog;
friend class TransferDialog; friend class TransferDialog;
friend class MediaBrowser; friend class MediaBrowser;

@ -11,6 +11,7 @@
include_directories( include_directories(
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/amarok/src
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${TAGLIB_INCLUDE_DIRS} ${TAGLIB_INCLUDE_DIRS}

@ -1,6 +1,6 @@
SUBDIRS = SUBDIRS =
INCLUDES = $(all_includes) $(TAGLIB_CFLAGS) INCLUDES = -I$(top_srcdir)/amarok/src $(all_includes) $(TAGLIB_CFLAGS)
METASOURCES = AUTO METASOURCES = AUTO
libtagaudible_la_LDFLAGS = $(all_libraries) libtagaudible_la_LDFLAGS = $(all_libraries)
noinst_LTLIBRARIES = libtagaudible.la noinst_LTLIBRARIES = libtagaudible.la

@ -26,6 +26,8 @@
#ifndef TAGLIB_AUDIBLEFILE_H #ifndef TAGLIB_AUDIBLEFILE_H
#define TAGLIB_AUDIBLEFILE_H #define TAGLIB_AUDIBLEFILE_H
#include "amarok_export.h"
#include <taglib/tfile.h> #include <taglib/tfile.h>
#include "audibleproperties.h" #include "audibleproperties.h"
#include "audibletag.h" #include "audibletag.h"
@ -44,14 +46,14 @@ namespace TagLib {
* file's audio properties will also be read using \a propertiesStyle. If * file's audio properties will also be read using \a propertiesStyle. If
* false, \a propertiesStyle is ignored. * false, \a propertiesStyle is ignored.
*/ */
File(const char *file, bool readProperties = true, LIBAMAROK_EXPORT File(const char *file, bool readProperties = true,
Properties::ReadStyle propertiesStyle = Properties::Average, Properties::ReadStyle propertiesStyle = Properties::Average,
FILE *fp=NULL); FILE *fp=NULL);
/*! /*!
* Destroys this instance of the File. * Destroys this instance of the File.
*/ */
virtual ~File(); LIBAMAROK_EXPORT virtual ~File();
virtual TagLib::Tag *tag() const; virtual TagLib::Tag *tag() const;
@ -72,7 +74,7 @@ namespace TagLib {
void read(bool readProperties, Properties::ReadStyle propertiesStyle); void read(bool readProperties, Properties::ReadStyle propertiesStyle);
Audible::Tag *getAudibleTag() const; LIBAMAROK_EXPORT Audible::Tag *getAudibleTag() const;
bool isAudibleFile() const; bool isAudibleFile() const;

@ -22,6 +22,9 @@
#ifndef METADATA_TPLUGIN_H #ifndef METADATA_TPLUGIN_H
#define METADATA_TPLUGIN_H #define METADATA_TPLUGIN_H
#include "amarok_export.h"
LIBAMAROK_EXPORT
void registerTaglibPlugins(); void registerTaglibPlugins();
#endif #endif

@ -11,6 +11,7 @@
#define PLAYLISTBROWSER_H #define PLAYLISTBROWSER_H
#include "amarokconfig.h" #include "amarokconfig.h"
#include "amarok_export.h"
#include "playlistbrowseritem.h" #include "playlistbrowseritem.h"
#include "podcastsettings.h" #include "podcastsettings.h"
@ -42,8 +43,8 @@ class PlaylistTrackItem;
class PlaylistBrowser : public TQVBox class PlaylistBrowser : public TQVBox
{ {
Q_OBJECT Q_OBJECT
friend class DynamicMode; friend class DynamicMode;
friend class PlaylistBrowserView; friend class PlaylistBrowserView;
@ -73,7 +74,7 @@ class PlaylistBrowser : public TQVBox
int loadPlaylist( const TQString &playlist, bool force=false ); int loadPlaylist( const TQString &playlist, bool force=false );
void addPodcast( TQListViewItem *parent = 0 ); void addPodcast( TQListViewItem *parent = 0 );
void addPodcast( const KURL &url, TQListViewItem *parent = 0 ); LIBAMAROK_EXPORT void addPodcast( const KURL &url, TQListViewItem *parent = 0 );
void loadPodcastsFromDatabase( PlaylistCategory *p = 0 ); void loadPodcastsFromDatabase( PlaylistCategory *p = 0 );
void registerPodcastSettings( const TQString &title, const PodcastSettings *settings ); void registerPodcastSettings( const TQString &title, const PodcastSettings *settings );
@ -136,7 +137,7 @@ class PlaylistBrowser : public TQVBox
void loadDynamicItems(); void loadDynamicItems();
private: private:
PlaylistBrowser( const char* name=0 ); LIBAMAROK_EXPORT PlaylistBrowser( const char* name=0 );
void polish(); void polish();
bool m_polished; bool m_polished;
@ -192,7 +193,7 @@ class PlaylistBrowser : public TQVBox
static KURL::List recurse( const KURL &url ); static KURL::List recurse( const KURL &url );
static PlaylistBrowser *s_instance; LIBAMAROK_EXPORT static PlaylistBrowser *s_instance;
PlaylistCategory *m_playlistCategory; PlaylistCategory *m_playlistCategory;
PlaylistCategory *m_streamsCategory; PlaylistCategory *m_streamsCategory;

@ -4,6 +4,8 @@
#ifndef AMAROK_PLUGINCONFIG_H #ifndef AMAROK_PLUGINCONFIG_H
#define AMAROK_PLUGINCONFIG_H #define AMAROK_PLUGINCONFIG_H
#include "amarok_export.h"
#include <tqobject.h> #include <tqobject.h>
class TQWidget; class TQWidget;
@ -14,10 +16,10 @@ namespace Amarok
* Class to allow user configuration of your plugin; you provide a GUI widget via view() * Class to allow user configuration of your plugin; you provide a GUI widget via view()
*/ */
class PluginConfig : public TQObject class LIBAMAROK_EXPORT PluginConfig : public TQObject
{ {
Q_OBJECT Q_OBJECT
signals: signals:
/** Emit whenever some view setting is changed by the user */ /** Emit whenever some view setting is changed by the user */

@ -24,6 +24,7 @@
#ifndef KDE_PROGRESSBAR_H #ifndef KDE_PROGRESSBAR_H
#define KDE_PROGRESSBAR_H #define KDE_PROGRESSBAR_H
#include "amarok_export.h"
#include <tqprogressbar.h> #include <tqprogressbar.h>
class TQLabel; class TQLabel;
@ -41,7 +42,7 @@ namespace KDE
public: public:
/** @param text a 1-6 word description of the progress operation */ /** @param text a 1-6 word description of the progress operation */
ProgressBar &setDescription( const TQString &text ); LIBAMAROK_EXPORT ProgressBar &setDescription( const TQString &text );
/** @param text eg. Scanning, Reading. The state of the operation */ /** @param text eg. Scanning, Reading. The state of the operation */
ProgressBar &setStatus( const TQString &text ); ProgressBar &setStatus( const TQString &text );

@ -76,7 +76,7 @@ namespace KDE
* @see KDE::ProgressBar * @see KDE::ProgressBar
*/ */
class StatusBar : public TQWidget class LIBAMAROK_EXPORT StatusBar : public TQWidget
{ {
Q_OBJECT Q_OBJECT
@ -122,7 +122,7 @@ namespace KDE
* Generally you should use these, as it is very easy for a user to not notice * Generally you should use these, as it is very easy for a user to not notice
* statusBar messages. * statusBar messages.
*/ */
void longMessage( const TQString &text, int type = Information ) LIBAMAROK_EXPORT ; void longMessage( const TQString &text, int type = Information );
void longMessageThreadSafe( const TQString &text, int type = Information ); void longMessageThreadSafe( const TQString &text, int type = Information );

@ -7,6 +7,7 @@
#define AMAROK_TAGDIALOG_H #define AMAROK_TAGDIALOG_H
#include "config.h" #include "config.h"
#include "amarok_export.h"
#include "htmlview.h" #include "htmlview.h"
#include "ktrm.h" #include "ktrm.h"
@ -33,16 +34,16 @@ namespace TagLib {
class TagDialog : public TagDialogBase class TagDialog : public TagDialogBase
{ {
Q_OBJECT Q_OBJECT
public: public:
enum Changes { NOCHANGE=0, SCORECHANGED=1, TAGSCHANGED=2, LYRICSCHANGED=4, RATINGCHANGED=8, LABELSCHANGED=16 }; enum Changes { NOCHANGE=0, SCORECHANGED=1, TAGSCHANGED=2, LYRICSCHANGED=4, RATINGCHANGED=8, LABELSCHANGED=16 };
enum Tabs { SUMMARYTAB, TAGSTAB, LYRICSTAB, STATSTAB, LABELSTAB }; enum Tabs { SUMMARYTAB, TAGSTAB, LYRICSTAB, STATSTAB, LABELSTAB };
TagDialog( const KURL& url, TQWidget* parent = 0 ); LIBAMAROK_EXPORT TagDialog( const KURL& url, TQWidget* parent = 0 );
TagDialog( const KURL::List list, TQWidget* parent = 0 ); LIBAMAROK_EXPORT TagDialog( const KURL::List list, TQWidget* parent = 0 );
TagDialog( const MetaBundle& mb, PlaylistItem* item, TQWidget* parent = 0 ); LIBAMAROK_EXPORT TagDialog( const MetaBundle& mb, PlaylistItem* item, TQWidget* parent = 0 );
~TagDialog(); ~TagDialog();
void setTab( int id ); void setTab( int id );

@ -6,6 +6,8 @@
#ifndef THREADMANAGER_H #ifndef THREADMANAGER_H
#define THREADMANAGER_H #define THREADMANAGER_H
#include "amarok_export.h"
#include "debug.h" #include "debug.h"
#include <tqevent.h> //baseclass #include <tqevent.h> //baseclass
#include <tqguardedptr.h> #include <tqguardedptr.h>
@ -77,7 +79,7 @@
/// This class is because moc "is really good" (no nested Q_OBJECT classes) /// This class is because moc "is really good" (no nested Q_OBJECT classes)
class JobBase : public TQObject { class LIBAMAROK_EXPORT JobBase : public TQObject {
Q_OBJECT Q_OBJECT
@ -89,7 +91,7 @@ protected:
bool m_aborted; bool m_aborted;
}; };
class ThreadManager : public TQObject class LIBAMAROK_EXPORT ThreadManager : public TQObject
{ {
public: public:
class Thread; class Thread;

Loading…
Cancel
Save