forked from robingarbo/qt
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 int…
…o master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QtDBus: Add unit tests for QDBusAbstractAdaptor QtDBus: Add unit tests for QDBusInterface QtDBus: Add unit tests for QDBusAbstractInterface QtDBus: Register QDBusServer connection name in QDBusConnectionManager QtDBus: Skip bus name check for peer-to-peer connection QtDBus: Fix minor coding style issues QtDBus: Add default constructor to QDBusServer QtDBus: Add unit tests for peer-to-peer connection QtDBus: Add method QDBusConnection::disconnectFromPeer() QtDBus: Add method QDBusConnection::connectToPeer() QtDBus: Fix QDBusConnection::disconnectFromBus() for peer-to-peer connections QtDBus: Fix bus in peer-to-peer connections should not be used QtDBus: Fix empty service name in peer-to-peer connections QtDBus: Fix registering objects using path '/' in peer-to-peer connections QtDBus: Fix QDBusServer to handle correctly new dbus connections QtDBus: Cleaning comments, spacing, etc.
Showing
28 changed files
with
3,426 additions
and
545 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
/**************************************************************************** | ||
** | ||
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). | ||
** All rights reserved. | ||
** Contact: Nokia Corporation (qt-info@nokia.com) | ||
** | ||
** This file is part of the QtDBus module of the Qt Toolkit. | ||
** | ||
** $QT_BEGIN_LICENSE:LGPL$ | ||
** No Commercial Usage | ||
** This file contains pre-release code and may not be distributed. | ||
** You may use this file in accordance with the terms and conditions | ||
** contained in the Technology Preview License Agreement accompanying | ||
** this package. | ||
** | ||
** GNU Lesser General Public License Usage | ||
** Alternatively, this file may be used under the terms of the GNU Lesser | ||
** General Public License version 2.1 as published by the Free Software | ||
** Foundation and appearing in the file LICENSE.LGPL included in the | ||
** packaging of this file. Please review the following information to | ||
** ensure the GNU Lesser General Public License version 2.1 requirements | ||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. | ||
** | ||
** In addition, as a special exception, Nokia gives you certain additional | ||
** rights. These rights are described in the Nokia Qt LGPL Exception | ||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. | ||
** | ||
** If you have questions regarding the use of this file, please contact | ||
** Nokia at qt-info@nokia.com. | ||
** | ||
** | ||
** | ||
** | ||
** | ||
** | ||
** | ||
** | ||
** $QT_END_LICENSE$ | ||
** | ||
****************************************************************************/ | ||
|
||
// | ||
// W A R N I N G | ||
// ------------- | ||
// | ||
// This file is not part of the public API. This header file may | ||
// change from version to version without notice, or even be | ||
// removed. | ||
// | ||
// We mean it. | ||
// | ||
// | ||
|
||
#ifndef QDBUSCONNECTIONMANAGER_P_H | ||
#define QDBUSCONNECTIONMANAGER_P_H | ||
|
||
#include "qdbusconnection_p.h" | ||
|
||
#ifndef QT_NO_DBUS | ||
|
||
QT_BEGIN_NAMESPACE | ||
|
||
class QDBusConnectionManager | ||
{ | ||
public: | ||
QDBusConnectionManager() {} | ||
~QDBusConnectionManager(); | ||
static QDBusConnectionManager* instance(); | ||
|
||
QDBusConnectionPrivate *connection(const QString &name) const; | ||
void removeConnection(const QString &name); | ||
void setConnection(const QString &name, QDBusConnectionPrivate *c); | ||
|
||
QDBusConnectionPrivate *sender() const; | ||
void setSender(const QDBusConnectionPrivate *s); | ||
|
||
mutable QMutex mutex; | ||
private: | ||
QHash<QString, QDBusConnectionPrivate *> connectionHash; | ||
|
||
mutable QMutex senderMutex; | ||
QString senderName; // internal; will probably change | ||
}; | ||
|
||
QT_END_NAMESPACE | ||
|
||
#endif // QT_NO_DBUS | ||
#endif |
Oops, something went wrong.