Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some symbol naming conflicts that happen when including windows header files (taglib >1.7 brings them in for us).

Browse Source
This commit is contained in:
David Sansome 2011-11-27 19:42:31 +00:00
parent 456011d100
commit 8334484c1e
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/song.h
View File

@ -47,6 +47,19 @@
struct IWMDMMetaData;
#endif
// Taglib pulls in some windows headers that #define all sorts of nasties.
// Undef those here.
#ifdef RemoveDirectory
# undef RemoveDirectory
#endif
#ifdef AddJob
# undef AddJob
#endif
#ifdef LoadIcon
# undef LoadIcon
#endif
class SqlRow;
#ifdef HAVE_LIBLASTFM

10
src/ui/settingsdialog.cpp
View File

@ -125,11 +125,11 @@ SettingsDialog::SettingsDialog(BackgroundStreams* streams, QWidget* parent)
#endif
// User interface
QTreeWidgetItem* interface = AddCategory(tr("User interface"));
AddPage(Page_GlobalShortcuts, new GlobalShortcutsSettingsPage(this), interface);
AddPage(Page_GlobalSearch, new GlobalSearchSettingsPage(this), interface);
AddPage(Page_SongInformation, new SongInfoSettingsPage(this), interface);
AddPage(Page_Notifications, new NotificationsSettingsPage(this), interface);
QTreeWidgetItem* iface = AddCategory(tr("User interface"));
AddPage(Page_GlobalShortcuts, new GlobalShortcutsSettingsPage(this), iface);
AddPage(Page_GlobalSearch, new GlobalSearchSettingsPage(this), iface);
AddPage(Page_SongInformation, new SongInfoSettingsPage(this), iface);
AddPage(Page_Notifications, new NotificationsSettingsPage(this), iface);
// Internet providers
QTreeWidgetItem* providers = AddCategory(tr("Internet providers"));