Re: [linux-minidisc] Qt5 compatibility

[Thomas Arp <manner.moe@gmx.de>]

Am 27.12.2013 01:00, schrieb Michael Karcher:
> Hi, the evil critic is back...
Hi
> As your patch is already in, I suggest proceeding this way:
> 1) Commit a second patch that removes "QtCore" from the include
> directives (and does *just* that)
O.K., here is the patch.
> 2) Commit one patch that rephrases the test for autodetectability and
> removes the bad "toLatin1" as "minor fixes" patch. I think the ideal
> thing from a traceability perspective (who did what when and why) would
> be to have this two patches, as these are two logical changes, caused by
> different reasons, and even two different severities (one is a code
> "clean-up" without functional change, the other one is a bug fix), but I
> understand worries about "commit bloat" for small changes, too. So do it
> either way you want, or drop the "cleanup" completely, if you decide you
> want to keep the "+=" construct with the casts to bool.
In my patches for netmd integration the "+=" with the casts to bool does 
not exist anymore.
Also the trackmodel.open() routine will be changed by taking a pointer 
to a QMDDevice class as parameter.
So the bad toLatin1() does not exist, too.

I think it is better to drop the "cleanup" for now until my netmd 
integration patches have been reviewed completely.
Maybe some cleanup or bug fixing is nessessary anyway.

Thomas

>From ef623ed715baa2aa2573c0d4954dbbd796b5cc22 Mon Sep 17 00:00:00 2001
From: Thomas Arp <manner.moe@gmx.de>
Date: Fri, 27 Dec 2013 18:59:32 +0100
Subject: [PATCH] remove "QtCore" from the include directives, let qmake add
 the include paths instead

---
 qhimdtransfer/main.cpp              |    4 ++--
 qhimdtransfer/qhimddetection.cpp    |    2 +-
 qhimdtransfer/qhimdmainwindow.cpp   |    2 +-
 qhimdtransfer/qhimdmainwindow.h     |    2 +-
 qhimdtransfer/qhimdmodel.cpp        |    4 ++--
 qhimdtransfer/qhimdmodel.h          |    8 ++++----
 qhimdtransfer/qhimdtransfer.pro     |    2 +-
 qhimdtransfer/qhimdwindetection.cpp |    4 ++--
 qhimdtransfer/qmdtrack.h            |    2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/qhimdtransfer/main.cpp b/qhimdtransfer/main.cpp
index e7a3e2f..b07dfa3 100644
--- a/qhimdtransfer/main.cpp
+++ b/qhimdtransfer/main.cpp
@@ -1,6 +1,6 @@
 #include <QApplication>
-#include <QtCore/QTranslator>
-#include <QtCore/QLocale>
+#include <QTranslator>
+#include <QLocale>
 #include "qhimdmainwindow.h"
 
 /* stolen from Qt Creator */
diff --git a/qhimdtransfer/qhimddetection.cpp b/qhimdtransfer/qhimddetection.cpp
index d563587..579fd61 100644
--- a/qhimdtransfer/qhimddetection.cpp
+++ b/qhimdtransfer/qhimddetection.cpp
@@ -1,4 +1,4 @@
-#include <QtCore/QDebug>
+#include <QDebug>
 #include "qhimddetection.h"
 
 QHiMDDetection::QHiMDDetection(QObject *parent) :
diff --git a/qhimdtransfer/qhimdmainwindow.cpp b/qhimdtransfer/qhimdmainwindow.cpp
index 1b86651..907464e 100644
--- a/qhimdtransfer/qhimdmainwindow.cpp
+++ b/qhimdtransfer/qhimdmainwindow.cpp
@@ -5,7 +5,7 @@
 #include <QMessageBox>
 #include <QApplication>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 
 QString QHiMDMainWindow::dumpmp3(const QHiMDTrack & trk, QString file)
diff --git a/qhimdtransfer/qhimdmainwindow.h b/qhimdtransfer/qhimdmainwindow.h
index b9b14f7..3715e05 100644
--- a/qhimdtransfer/qhimdmainwindow.h
+++ b/qhimdtransfer/qhimdmainwindow.h
@@ -3,7 +3,7 @@
 
 #include <QMainWindow>
 #include <QFileDialog>
-#include <QtCore/QSettings>
+#include <QSettings>
 #include "qhimdaboutdialog.h"
 #include "qhimdformatdialog.h"
 #include "qhimduploaddialog.h"
diff --git a/qhimdtransfer/qhimdmodel.cpp b/qhimdtransfer/qhimdmodel.cpp
index 435a24b..86c2ca4 100644
--- a/qhimdtransfer/qhimdmodel.cpp
+++ b/qhimdtransfer/qhimdmodel.cpp
@@ -1,5 +1,5 @@
-#include <QtGui/QFont>
-#include <QtGui/QFontMetrics>
+#include <QFont>
+#include <QFontMetrics>
 #include "qhimdmodel.h"
 
 static QString get_himd_str(struct himd * himd, int idx)
diff --git a/qhimdtransfer/qhimdmodel.h b/qhimdtransfer/qhimdmodel.h
index 9a3a0b7..b921c6a 100644
--- a/qhimdtransfer/qhimdmodel.h
+++ b/qhimdtransfer/qhimdmodel.h
@@ -1,10 +1,10 @@
 #ifndef QHIMDMODEL_H
 #define QHIMDMODEL_H
 
-#include <QtCore/QAbstractListModel>
-#include <QtCore/QTime>
-#include <QtCore/QList>
-#include <QtCore/QStringList>
+#include <QAbstractListModel>
+#include <QTime>
+#include <QList>
+#include <QStringList>
 #include <QFileSystemModel>
 #include "himd.h"
 
diff --git a/qhimdtransfer/qhimdtransfer.pro b/qhimdtransfer/qhimdtransfer.pro
index 6d3e39d..9dae0a8 100644
--- a/qhimdtransfer/qhimdtransfer.pro
+++ b/qhimdtransfer/qhimdtransfer.pro
@@ -6,7 +6,7 @@ DEPENDPATH += .
 INCLUDEPATH += .
 
 # for Qt5 compatibility
-QT += gui
+QT += gui core
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 # determine version number from git
diff --git a/qhimdtransfer/qhimdwindetection.cpp b/qhimdtransfer/qhimdwindetection.cpp
index 3e79038..04d07c0 100644
--- a/qhimdtransfer/qhimdwindetection.cpp
+++ b/qhimdtransfer/qhimdwindetection.cpp
@@ -1,5 +1,5 @@
-#include <QtCore/QDebug>
-#include <QtCore/QList>
+#include <QDebug>
+#include <QList>
 #include <QWidget>
 #include "qhimddetection.h"
 
diff --git a/qhimdtransfer/qmdtrack.h b/qhimdtransfer/qmdtrack.h
index 0ac7e43..569842b 100644
--- a/qhimdtransfer/qmdtrack.h
+++ b/qhimdtransfer/qmdtrack.h
@@ -1,7 +1,7 @@
 #ifndef QMDTRACK_H
 #define QMDTRACK_H
 
-#include <QtCore/QTime>
+#include <QTime>
 #include "himd.h"
 #include "sony_oma.h"
 
-- 
1.7.10.4