summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2018-09-14 09:47:07 +0200
committerJohan Helsing <johan.helsing@qt.io>2018-09-17 09:50:44 +0000
commit9e0f3eb6383fd548a321a68ba79508785a5cd763 (patch)
tree424b5949ce95d24612506ac99b5814084285708f
parented38c063a84cca244c1528ecddb956abdc8018a8 (diff)
Compositor: Rename addSocketFd to addSocketDescriptor
Generally we prefer not to use abbreviated names. It now also matches what's in other Qt modules. Change-Id: I67d54961bebf93760780be54761c6122069f1e1d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--src/compositor/compositor_api/qwaylandcompositor.cpp6
-rw-r--r--src/compositor/compositor_api/qwaylandcompositor.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp
index d603dc8b2..8d902bcea 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandcompositor.cpp
@@ -578,7 +578,7 @@ QByteArray QWaylandCompositor::socketName() const
}
/*!
- * \qmlmethod QtWaylandCompositor::WaylandCompositor::addSocketFd(fd)
+ * \qmlmethod QtWaylandCompositor::WaylandCompositor::addSocketDescriptor(fd)
* \since 5.12
*
* Listen for client connections on a file descriptor referring to a
@@ -605,7 +605,7 @@ QByteArray QWaylandCompositor::socketName() const
*
* \since 5.12
*/
-void QWaylandCompositor::addSocketFd(int fd)
+void QWaylandCompositor::addSocketDescriptor(int fd)
{
#if WAYLAND_VERSION_MAJOR >= 1 && (WAYLAND_VERSION_MAJOR != 1 || WAYLAND_VERSION_MINOR >= 10)
Q_D(QWaylandCompositor);
@@ -614,7 +614,7 @@ void QWaylandCompositor::addSocketFd(int fd)
d->connectToExternalSockets();
#else
Q_UNUSED(fd);
- qWarning() << "QWaylandCompositor::addSocketFd() does nothing on libwayland versions prior to 1.10.0";
+ qWarning() << "QWaylandCompositor::addSocketDescriptor() does nothing on libwayland versions prior to 1.10.0";
#endif
}
diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h
index 72b8f2d1b..78684bc3e 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.h
+++ b/src/compositor/compositor_api/qwaylandcompositor.h
@@ -93,7 +93,7 @@ public:
void setSocketName(const QByteArray &name);
QByteArray socketName() const;
- Q_INVOKABLE void addSocketFd(int fd);
+ Q_INVOKABLE void addSocketDescriptor(int fd);
::wl_display *display() const;
uint32_t nextSerial();