andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

Replace std::array with std::vector 

Less efficient but helps with keeping ABI stable
This commit is contained in:
Andrius Štikonas 2018-04-05 21:52:17 +01:00
parent 54be18e8ad
commit 63cea60ff1
6 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/device.h
View File

@ -15,8 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.* * along with this program. If not, see <http://www.gnu.org/licenses/>.*
*************************************************************************/ *************************************************************************/
#if !defined(KPMCORE_DEVICE_H) #ifndef KPMCORE_DEVICE_H
#define KPMCORE_DEVICE_H #define KPMCORE_DEVICE_H
#include "util/libpartitionmanagerexport.h" #include "util/libpartitionmanagerexport.h"

2
src/fs/btrfs.cpp
View File

@ -44,7 +44,7 @@ FileSystem::CommandSupportType btrfs::m_UpdateUUID = FileSystem::cmdSupportNone;
FileSystem::CommandSupportType btrfs::m_GetUUID = FileSystem::cmdSupportNone; FileSystem::CommandSupportType btrfs::m_GetUUID = FileSystem::cmdSupportNone;
btrfs::btrfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) : btrfs::btrfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) :
FileSystem(firstsector, lastsector, sectorsused, label, FileSystem::Btrfs) FileSystem(firstsector, lastsector, sectorsused, label, FileSystem::Type::Btrfs)
{ {
} }

2
src/fs/filesystem.cpp
View File

@ -36,7 +36,7 @@
#include <QStandardPaths> #include <QStandardPaths>
#include <QStorageInfo> #include <QStorageInfo>
const std::array< QColor, FileSystem::__lastType > FileSystem::defaultColorCode = const std::vector<QColor> FileSystem::defaultColorCode =
{ {
{ {
QColor( 220,205,175 ), // unknown QColor( 220,205,175 ), // unknown

6
src/fs/filesystem.h
View File

@ -28,7 +28,7 @@
#include <QtGlobal> #include <QtGlobal>
#include <QUrl> #include <QUrl>
#include <array> #include <vector>
class QColor; class QColor;
class QValidator; class QValidator;
@ -57,7 +57,7 @@ public:
}; };
/** Supported FileSystem types */ /** Supported FileSystem types */
enum Type { enum Type : int {
Unknown = 0, Unknown = 0,
Extended = 1, Extended = 1,
@ -101,7 +101,7 @@ public:
cmdSupportBackend = 4 /**< supported by the backend */ cmdSupportBackend = 4 /**< supported by the backend */
}; };
static const std::array< QColor, __lastType > defaultColorCode; static const std::vector<QColor> defaultColorCode;
Q_DECLARE_FLAGS(CommandSupportTypes, CommandSupportType) Q_DECLARE_FLAGS(CommandSupportTypes, CommandSupportType)

2
src/gui/partwidget.cpp
View File

@ -71,7 +71,7 @@ void PartWidget::updateChildren()
} }
} }
void PartWidget::setFileSystemColorCode(const std::array< QColor, FileSystem::__lastType >& colorCode) void PartWidget::setFileSystemColorCode(const std::vector<QColor>& colorCode)
{ {
m_fileSystemColorCode = colorCode; m_fileSystemColorCode = colorCode;
repaint(); repaint();

6
src/gui/partwidget.h
View File

@ -26,8 +26,6 @@
#include <QColor> #include <QColor>
#include <array>
class Partition; class Partition;
class QPaintEvent; class QPaintEvent;
@ -63,7 +61,7 @@ public:
return m_Partition; /**< @return the widget's Partition */ return m_Partition; /**< @return the widget's Partition */
} }
void setFileSystemColorCode( const std::array< QColor, FileSystem::__lastType >& colorCode ); void setFileSystemColorCode( const std::vector<QColor>& colorCode );
protected: protected:
void paintEvent(QPaintEvent* event); void paintEvent(QPaintEvent* event);
@ -76,7 +74,7 @@ protected:
private: private:
Partition* m_Partition; Partition* m_Partition;
bool m_Active; bool m_Active;
std::array< QColor, FileSystem::__lastType > m_fileSystemColorCode; std::vector<QColor> m_fileSystemColorCode;
}; };
#endif #endif