diff options
author | Thiago Macieira <thiago@kde.org> | 2006-03-06 14:29:39 +0000 |
---|---|---|
committer | Thiago Macieira <thiago@kde.org> | 2006-03-06 14:29:39 +0000 |
commit | 9393d6b459d02a8508750a846bf97a69e48c97e2 (patch) | |
tree | 4cf83534dc0ea77ce63819b0358f6f72820db9bc /qt/qdbusmacros.h | |
parent | 305ce15e4f0568d5eeb8ca169c4fb0f77e50fcb4 (diff) |
2006-03-06 Thiago Macieira <thiago.macieira@trolltech.com>
* qt/*:
* dbus/qdbus.h: Sync with KDE Subversion revision 516237. This
represents the first feature-complete version of the Qt4
bindings since I took ove maintainership.
Diffstat (limited to 'qt/qdbusmacros.h')
-rw-r--r-- | qt/qdbusmacros.h | 48 |
1 files changed, 44 insertions, 4 deletions
diff --git a/qt/qdbusmacros.h b/qt/qdbusmacros.h index e36bfb7f..72db6435 100644 --- a/qt/qdbusmacros.h +++ b/qt/qdbusmacros.h @@ -1,6 +1,8 @@ /* qdbusmessage.h QDBusMessage object * * Copyright (C) 2005 Harald Fernengel <harry@kdevelop.org> + * Copyright (C) 2006 Trolltech AS. All rights reserved. + * Author: Thiago Macieira <thiago.macieira@trolltech.com> * * Licensed under the Academic Free License version 2.1 * @@ -15,22 +17,60 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with this program; if not, write to the Free Software Foundation + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ +/*! + \file qdbusmacros.h +*/ + #ifndef QDBUSMACROS_H #define QDBUSMACROS_H #include <QtCore/qglobal.h> -#ifndef QDBUS_EXPORT -#ifdef QDBUS_MAKEDLL +#ifdef DBUS_COMPILATION +/// \internal # define QDBUS_EXPORT Q_DECL_EXPORT #else +/// \internal # define QDBUS_EXPORT Q_DECL_IMPORT #endif + +#ifndef Q_MOC_RUN +/*! + \relates QDBusAbstractAdaptor + \brief Marks a method as "asynchronous" + + The Q_ASYNC macro can be used to mark a method to be called and not wait for it to finish + processing before returning from QDBusInterface::call. The called method cannot return any + output arguments and, if it does, any such arguments will be discarded. + + You can use this macro in your own adaptors by placing it before your method's return value + (which must be "void") in the class declaration, as shown in the example: + \code + Q_ASYNC void myMethod(); + \endcode + + Its presence in the method implementation (outside the class declaration) is optional. + + \sa #async, \ref UsingAdaptors +*/ +# define Q_ASYNC +#endif +#ifndef QT_NO_KEYWORDS + +/*! + \relates QDBusAbstractAdaptor + \brief Marks a method as "asynchronous" + + This macro is the same as #Q_ASYNC and is provided as a shorthand. However, it is not defined if + QT_NO_KEYWORDS is defined, which makes Qt not use its extensions to the C++ language (keywords + emit, signals, slots). +*/ +# define async Q_ASYNC #endif #endif |