flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 19:05:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Remove experimental string_view include

Browse Source
This commit is contained in:
Lars Toenning
2024-09-08 12:41:30 +02:00
parent eb27accd03
commit 019c7a8b27
2 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xswiftbus/dbusmessage.cpp
View File

@@ -56,17 +56,17 @@ namespace XSwiftBus
return dbus_message_get_serial(m_message); 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); 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); 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); return dbus_message_get_member(m_message);
} }

19
src/xswiftbus/dbusmessage.h
View File

@@ -7,23 +7,10 @@
#include "dbus/dbus.h" #include "dbus/dbus.h"
#include <string> #include <string>
#include <vector> #include <vector>
#if defined(_MSC_VER)
# include <experimental/string>
#elif defined(__clang__)
#include <string_view> #include <string_view>
#else
# include <experimental/string_view>
#endif
namespace XSwiftBus namespace XSwiftBus
{ {
#if defined(_MSC_VER) || defined(__clang__)
using std::string_view;
#else
using std::experimental::string_view;
#endif
//! DBus Message //! DBus Message
class CDBusMessage class CDBusMessage
{ {
@@ -53,13 +40,13 @@ namespace XSwiftBus
dbus_uint32_t getSerial() const; dbus_uint32_t getSerial() const;
//! Get the called interface name //! Get the called interface name
string_view getInterfaceName() const; std::string_view getInterfaceName() const;
//! Get the called object path //! Get the called object path
string_view getObjectPath() const; std::string_view getObjectPath() const;
//! Get the called method name //! Get the called method name
string_view getMethodName() const; std::string_view getMethodName() const;
//! Begin writing argument //! Begin writing argument
void beginArgumentWrite(); void beginArgumentWrite();