Includes, comments and bugfixes

- Fix includes
- Use common regex (Song::kCoverRemoveDisc) for removing Disc/CD from album
- Remove Disc/CD from album when creating hash
- Make imobiledevice support compile
- Fix setting device on windows

ext/strawberry-tagreader/main.cpp

@@ -15,16 +15,23 @@
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "tagreaderworker.h"
-#include "core/logging.h"
+#include "config.h"
 
+#include <sys/time.h>
+#include <iostream>
+
+#include <QtGlobal>
 #include <QCoreApplication>
+#include <QList>
 #include <QLocalSocket>
+#include <QSsl>
+#include <QSslCertificate>
 #include <QSslSocket>
 #include <QStringList>
+#include <QtDebug>
 
-#include <iostream>
-#include <sys/time.h>
+#include "core/logging.h"
+#include "tagreaderworker.h"
 
 int main(int argc, char **argv) {
 

ext/strawberry-tagreader/tagreaderworker.cpp

@@ -15,15 +15,16 @@
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "tagreaderworker.h"
+#include "config.h"
+
+#include <string>
 
 #include <QCoreApplication>
-#include <QDateTime>
-#include <QFileInfo>
-#include <QNetworkAccessManager>
-#include <QTextCodec>
-#include <QUrl>
+#include <QObject>
+#include <QIODevice>
+#include <QByteArray>
 
+#include "tagreaderworker.h"
 
 TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent)
   : AbstractMessageHandler<pb::tagreader::Message>(socket, parent)

ext/strawberry-tagreader/tagreaderworker.h

@@ -19,9 +19,15 @@
 #define TAGREADERWORKER_H
 
 #include "config.h"
+
+#include <stddef.h>
+
+#include <QObject>
+#include <QIODevice>
+
+#include "core/messagehandler.h"
 #include "tagreader.h"
 #include "tagreadermessages.pb.h"
-#include "core/messagehandler.h"
 
 class TagReaderWorker : public AbstractMessageHandler<pb::tagreader::Message> {
 public: