[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs/kdecore (silent)
From: Friedrich W. H. Kossebau <kossebau () kde ! org>
Date: 2010-02-01 12:57:19
Message-ID: 1265029039.937311.28566.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1083542 by kossebau:
SVN_SILENT: the official name is D-Bus, not DBUS or else
M +1 -1 auth/ConfigureChecks.cmake
M +2 -2 auth/kauthaction.h
M +2 -2 auth/kauthactionreply.h
M +3 -3 io/kdebug.cpp
M +1 -1 kernel/kglobal.h
M +5 -5 kernel/ktoolinvocation.h
M +1 -1 tests/kservicetest.cpp
M +2 -2 util/kdedmodule.cpp
M +2 -2 util/kdedmodule.h
--- trunk/KDE/kdelibs/kdecore/auth/ConfigureChecks.cmake #1083541:1083542
@@ -165,7 +165,7 @@
endif()
# Helper backend
-# No selection, we have DBus only
+# No selection, we have D-Bus only
set (KAUTH_COMPILING_DBUS_HELPER_BACKEND TRUE)
--- trunk/KDE/kdelibs/kdecore/auth/kauthaction.h #1083541:1083542
@@ -319,7 +319,7 @@
* custom data coming from the helper.
*
* The method blocks the execution, and will
- * return only when the action has been completed (or failed). Take note, \
however, that with the dbus + * return only when the action has been completed \
(or failed). Take note, however, that with the D-Bus
* helper proxy (currently the only one implemented on all the supported \
platforms), the request is
* sent using the QDBus::BlockWithGui flag.
*
@@ -363,7 +363,7 @@
* This method executes each action in the list. It checks for authorization of \
each action, and put the
* denied actions, if any, in the list pointed by the deniedActions parameter, \
if not NULL.
*
- * Please note that with the dbus helper proxy (currently the only one \
implemented), the execution of a group + * Please note that with the D-Bus helper \
proxy (currently the only one implemented), the execution of a group
* of actions is very different from executing in sequence each action using, \
for example, executeAsync().
* Currently, the helper can execute only one request at the time. For this \
reason, if you have to call
* different actions in sequence, you can't call executeAsync() like this:
--- trunk/KDE/kdelibs/kdecore/auth/kauthactionreply.h #1083541:1083542
@@ -44,7 +44,7 @@
Not only: the library can also be used to lock down some actions in your \
application without using an helper but just checking for authorization and verifying \
if the user is allowed to perform it.
The KDE Authorization library uses different backends depending on the system where \
it's built. As far as the user authorization is concerned, it currently uses \
PolicyKit on linux and Authorization Services
- on Mac OSX, and a Windows backend will eventually be written, too. At the \
communication layer, the library uses dbus on every supported platform. + on Mac OSX, \
and a Windows backend will eventually be written, too. At the communication layer, \
the library uses D-Bus on every supported platform.
@section kauth_concepts Concepts
@@ -397,7 +397,7 @@
AuthorizationDenied, ///< You don't have the authorization to execute the \
action
UserCancelled, ///< Action execution has been cancelled by the user
HelperBusy, ///< The helper is busy executing another action (or group of \
actions). Try later
- DBusError ///< An error from dbus occurred
+ DBusError ///< An error from D-Bus occurred
};
/// Default constructor. Sets type() to Success and errorCode() to zero.
--- trunk/KDE/kdelibs/kdecore/io/kdebug.cpp #1083541:1083542
@@ -220,10 +220,10 @@
Q_ASSERT(int(QtDebugMsg) == 0);
Q_ASSERT(int(QtFatalMsg) == 3);
- // Create the dbus interface if it has not been created yet
- // But only register to DBus if we are in a process with a dbus event loop,
+ // Create the D-Bus interface if it has not been created yet
+ // But only register to D-Bus if we are in a process with a D-Bus event \
loop, // otherwise introspection will just hang.
- // Examples of processes without a dbus event loop: kioslaves and the main \
kdeinit process. + // Examples of processes without a D-Bus event loop: \
kioslaves and the main kdeinit process. //
// How to know that we have a real event loop? That's tricky.
// We could delay registration in kDebugDBusIface with a QTimer, but
--- trunk/KDE/kdelibs/kdecore/kernel/kglobal.h #1083541:1083542
@@ -443,7 +443,7 @@
*
* However, don't try to call setAllowQuit(false) in applications, it doesn't \
make sense.
* If you find that the application quits too early when closing a window, then \
consider
- * _what_ is making your application still alive to the user (like a systray \
icon or a dbus object) + * _what_ is making your application still alive to the \
user (like a systray icon or a D-Bus object)
* and use KGlobal::ref() + KGlobal::deref() in that object.
*
* @since 4.1.1
--- trunk/KDE/kdelibs/kdecore/kernel/ktoolinvocation.h #1083541:1083542
@@ -46,13 +46,13 @@
* There are three possibilities:
* @li X-DBUS-StartupType=None (default)
* Always start a new service,
- * don't wait till the service registers with dbus.
+ * don't wait till the service registers with D-Bus.
* @li X-DBUS-StartupType=Multi
* Always start a new service,
- * wait until the service has registered with dbus.
+ * wait until the service has registered with D-Bus.
* @li X-DBUS-StartupType=Unique
* Only start the service if it isn't already running,
- * wait until the service has registered with dbus.
+ * wait until the service has registered with D-Bus.
* The .desktop file can specify the name that the application will use when \
registering
* using X-DBUS-ServiceName=org.domain.mykapp. Otherwise org.kde.binaryname is \
assumed.
*
@@ -62,7 +62,7 @@
* Calls to members are only allowed if there is a Q(Core)Application object created
* If you call the members with signal/slot connections across threads, you can't \
use the return values
* If a function is called from the wrong thread and it has a return value -1 is \
returned
- * Investigate if this is really needed or if DBUS is threadsafe anyway
+ * Investigate if this is really needed or if D-Bus is threadsafe anyway
*
* For more details see <a
* href="http://techbase.kde.org/Development/Architecture/KDE4/Starting_Other_Programs#KToolInvocation::startServiceByDesktopPath">techbase</a>.
@@ -174,7 +174,7 @@
public:
/**
- * Returns the DBus interface of the service launcher.
+ * Returns the D-Bus interface of the service launcher.
* The returned object is owned by KApplication, do not delete it!
*/
static OrgKdeKLauncherInterface *klauncher();
--- trunk/KDE/kdelibs/kdecore/tests/kservicetest.cpp #1083541:1083542
@@ -496,7 +496,7 @@
futures << QtConcurrent::run(this, &KServiceTest::testKSycocaUpdate);
futures << QtConcurrent::run(this, &KServiceTest::testTraderConstraints);
while (m_sycocaUpdateDone == 0) // not using a bool, just to silence helgrind
- QTest::qWait(100); // process dbus events!
+ QTest::qWait(100); // process D-Bus events!
kDebug() << "Joining all threads";
Q_FOREACH(QFuture<void> f, futures)
f.waitForFinished();
--- trunk/KDE/kdelibs/kdecore/util/kdedmodule.cpp #1083541:1083542
@@ -62,7 +62,7 @@
if (this->metaObject()->indexOfClassInfo("D-Bus Interface")!=-1)
{
- // 1. There are kded modules that don't have a dbus interface.
+ // 1. There are kded modules that don't have a D-Bus interface.
// 2. qt 4.4.3 crashes when trying to emit signals on class without
// Q_CLASSINFO("D-Bus Interface", "<your interface>") but
// ExportSignal set.
@@ -77,7 +77,7 @@
regOptions = QDBusConnection::ExportScriptableSlots
| QDBusConnection::ExportScriptableProperties
| QDBusConnection::ExportAdaptors;
- kDebug() << "Registration of kded module " << d->moduleName << "without dbus \
interface."; + kDebug() << "Registration of kded module " << d->moduleName << \
"without D-Bus interface."; }
if (!QDBusConnection::sessionBus().registerObject(realPath.path(), this, \
regOptions))
--- trunk/KDE/kdelibs/kdecore/util/kdedmodule.h #1083541:1083542
@@ -62,7 +62,7 @@
/**
* @internal called by kded after loading a module
* The module name is set from the path of the desktop file, and is
- * used to register the module to dbus.
+ * used to register the module to D-Bus.
*/
void setModuleName( const QString& name );
@@ -85,7 +85,7 @@
void windowUnregistered(qlonglong windowId);
/**
- * Emitted after the module is registered successfully with dbus
+ * Emitted after the module is registered successfully with D-Bus
*
* @since 4.2
*/
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic