Solving the diamond problem for protocol interfaces

Details:
	- The solving the diamond inheritance problem of the ProtocolInterface
	- Extending the DataExportingInterface
	- Updating the MeasurementDataProtocol

Author: KGergo88

application/sources/data_exporting_interface.hpp

@@ -34,10 +34,13 @@
 
 
 
-class DataExportingInterface: public ProtocolInterface
+class DataExportingInterface : virtual ProtocolInterface
 {
 public:
     virtual std::stringstream ExportData(const std::vector<DiagramSpecialized>& diagrams_to_export) = 0;
+    virtual bool CanThisFileBeExportedInto(const std::string path_to_file) = 0;
+    virtual std::string GetSupportedFileType(void) = 0;
+
 };
 
 #endif // DATA_EXPORTING_INTERFACE_HPP

application/sources/data_processing_interface.hpp

@@ -22,6 +22,7 @@
 
 
 #include <string>
+#include <vector>
 
 #include "global.hpp"
 #include "protocol_interface.hpp"
@@ -33,7 +34,7 @@
 
 
 
-class DataProcessingInterface : public ProtocolInterface
+class DataProcessingInterface : virtual ProtocolInterface
 {
 public:
     virtual std::vector<DiagramSpecialized> ProcessData(std::istream& input_data) = 0;

application/sources/measurement_data_protocol.cpp

@@ -188,6 +188,7 @@ bool MeasurementDataProtocol::CanThisFileBeProcessed(const std::string path_to_f
     {
         bResult = true;
     }
+
     return bResult;
 }
 
@@ -228,3 +229,17 @@ std::stringstream MeasurementDataProtocol::ExportData(const std::vector<DiagramS
 
     return exported_data;
 }
+
+bool MeasurementDataProtocol::CanThisFileBeExportedInto(const std::string path_to_file)
+{
+    bool bResult = false;
+
+    std::string file_extension = QFileInfo(QString::fromStdString(path_to_file)).completeSuffix().toStdString();
+
+    if(std::string(Constants::native_file_extension) == file_extension)
+    {
+        bResult = true;
+    }
+
+    return bResult;
+}

application/sources/measurement_data_protocol.hpp

@@ -35,6 +35,7 @@
 #include <QFileInfo>
 
 #include "global.hpp"
+#include "protocol_interface.hpp"
 #include "data_processing_interface.hpp"
 #include "data_exporting_interface.hpp"
 #include "diagram.hpp"
@@ -58,11 +59,12 @@ class MeasurementDataProtocol : public DataProcessingInterface, public DataExpor
     MeasurementDataProtocol& operator=(const MeasurementDataProtocol&) = delete;
     MeasurementDataProtocol& operator=(MeasurementDataProtocol&&) = delete;
 
-    std::string GetProtocolName(void) override;
-    std::vector<DiagramSpecialized> ProcessData(std::istream& input_data) override;
-    bool CanThisFileBeProcessed(const std::string path_to_file) override;
-    std::string GetSupportedFileType(void) override {return Constants::native_file_extension;}
-    std::stringstream ExportData(const std::vector<DiagramSpecialized>& diagrams_to_export) override;
+    virtual std::string GetProtocolName(void) override;
+    virtual std::vector<DiagramSpecialized> ProcessData(std::istream& input_data) override;
+    virtual bool CanThisFileBeProcessed(const std::string path_to_file) override;
+    virtual std::string GetSupportedFileType(void) override {return Constants::native_file_extension;}
+    virtual std::stringstream ExportData(const std::vector<DiagramSpecialized>& diagrams_to_export) override;
+    virtual bool CanThisFileBeExportedInto(const std::string path_to_file) override;
 
 private:
     struct Constants