Hi, i made some cleanup for my patch.As we can obtain track information directly from the new mddevice classes we don't need the functions in the model anymore. I know my patch is not reviewed jet, but i thinks it's easier to review when there are no unused/unnessessary functions.
Also, as stated by Adrian, compilation will break on linux because of missing include and library paths for libusb.
Thomas
>From a57d2aee74925ebd640251217cdff10043a43022 Mon Sep 17 00:00:00 2001 From: Thomas Arp <manner.moe@gmx.de> Date: Sun, 22 Dec 2013 19:59:09 +0100 Subject: [PATCH 7/8] netmd support: removed unused members track(), tracks() and downloadableFileExtensions() from the QMDModel classes. This can be used directly from the QMDDevice classes instead --- qhimdtransfer/qhimdmainwindow.cpp | 2 +- qhimdtransfer/qmdmodel.cpp | 40 --------------------------------------- qhimdtransfer/qmdmodel.h | 7 ------- 3 files changed, 1 insertion(+), 48 deletions(-) diff --git a/qhimdtransfer/qhimdmainwindow.cpp b/qhimdtransfer/qhimdmainwindow.cpp index d5031b2..0d90882 100644 --- a/qhimdtransfer/qhimdmainwindow.cpp +++ b/qhimdtransfer/qhimdmainwindow.cpp @@ -131,7 +131,7 @@ void QHiMDMainWindow::open_device(QMDDevice * dev) return; } - localmodel.setSelectableExtensions(mod->downloadableFileExtensions()); + localmodel.setSelectableExtensions(current_device->downloadableFileExtensions()); ui->DiscTitle->setText(current_device->discTitle()); set_buttons_enable(1,0,0,1,1,1,1); } diff --git a/qhimdtransfer/qmdmodel.cpp b/qhimdtransfer/qmdmodel.cpp index 2a3c4e7..a7fa13d 100644 --- a/qhimdtransfer/qmdmodel.cpp +++ b/qhimdtransfer/qmdmodel.cpp @@ -158,26 +158,6 @@ void QNetMDTracksModel::close() endResetModel(); /* inform views that the model contents changed */ } -QNetMDTrack QNetMDTracksModel::track(int trkidx) const -{ - return ndev->netmdTrack(trkidx); -} - -QNetMDTrackList QNetMDTracksModel::tracks(const QModelIndexList & modelindices) const -{ - QNetMDTrackList tracks; - QModelIndex index; - - foreach(index, modelindices) - tracks.append(ndev->netmdTrack(index.row())); - return tracks; -} - -QStringList QNetMDTracksModel::downloadableFileExtensions() const -{ - return ndev->downloadableFileExtensions(); -} - /* himd tracks model */ @@ -334,26 +314,6 @@ void QHiMDTracksModel::close() endResetModel(); /* inform views that the model contents changed */ } -QHiMDTrack QHiMDTracksModel::track(int trknum) const -{ - return hdev->himdTrack(trknum); -} - -QHiMDTrackList QHiMDTracksModel::tracks(const QModelIndexList & modelindices) const -{ - QHiMDTrackList tracks; - QModelIndex index; - - foreach(index, modelindices) - tracks.append(hdev->himdTrack(index.row())); - return tracks; -} - -QStringList QHiMDTracksModel::downloadableFileExtensions() const -{ - return hdev->downloadableFileExtensions(); -} - /* QFileSystemModel stuff */ diff --git a/qhimdtransfer/qmdmodel.h b/qhimdtransfer/qmdmodel.h index bb8b0b8..bb8ec97 100644 --- a/qhimdtransfer/qmdmodel.h +++ b/qhimdtransfer/qmdmodel.h @@ -23,7 +23,6 @@ public: virtual QString open(QMDDevice *device = NULL) {return tr("no known device type specified");} virtual bool is_open() {return false;} virtual void close() {} - QStringList downloadableFileExtensions() const {return QStringList();} }; class QNetMDTracksModel : public QMDTracksModel { @@ -42,9 +41,6 @@ public: QString open(QMDDevice *device); /* returns null if OK, error message otherwise */ virtual bool is_open(); void close(); - QNetMDTrack track(int trkidx) const; - virtual QNetMDTrackList tracks(const QModelIndexList & indices) const; // should be QMDTrackList later - QStringList downloadableFileExtensions() const; }; class QHiMDTracksModel : public QMDTracksModel { @@ -62,9 +58,6 @@ public: virtual QString open(QMDDevice *device); /* returns null if OK, error message otherwise */ virtual bool is_open(); virtual void close(); - virtual QHiMDTrack track(int trackidx) const; - virtual QHiMDTrackList tracks(const QModelIndexList & indices) const; // should be QMDTrackList later - QStringList downloadableFileExtensions() const; }; class QHiMDFileSystemModel : public QFileSystemModel { -- 1.8.4.msysgit.0
>From 96f57c42a185361f0dfc86117ce26b11657e5732 Mon Sep 17 00:00:00 2001 From: Thomas Arp <manner.moe@gmx.de> Date: Sun, 22 Dec 2013 20:12:59 +0100 Subject: [PATCH 8/8] netmd support: add pkgconfig file for libusb-1.0 to qhimdtransfer.pro config file --- qhimdtransfer/qhimdtransfer.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/qhimdtransfer/qhimdtransfer.pro b/qhimdtransfer/qhimdtransfer.pro index 9ac07cb..0fc2de1 100644 --- a/qhimdtransfer/qhimdtransfer.pro +++ b/qhimdtransfer/qhimdtransfer.pro @@ -1,6 +1,7 @@ TEMPLATE = app CONFIG += link_prl \ link_pkgconfig +PKGCONFIG += libusb-1.0 TARGET = qhimdtransfer DEPENDPATH += . INCLUDEPATH += . -- 1.8.4.msysgit.0