Merge pull request #54 from Sasasu/sa/odr

Qt: fix compile error when ODR check enabled.

Author: bbogush

qt/parallel_chip_info.cpp

@@ -33,7 +33,7 @@ typedef struct __attribute__((__packed__))
     uint8_t enableEccAddr;
     uint8_t enableEccValue;
     uint8_t disableEccValue;
-} Conf;
+} ParallelChipConf;
 
 ParallelChipInfo::ParallelChipInfo()
 {
@@ -120,7 +120,7 @@ void ParallelChipInfo::chipInfoToStmParams(StmParams *stmParams)
 
 const QByteArray &ParallelChipInfo::getHalConf()
 {
-    Conf conf;
+    ParallelChipConf conf;
     StmParams stmParams;
 
     chipInfoToStmParams(&stmParams);

qt/spi_chip_info.cpp

@@ -17,7 +17,7 @@ typedef struct __attribute__((__packed__))
     uint8_t busy_bit;
     uint8_t busy_state;
     uint32_t freq;
-} Conf;
+} SpiChipConf;
 
 SpiChipInfo::SpiChipInfo()
 {
@@ -30,7 +30,7 @@ SpiChipInfo::~SpiChipInfo()
 
 const QByteArray &SpiChipInfo::getHalConf()
 {
-    Conf conf;
+    SpiChipConf conf;
 
     conf.page_offset = static_cast<uint8_t>(params[CHIP_PARAM_PAGE_OFF]);
     conf.read_cmd = static_cast<uint8_t>(params[CHIP_PARAM_READ_CMD]);