Build fixes for Qt5 Windows/mingw/MXE support.

[pulseview.git] / pv / devicemanager.hpp

diff --git a/pv/devicemanager.hpp b/pv/devicemanager.hpp
index 8bceed34ff409d7a1a7769d0ad2c9c7fcf6a1f4f..145f9e80a44e68fbfa96bafe027a4a2781c89e75 100644 (file)
--- a/pv/devicemanager.hpp
+++ b/pv/devicemanager.hpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.

  */
 
 #ifndef PULSEVIEW_PV_DEVICEMANAGER_HPP
  */
 
 #ifndef PULSEVIEW_PV_DEVICEMANAGER_HPP


@@ -50,7 +49,7 @@ class DeviceManager
 public:
        DeviceManager(std::shared_ptr<sigrok::Context> context);
 
 public:
        DeviceManager(std::shared_ptr<sigrok::Context> context);
 

-       ~DeviceManager();
+       ~DeviceManager() = default;

 
        const std::shared_ptr<sigrok::Context>& context() const;
 
 
        const std::shared_ptr<sigrok::Context>& context() const;
 


@@ -69,15 +68,6 @@ public:
        const std::shared_ptr<devices::HardwareDevice> find_device_from_info(
                const std::map<std::string, std::string> search_info);
 
        const std::shared_ptr<devices::HardwareDevice> find_device_from_info(
                const std::map<std::string, std::string> search_info);
 

-       void build_display_name(std::shared_ptr<devices::Device> device);
-
-       const std::string get_display_name(
-               std::shared_ptr<devices::Device> dev);
-
-       const std::string get_full_name(std::shared_ptr<devices::Device> dev);
-
-       void update_display_name(std::shared_ptr<devices::Device> dev);
-

 private:
        bool compare_devices(std::shared_ptr<devices::Device> a,
                std::shared_ptr<devices::Device> b);
 private:
        bool compare_devices(std::shared_ptr<devices::Device> a,
                std::shared_ptr<devices::Device> b);


@@ -85,9 +75,6 @@ private:
 protected:
        std::shared_ptr<sigrok::Context> context_;
        std::list< std::shared_ptr<devices::HardwareDevice> > devices_;
 protected:
        std::shared_ptr<sigrok::Context> context_;
        std::list< std::shared_ptr<devices::HardwareDevice> > devices_;

-
-       std::map< std::shared_ptr<devices::Device>, std::string > display_names_;
-       std::map< std::shared_ptr<devices::Device>, std::string > full_names_;

 };
 
 } // namespace pv
 };
 
 } // namespace pv