From 084b9a2fe30594081b181858cd093b9c80631742 Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Fri, 4 Feb 2011 12:36:56 +0000
Subject: [PATCH] Remove taglib prefix from includes as the taglib include path
 contains it already.

---
 src/core/encoding.cpp          | 12 +++++-----
 src/core/encoding.h            |  2 +-
 src/core/song.cpp              | 40 +++++++++++++++++-----------------
 src/core/song.h                |  2 +-
 src/library/librarywatcher.cpp |  4 ++--
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/core/encoding.cpp b/src/core/encoding.cpp
index 31f273805..5e14540d2 100644
--- a/src/core/encoding.cpp
+++ b/src/core/encoding.cpp
@@ -20,12 +20,12 @@
 #include <QTextCodec>
 #include <QtDebug>
 
-#include <taglib/fileref.h>
-#include <taglib/mpegfile.h>
-#include <taglib/id3v2tag.h>
-#include <taglib/oggfile.h>
-#include <taglib/vorbisfile.h>
-#include <taglib/flacfile.h>
+#include <fileref.h>
+#include <mpegfile.h>
+#include <id3v2tag.h>
+#include <oggfile.h>
+#include <vorbisfile.h>
+#include <flacfile.h>
 
 #include "engines/enginebase.h"
 
diff --git a/src/core/encoding.h b/src/core/encoding.h
index 7cf20386c..e40635cba 100644
--- a/src/core/encoding.h
+++ b/src/core/encoding.h
@@ -21,7 +21,7 @@
 #include <QHash>
 #include <QString>
 
-#include <taglib/id3v1tag.h>
+#include <id3v1tag.h>
 
 #include "nsUniversalDetector.h"
 
diff --git a/src/core/song.cpp b/src/core/song.cpp
index 57643daf4..cf5264b08 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -22,26 +22,26 @@
 
 #include <sys/stat.h>
 
-#include <taglib/aifffile.h>
-#include <taglib/asffile.h>
-#include <taglib/attachedpictureframe.h>
-#include <taglib/commentsframe.h>
-#include <taglib/fileref.h>
-#include <taglib/flacfile.h>
-#include <taglib/id3v1genres.h>
-#include <taglib/id3v2tag.h>
-#include <taglib/mp4file.h>
-#include <taglib/mpcfile.h>
-#include <taglib/mpegfile.h>
-#include <taglib/oggfile.h>
-#include <taglib/oggflacfile.h>
-#include <taglib/speexfile.h>
-#include <taglib/tag.h>
-#include <taglib/textidentificationframe.h>
-#include <taglib/trueaudiofile.h>
-#include <taglib/tstring.h>
-#include <taglib/vorbisfile.h>
-#include <taglib/wavfile.h>
+#include <aifffile.h>
+#include <asffile.h>
+#include <attachedpictureframe.h>
+#include <commentsframe.h>
+#include <fileref.h>
+#include <flacfile.h>
+#include <id3v1genres.h>
+#include <id3v2tag.h>
+#include <mp4file.h>
+#include <mpcfile.h>
+#include <mpegfile.h>
+#include <oggfile.h>
+#include <oggflacfile.h>
+#include <speexfile.h>
+#include <tag.h>
+#include <textidentificationframe.h>
+#include <trueaudiofile.h>
+#include <tstring.h>
+#include <vorbisfile.h>
+#include <wavfile.h>
 
 #ifdef HAVE_LIBLASTFM
   #include "radio/fixlastfm.h"
diff --git a/src/core/song.h b/src/core/song.h
index 39253296f..7d184149b 100644
--- a/src/core/song.h
+++ b/src/core/song.h
@@ -27,7 +27,7 @@
 #include <QSqlQuery>
 #include <QString>
 
-#include <taglib/xiphcomment.h>
+#include <xiphcomment.h>
 
 #include "config.h"
 #include "engines/engine_fwd.h"
diff --git a/src/library/librarywatcher.cpp b/src/library/librarywatcher.cpp
index 931b5cd8d..2e0b3d64e 100644
--- a/src/library/librarywatcher.cpp
+++ b/src/library/librarywatcher.cpp
@@ -31,8 +31,8 @@
 #include <QSettings>
 #include <QTimer>
 
-#include <taglib/fileref.h>
-#include <taglib/tag.h>
+#include <fileref.h>
+#include <tag.h>
 
 QStringList LibraryWatcher::sValidImages;