diff --git a/src/xswiftbus/dbusmessage.cpp b/src/xswiftbus/dbusmessage.cpp index 998a5de82..039325d68 100644 --- a/src/xswiftbus/dbusmessage.cpp +++ b/src/xswiftbus/dbusmessage.cpp @@ -56,17 +56,17 @@ namespace XSwiftBus return dbus_message_get_serial(m_message); } - string_view CDBusMessage::getInterfaceName() const + std::string_view CDBusMessage::getInterfaceName() const { return dbus_message_get_interface(m_message); } - string_view CDBusMessage::getObjectPath() const + std::string_view CDBusMessage::getObjectPath() const { return dbus_message_get_path(m_message); } - string_view CDBusMessage::getMethodName() const + std::string_view CDBusMessage::getMethodName() const { return dbus_message_get_member(m_message); } diff --git a/src/xswiftbus/dbusmessage.h b/src/xswiftbus/dbusmessage.h index 0de735b60..a26436dbb 100644 --- a/src/xswiftbus/dbusmessage.h +++ b/src/xswiftbus/dbusmessage.h @@ -7,23 +7,10 @@ #include "dbus/dbus.h" #include #include -#if defined(_MSC_VER) -# include -#elif defined(__clang__) -# include -#else -# include -#endif +#include namespace XSwiftBus { - -#if defined(_MSC_VER) || defined(__clang__) - using std::string_view; -#else - using std::experimental::string_view; -#endif - //! DBus Message class CDBusMessage { @@ -53,13 +40,13 @@ namespace XSwiftBus dbus_uint32_t getSerial() const; //! Get the called interface name - string_view getInterfaceName() const; + std::string_view getInterfaceName() const; //! Get the called object path - string_view getObjectPath() const; + std::string_view getObjectPath() const; //! Get the called method name - string_view getMethodName() const; + std::string_view getMethodName() const; //! Begin writing argument void beginArgumentWrite();