From 7c12f2f478c951a34bd537fb5a855d04cd0d4a2a Mon Sep 17 00:00:00 2001
From: Craig Drummond <craig.p.drummond@gmail.com>
Date: Sun, 20 Dec 2015 10:21:40 +0000
Subject: [PATCH] Capitalise first letter of device name.

---
 ChangeLog          |  1 +
 devices/device.cpp | 28 ++++++++++++++++++++++++++++
 devices/device.h   | 25 ++-----------------------
 3 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e5e7d4125..e857754ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -85,6 +85,7 @@
 62. Default to Qt5 builds.
 63. Fix copying songs to devices - incorrect number of bytes were transferred.
 64. Only use MTP device with BUSNUM and DEVNUM properties.
+65. Capitalise first letter of device name.
 
 1.5.2
 -----
diff --git a/devices/device.cpp b/devices/device.cpp
index ae7931607..1f7648752 100644
--- a/devices/device.cpp
+++ b/devices/device.cpp
@@ -294,6 +294,34 @@ QTemporaryFile * Device::copySongToTemp(Song &song)
     return temp;
 }
 
+Device::Device(MusicModel *m, Solid::Device &dev, bool albumArtistSupport, bool flat)
+    : MusicLibraryItemRoot(dev.product().startsWith(dev.vendor()) ? dev.product() : (dev.vendor()+QChar(' ')+dev.product()), albumArtistSupport, flat)
+    , configured(false)
+    , solidDev(dev)
+    , deviceId(dev.udi())
+    , update(0)
+    , needToFixVa(false)
+    , jobAbortRequested(false)
+    , transcoding(false)
+{
+    m_model=m;
+    icn=Icon(solidDev.isValid() ? solidDev.icon() : QLatin1String("inode-directory"));
+    m_itemData[0]=m_itemData[0].toUpper();
+}
+
+Device::Device(MusicModel *m, const QString &name, const QString &id)
+    : MusicLibraryItemRoot(name)
+    , configured(false)
+    , deviceId(id)
+    , update(0)
+    , needToFixVa(false)
+    , jobAbortRequested(false)
+    , transcoding(false)
+{
+    m_model=m;
+    icn=Icon(solidDev.isValid() ? solidDev.icon() : QLatin1String("inode-directory"));
+}
+
 void Device::saveCache()
 {
     QTimer::singleShot(0, this, SIGNAL(cacheSaved()));
diff --git a/devices/device.h b/devices/device.h
index 89826eb43..7322fe518 100644
--- a/devices/device.h
+++ b/devices/device.h
@@ -105,29 +105,8 @@ public:
         Q_UNUSED(id)
     }
     #else
-    Device(MusicModel *m, Solid::Device &dev, bool albumArtistSupport=true, bool flat=false)
-        : MusicLibraryItemRoot(dev.product().startsWith(dev.vendor()) ? dev.product() : (dev.vendor()+QChar(' ')+dev.product()), albumArtistSupport, flat)
-        , configured(false)
-        , solidDev(dev)
-        , deviceId(dev.udi())
-        , update(0)
-        , needToFixVa(false)
-        , jobAbortRequested(false)
-        , transcoding(false) {
-        m_model=m;
-        icn=Icon(solidDev.isValid() ? solidDev.icon() : QLatin1String("inode-directory"));
-    }
-    Device(MusicModel *m, const QString &name, const QString &id)
-        : MusicLibraryItemRoot(name)
-        , configured(false)
-        , deviceId(id)
-        , update(0)
-        , needToFixVa(false)
-        , jobAbortRequested(false)
-        , transcoding(false) {
-        m_model=m;
-        icn=Icon(solidDev.isValid() ? solidDev.icon() : QLatin1String("inode-directory"));
-    }
+    Device(MusicModel *m, Solid::Device &dev, bool albumArtistSupport=true, bool flat=false);
+    Device(MusicModel *m, const QString &name, const QString &id);
     #endif
 
     virtual ~Device() { }