Commit 3e12dd91 authored by David Faure's avatar David Faure

Rename tag.* to juktag.* to avoid a clash with taglib's tag.h

parent 57243f0d
......@@ -86,6 +86,7 @@ set(juk_SRCS
webimagefetcher.cpp
historyplaylist.cpp
juk.cpp
juktag.cpp
keydialog.cpp
lyricswidget.cpp
main.cpp
......@@ -111,7 +112,6 @@ set(juk_SRCS
statuslabel.cpp
stringshare.cpp
systemtray.cpp
tag.cpp
tageditor.cpp
tagguesser.cpp
tagguesserconfigdlg.cpp
......
......@@ -28,7 +28,7 @@
#include <QtGlobal>
#include <QSaveFile>
#include "tag.h"
#include "juktag.h"
#include "searchplaylist.h"
#include "historyplaylist.h"
#include "upcomingplaylist.h"
......
......@@ -40,7 +40,7 @@
#include "stringshare.h"
#include "cache.h"
#include "actioncollection.h"
#include "tag.h"
#include "juktag.h"
#include "viewmode.h"
#include "juk_debug.h"
......
......@@ -50,7 +50,7 @@
#include "collectionlist.h"
#include "playlistsearch.h"
#include "playlistitem.h"
#include "tag.h"
#include "juktag.h"
#include "juk_debug.h"
struct CoverPopup : public QWidget
......
......@@ -22,7 +22,7 @@
#include <QScopedPointer>
#include "filehandleproperties.h"
#include "tag.h"
#include "juktag.h"
#include "cache.h"
#include "coverinfo.h"
#include "juk_debug.h"
......
......@@ -45,7 +45,7 @@
#include <QPushButton>
#include <QHeaderView>
#include "tag.h"
#include "juktag.h"
#include "filerenameroptions.h"
#include "filehandle.h"
#include "exampleoptions.h"
......
......@@ -15,7 +15,7 @@
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "tag.h"
#include "juktag.h"
#include <KLocalizedString>
......
......@@ -29,7 +29,7 @@
#include <KConfigGroup>
#include <KSharedConfig>
#include "tag.h"
#include "juktag.h"
#include "actioncollection.h"
#include "juk_debug.h"
......
......@@ -24,7 +24,7 @@
#include "coverinfo.h"
#include "playlist.h"
#include "playlistitem.h"
#include "tag.h"
#include "juktag.h"
#include "filehandle.h"
#include <QCryptographicHash>
......
......@@ -45,7 +45,7 @@
#include "playlistitem.h"
#include "coverinfo.h"
#include "covermanager.h"
#include "tag.h"
#include "juktag.h"
#include "collectionlist.h"
#include "juk_debug.h"
......
......@@ -41,7 +41,7 @@
#include "actioncollection.h"
#include "collectionlist.h"
#include "coverinfo.h"
#include "tag.h"
#include "juktag.h"
#include "scrobbler.h"
#include "juk.h"
#include "juk_debug.h"
......
......@@ -74,7 +74,7 @@
#include "filerenamer.h"
#include "actioncollection.h"
#include "tracksequencemanager.h"
#include "tag.h"
#include "juktag.h"
#include "upcomingplaylist.h"
#include "deletedialog.h"
#include "webimagefetcher.h"
......
......@@ -26,7 +26,7 @@
#include <QPixmap>
#include "collectionlist.h"
#include "tag.h"
#include "juktag.h"
#include "coverinfo.h"
#include "covermanager.h"
#include "tagtransactionmanager.h"
......
......@@ -31,7 +31,7 @@
#include <memory>
#include "tag.h"
#include "juktag.h"
#include "juk.h"
#include "juk_debug.h"
......
......@@ -34,7 +34,7 @@
#include "playlistinterface.h"
#include "actioncollection.h"
#include "playermanager.h"
#include "tag.h"
#include "juktag.h"
#include "juk_debug.h"
using namespace ActionCollection;
......
......@@ -36,7 +36,7 @@
#include <QIcon>
#include <QApplication>
#include "tag.h"
#include "juktag.h"
#include "actioncollection.h"
#include "playermanager.h"
#include "coverinfo.h"
......
......@@ -17,7 +17,7 @@
#include "tageditor.h"
#include "collectionlist.h"
#include "playlistitem.h"
#include "tag.h"
#include "juktag.h"
#include "actioncollection.h"
#include "tagtransactionmanager.h"
#include "juk_debug.h"
......
......@@ -27,7 +27,7 @@
#include "playlistitem.h"
#include "collectionlist.h"
#include "tag.h"
#include "juktag.h"
#include "actioncollection.h"
#include "juk_debug.h"
......
......@@ -22,7 +22,7 @@
#include <memory>
#include <vector>
#include "tag.h"
#include "juktag.h"
class PlaylistItem;
class QWidget;
......
......@@ -22,7 +22,7 @@
#include "playlist.h"
#include "actioncollection.h"
#include "tag.h"
#include "juktag.h"
#include "filehandle.h"
#include "juk_debug.h"
......
......@@ -24,7 +24,7 @@
#include "playlist.h"
#include "playlistitem.h"
#include "tracksequenceiterator.h"
#include "tag.h"
#include "juktag.h"
#include "filehandle.h"
#include "collectionlist.h"
......
......@@ -22,7 +22,7 @@
#include <QStringList>
#include "collectionlist.h"
#include "tag.h"
#include "juktag.h"
#include "playlistitem.h"
#include "playlistsearch.h"
#include "tagtransactionmanager.h"
......
......@@ -25,7 +25,7 @@
#include "covermanager.h"
#include "filehandle.h"
#include "tag.h"
#include "juktag.h"
#include "juk.h"
#include "juk_debug.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment