From e2f40da2578278da766038a6e7e5780e350191f2 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Fri, 27 Jul 2012 14:10:20 +0200 Subject: [PATCH] removed duplicated docs in android qsharedmemory and systemsemaphore Qdoc sees all source and header files, rather than the subset selected by qmake. This leads to qdoc errors when the same functions are documented in multiple implementations. In the cases fixed here, all documentation was duplicated, so no information was lost. Change-Id: Id7f8e2e617862a3778d0b05b38d8811aad456ac5 Reviewed-by: Casper van Donderen Reviewed-by: Robin Burchell --- src/corelib/kernel/qsharedmemory_android.cpp | 14 -------------- src/corelib/kernel/qsystemsemaphore_android.cpp | 13 ------------- 2 files changed, 27 deletions(-) diff --git a/src/corelib/kernel/qsharedmemory_android.cpp b/src/corelib/kernel/qsharedmemory_android.cpp index d9806a8b37..c0603c692c 100644 --- a/src/corelib/kernel/qsharedmemory_android.cpp +++ b/src/corelib/kernel/qsharedmemory_android.cpp @@ -60,11 +60,6 @@ void QSharedMemoryPrivate::setErrorString(const QString &function) qWarning() << Q_FUNC_INFO << "Not yet implemented on Android"; } -/*! - \internal - - If not already made create the handle used for accessing the shared memory. -*/ key_t QSharedMemoryPrivate::handle() { qWarning() << Q_FUNC_INFO << "Not yet implemented on Android"; @@ -74,15 +69,6 @@ key_t QSharedMemoryPrivate::handle() #endif // QT_NO_SHAREDMEMORY #if !(defined(QT_NO_SHAREDMEMORY) && defined(QT_NO_SYSTEMSEMAPHORE)) -/*! - \internal - Creates the unix file if needed. - returns true if the unix file was created. - - -1 error - 0 already existed - 1 created - */ int QSharedMemoryPrivate::createUnixKeyFile(const QString &fileName) { qWarning() << Q_FUNC_INFO << "Not yet implemented on Android"; diff --git a/src/corelib/kernel/qsystemsemaphore_android.cpp b/src/corelib/kernel/qsystemsemaphore_android.cpp index 1e13f6eb5a..58c31c35d6 100644 --- a/src/corelib/kernel/qsystemsemaphore_android.cpp +++ b/src/corelib/kernel/qsystemsemaphore_android.cpp @@ -59,30 +59,17 @@ void QSystemSemaphorePrivate::setErrorString(const QString &function) qWarning() << Q_FUNC_INFO << "Not yet implemented on Android"; } -/*! - \internal - - Setup unix_key - */ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode) { qWarning() << Q_FUNC_INFO << "Not yet implemented on Android"; return -1; } -/*! - \internal - - Cleanup the unix_key - */ void QSystemSemaphorePrivate::cleanHandle() { qWarning() << Q_FUNC_INFO << "Not yet implemented on Android"; } -/*! - \internal - */ bool QSystemSemaphorePrivate::modifySemaphore(int count) { qWarning() << Q_FUNC_INFO << "Not yet implemented on Android";