Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-25 03:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove redundant DBUS_TYPE_UNIX_FD checks

Browse source 
DBUS_TYPE_UNIX_FD and DBUS_TYPE_UNIX_FD_AS_STRING are available since
v1.2.16 and v1.5.12 is required now

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-01-13 01:46:47 +00:00
parent 4cf06bf8f3
commit 212ef9faba
3 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/dbus/qdbusargument_p.h
View file

@ -50,11 +50,6 @@
#include <dbus/dbus.h> #include <dbus/dbus.h>
#ifndef DBUS_TYPE_UNIX_FD
# define DBUS_TYPE_UNIX_FD int('h')
# define DBUS_TYPE_UNIX_FD_AS_STRING "h"
#endif
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QDBusMarshaller; class QDBusMarshaller;

4
src/dbus/qdbusintegrator.cpp
View file

@ -1649,10 +1649,6 @@ void QDBusConnectionPrivate::setPeer(DBusConnection *c, const QDBusErrorInternal
static QDBusConnection::ConnectionCapabilities connectionCapabilies(DBusConnection *connection) static QDBusConnection::ConnectionCapabilities connectionCapabilies(DBusConnection *connection)
{ {
QDBusConnection::ConnectionCapabilities result = 0; QDBusConnection::ConnectionCapabilities result = 0;
#ifndef DBUS_TYPE_UNIX_FD
# define DBUS_TYPE_UNIX_FD int('h')
#endif
if (dbus_connection_can_send_type(connection, DBUS_TYPE_UNIX_FD)) if (dbus_connection_can_send_type(connection, DBUS_TYPE_UNIX_FD))
result |= QDBusConnection::UnixFileDescriptorPassing; result |= QDBusConnection::UnixFileDescriptorPassing;

5
src/dbus/qdbusmetatype.cpp
View file

@ -44,11 +44,6 @@
#include <dbus/dbus.h> #include <dbus/dbus.h>
#include <string.h> #include <string.h>
#ifndef DBUS_TYPE_UNIX_FD
# define DBUS_TYPE_UNIX_FD int('h')
# define DBUS_TYPE_UNIX_FD_AS_STRING "h"
#endif
Q_DECLARE_METATYPE(QList<bool>) Q_DECLARE_METATYPE(QList<bool>)
Q_DECLARE_METATYPE(QList<short>) Q_DECLARE_METATYPE(QList<short>)
Q_DECLARE_METATYPE(QList<ushort>) Q_DECLARE_METATYPE(QList<ushort>)