Merge lp:~carlos-mazieri/ubuntu-filemanager-app/plugin-change-std-array-to-qlist into lp:ubuntu-filemanager-app

[Carlos Jose Mazieri]

Just changed from std:array to QList class.

Just changed from std:array to QList class.

The reason for that was a compiler error:

g++ -c -m64 -pipe -O2 -Wall -W -D_REENTRANT -fPIE -DREGRESSION_TEST_FOLDERLISTMODEL -DSIMULATE_LONG_ACTION -DDEBUG_EXT_FS_WATCHER -DQT_NO_DEBUG -DQT_QUICK_LIB -DQT_QML_LIB -DQT_WIDGETS_LIB -DQT_NETWORK_LIB -DQT_GUI_LIB -DQT_CORE_LIB -I/usr/share/qt5/mkspecs/linux-g++-64 -I../ubuntu-filemanager-app/src/plugin/test_folderlistmodel/simpleUI -I../ubuntu-filemanager-app/src/plugin/folderlistmodel -I../ubuntu-filemanager-app/src/plugin/folderlistmodel/trash -I../ubuntu-filemanager-app/src/plugin/folderlistmodel/disk -I/usr/include/qt5 -I/usr/include/qt5/QtQuick -I/usr/include/qt5/QtQml -I/usr/include/qt5/QtWidgets -I/usr/include/qt5/QtNetwork -I/usr/include/qt5/QtGui -I/usr/include/qt5/QtCore -I. -I. -I. -o dirmodel.o ../ubuntu-filemanager-app/src/plugin/folderlistmodel/dirmodel.cpp
In file included from /usr/include/c++/4.8/array:35:0,
                 from ../ubuntu-filemanager-app/src/plugin/folderlistmodel/dirmodel.cpp:71:
/usr/include/c++/4.8/bits/c++0x_warning.h:32:2: error:

#error This file requires compiler and library support for the ISO C++ 2011 standard. This support is currently experimental, and must be enabled with the -std=c++11 or -std=gnu++11 compiler options.
 #error This file requires compiler and library support for the \
  ^
../ubuntu-filemanager-app/src/plugin/folderlistmodel/dirmodel.cpp:86:5: error: ‘array’ in namespace ‘std’ does not name a type
     std::array<QStandardPaths::StandardLocation, 5> mtpStandardLocations = {
     ^

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:267
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/320/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1830
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1830/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/118

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/320/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Builds and runs fine here with the change. Thanks!

review: Approve

=== modified file 'src/plugin/folderlistmodel/dirmodel.cpp'
--- src/plugin/folderlistmodel/dirmodel.cpp	2014-08-09 19:57:42 +0000
+++ src/plugin/folderlistmodel/dirmodel.cpp	2014-09-03 22:11:15 +0000
@@ -62,15 +62,13 @@
 #include <QDateTime>
 #include <QMimeType>
 #include <QStandardPaths>
+#include <QList>
 
 #if defined(REGRESSION_TEST_FOLDERLISTMODEL)
 # include <QColor>
 # include <QBrush>
 #endif
 
-#include <array>
-
-
 
 #define IS_VALID_ROW(row)             (row >=0 && row < mDirectoryContents.count())
 #define WARN_ROW_OUT_OF_RANGE(row)    qWarning() << Q_FUNC_INFO << this << "row:" << row << "Out of bounds access"
@@ -83,13 +81,14 @@
     QHash<QByteArray, int> roleMapping;
     QList<QString> mtpDirectories;
 
-    std::array<QStandardPaths::StandardLocation, 5> mtpStandardLocations = {
-        QStandardPaths::DocumentsLocation,
-        QStandardPaths::DownloadLocation,
-        QStandardPaths::MusicLocation,
-        QStandardPaths::PicturesLocation,
-        QStandardPaths::MoviesLocation
-    };
+    QList<QStandardPaths::StandardLocation> mtpStandardLocations =
+                  QList<QStandardPaths::StandardLocation>()
+                         << QStandardPaths::DocumentsLocation
+                         << QStandardPaths::DownloadLocation
+                         << QStandardPaths::MusicLocation
+                         << QStandardPaths::PicturesLocation
+                         << QStandardPaths::MoviesLocation;
+
 
     void buildMTPDirectories() {
         mtpDirectories.clear();