Build fixes for Qt5 Windows/mingw/MXE support.

[pulseview.git] / pv / devicemanager.hpp

diff --git a/pv/devicemanager.hpp b/pv/devicemanager.hpp
index 823cb2bc9542ee8632690be4780db421a8bcc1de..145f9e80a44e68fbfa96bafe027a4a2781c89e75 100644 (file)
--- a/pv/devicemanager.hpp
+++ b/pv/devicemanager.hpp
@@ -14,12 +14,11 @@
  * 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_H
-#define PULSEVIEW_PV_DEVICEMANAGER_H
+#ifndef PULSEVIEW_PV_DEVICEMANAGER_HPP
+#define PULSEVIEW_PV_DEVICEMANAGER_HPP

 
 #include <list>
 #include <map>
 
 #include <list>
 #include <map>


@@ -27,59 +26,57 @@
 #include <string>
 
 namespace Glib {
 #include <string>
 
 namespace Glib {

-       class VariantBase;
+class VariantBase;

 }
 
 namespace sigrok {
 }
 
 namespace sigrok {

-       class ConfigKey;
-       class Context;
-       class Driver;
-       class Device;
-       class HardwareDevice;
+class ConfigKey;
+class Context;
+class Driver;

 }
 
 namespace pv {
 
 }
 
 namespace pv {
 

-class SigSession;
+namespace devices {
+class Device;
+class HardwareDevice;
+}
+
+class Session;

 
 class DeviceManager
 {
 public:
        DeviceManager(std::shared_ptr<sigrok::Context> context);
 
 
 class DeviceManager
 {
 public:
        DeviceManager(std::shared_ptr<sigrok::Context> context);
 

-       ~DeviceManager();
+       ~DeviceManager() = default;
+
+       const std::shared_ptr<sigrok::Context>& context() const;

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

-       const std::list< std::shared_ptr<sigrok::HardwareDevice> >&
+       const std::list< std::shared_ptr<devices::HardwareDevice> >&

                devices() const;
 
                devices() const;
 

-       std::list< std::shared_ptr<sigrok::HardwareDevice> > driver_scan(
+       std::list< std::shared_ptr<devices::HardwareDevice> > driver_scan(

                std::shared_ptr<sigrok::Driver> driver,
                std::map<const sigrok::ConfigKey *, Glib::VariantBase> drvopts);
 
        const std::map<std::string, std::string> get_device_info(
                std::shared_ptr<sigrok::Driver> driver,
                std::map<const sigrok::ConfigKey *, Glib::VariantBase> drvopts);
 
        const std::map<std::string, std::string> get_device_info(

-               const std::shared_ptr<sigrok::Device> device);
+               const std::shared_ptr<devices::Device> device);

 
 

-       const std::shared_ptr<sigrok::HardwareDevice> find_device_from_info(
+       const std::shared_ptr<devices::HardwareDevice> find_device_from_info(

                const std::map<std::string, std::string> search_info);
 
                const std::map<std::string, std::string> search_info);
 

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

 private:
 private:

-       bool compare_devices(std::shared_ptr<sigrok::Device> a,
-               std::shared_ptr<sigrok::Device> b);
+       bool compare_devices(std::shared_ptr<devices::Device> a,
+               std::shared_ptr<devices::Device> b);

 
 protected:
        std::shared_ptr<sigrok::Context> context_;
 
 protected:
        std::shared_ptr<sigrok::Context> context_;

-       std::list< std::shared_ptr<sigrok::HardwareDevice> > devices_;
-       std::map< std::shared_ptr<sigrok::Device>, std::string > display_names_;
+       std::list< std::shared_ptr<devices::HardwareDevice> > devices_;

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

-#endif // PULSEVIEW_PV_DEVICEMANAGER_H
+#endif // PULSEVIEW_PV_DEVICEMANAGER_HPP