Git commit eceeeaae97db3bdf9057a7eedb3a5661ffc537f0 by David Faure. Committed on 05/09/2015 at 10:20. Pushed by dfaure into branch 'master'.
remove outdated mentions of kded M +0 -2 autotests/kmimeassociationstest.cpp M +0 -2 autotests/kservicetest.cpp M +0 -2 autotests/ksycocadicttest.cpp M +0 -2 autotests/ksycocathreadtest.cpp M +1 -3 docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook M +2 -2 src/kbuildsycoca/kbuildmimetypefactory.h M +2 -2 src/kbuildsycoca/kbuildservicefactory.h M +2 -2 src/kbuildsycoca/kbuildservicegroupfactory.h M +2 -2 src/kbuildsycoca/kbuildservicetypefactory.h M +2 -2 src/kbuildsycoca/kbuildsycoca.h M +2 -2 src/kbuildsycoca/kctimefactory.h M +2 -2 src/kbuildsycoca/kmimeassociations.h M +2 -2 src/kbuildsycoca/vfolder_menu.h http://commits.kde.org/kservice/eceeeaae97db3bdf9057a7eedb3a5661ffc537f0 diff --git a/autotests/kmimeassociationstest.cpp b/autotests/kmimeassociationstest.cpp index 075ab8c..cd8c6c9 100644 --- a/autotests/kmimeassociationstest.cpp +++ b/autotests/kmimeassociationstest.cpp @@ -112,8 +112,6 @@ private Q_SLOTS: QStandardPaths::enableTestMode(true); qputenv("XDG_CURRENT_DESKTOP", "KDE"); - extern KSERVICE_EXPORT bool kservice_require_kded; - kservice_require_kded = false; m_localConfig = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1Char('/'); QDir(m_localConfig).removeRecursively(); diff --git a/autotests/kservicetest.cpp b/autotests/kservicetest.cpp index c41920e..909caf4 100644 --- a/autotests/kservicetest.cpp +++ b/autotests/kservicetest.cpp @@ -59,13 +59,11 @@ static void eraseProfiles() } } -extern KSERVICE_EXPORT bool kservice_require_kded; void KServiceTest::initTestCase() { QStandardPaths::enableTestMode(true); - kservice_require_kded = false; // A non-C locale is necessary for some tests. // This locale must have the following properties: diff --git a/autotests/ksycocadicttest.cpp b/autotests/ksycocadicttest.cpp index beea586..690953b 100644 --- a/autotests/ksycocadicttest.cpp +++ b/autotests/ksycocadicttest.cpp @@ -26,7 +26,6 @@ #include <kconfiggroup.h> #include <ksycocadict_p.h> -extern KSERVICE_EXPORT bool kservice_require_kded; class KSycocaDictTest : public QObject { @@ -36,7 +35,6 @@ private Q_SLOTS: void initTestCase() { QStandardPaths::enableTestMode(true); - kservice_require_kded = false; // we don't need the services dir -> ensure there isn't one, so we can check allResourceDirs below. QDir(servicesDir()).removeRecursively(); diff --git a/autotests/ksycocathreadtest.cpp b/autotests/ksycocathreadtest.cpp index 4c4ec6d..29a096f 100644 --- a/autotests/ksycocathreadtest.cpp +++ b/autotests/ksycocathreadtest.cpp @@ -201,7 +201,6 @@ public: } }; -extern KSERVICE_EXPORT bool kservice_require_kded; // This code runs in the main thread class KSycocaThreadTest : public QObject @@ -261,7 +260,6 @@ static void runKBuildSycoca() void KSycocaThreadTest::initTestCase() { QStandardPaths::enableTestMode(true); - kservice_require_kded = false; // This service is always there. Used in the trader queries from the thread. const QString fakeTextPlugin = fakeTextPluginDesktopFile(); diff --git a/docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook b/docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook index 6e1800e..68e58db 100644 --- a/docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook +++ b/docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook @@ -69,9 +69,7 @@ requested of it. <para> Users do not normally need to run this application directly; KService will run -it if necessary, and if KDED is installed and running it will run -<command>kbuildsyscoca5</command> whenever any of the files whose data is cached -are changed. +it if necessary, when any of the files whose data is cached are changed. </para> </refsect1> diff --git a/src/kbuildsycoca/kbuildmimetypefactory.h b/src/kbuildsycoca/kbuildmimetypefactory.h index 71888db..15f5e20 100644 --- a/src/kbuildsycoca/kbuildmimetypefactory.h +++ b/src/kbuildsycoca/kbuildmimetypefactory.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KDED_KBUILD_MIME_TYPE_FACTORY_H -#define KDED_KBUILD_MIME_TYPE_FACTORY_H +#ifndef KBUILD_MIME_TYPE_FACTORY_H +#define KBUILD_MIME_TYPE_FACTORY_H #include <kmimetypefactory_p.h> #include <QtCore/QStringList> diff --git a/src/kbuildsycoca/kbuildservicefactory.h b/src/kbuildsycoca/kbuildservicefactory.h index 1758c48..d8ae878 100644 --- a/src/kbuildsycoca/kbuildservicefactory.h +++ b/src/kbuildsycoca/kbuildservicefactory.h @@ -18,8 +18,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KDED_KBUILD_SERVICE_FACTORY_H -#define KDED_KBUILD_SERVICE_FACTORY_H +#ifndef KBUILD_SERVICE_FACTORY_H +#define KBUILD_SERVICE_FACTORY_H #include <QtCore/QStringList> diff --git a/src/kbuildsycoca/kbuildservicegroupfactory.h b/src/kbuildsycoca/kbuildservicegroupfactory.h index a4e1a5e..01c1230 100644 --- a/src/kbuildsycoca/kbuildservicegroupfactory.h +++ b/src/kbuildsycoca/kbuildservicegroupfactory.h @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KDED_KBUILD_SERVICE_GROUP_FACTORY_H -#define KDED_KBUILD_SERVICE_GROUP_FACTORY_H +#ifndef KBUILD_SERVICE_GROUP_FACTORY_H +#define KBUILD_SERVICE_GROUP_FACTORY_H #include <kservice.h> #include <kservicegroupfactory_p.h> diff --git a/src/kbuildsycoca/kbuildservicetypefactory.h b/src/kbuildsycoca/kbuildservicetypefactory.h index de29367..347e753 100644 --- a/src/kbuildsycoca/kbuildservicetypefactory.h +++ b/src/kbuildsycoca/kbuildservicetypefactory.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KDED_KBUILD_SERVICE_TYPE_FACTORY_H -#define KDED_KBUILD_SERVICE_TYPE_FACTORY_H +#ifndef KBUILD_SERVICE_TYPE_FACTORY_H +#define KBUILD_SERVICE_TYPE_FACTORY_H #include <kservicetypefactory_p.h> #include <QtCore/QStringList> diff --git a/src/kbuildsycoca/kbuildsycoca.h b/src/kbuildsycoca/kbuildsycoca.h index f0f7ec8..481510a 100644 --- a/src/kbuildsycoca/kbuildsycoca.h +++ b/src/kbuildsycoca/kbuildsycoca.h @@ -15,8 +15,8 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. **/ -#ifndef KDED_KBUILDSYCOCA_H -#define KDED_KBUILDSYCOCA_H +#ifndef KBUILDSYCOCA_H +#define KBUILDSYCOCA_H #include "kbuildsycocainterface.h" diff --git a/src/kbuildsycoca/kctimefactory.h b/src/kbuildsycoca/kctimefactory.h index 6ecfb54..24ae8e5 100644 --- a/src/kbuildsycoca/kctimefactory.h +++ b/src/kbuildsycoca/kctimefactory.h @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KDED_KCTIME_FACTORY_H -#define KDED_KCTIME_FACTORY_H +#ifndef KCTIME_FACTORY_H +#define KCTIME_FACTORY_H #include <ksycocafactory_p.h> #include <QtCore/QHash> diff --git a/src/kbuildsycoca/kmimeassociations.h b/src/kbuildsycoca/kmimeassociations.h index 662635c..f902d83 100644 --- a/src/kbuildsycoca/kmimeassociations.h +++ b/src/kbuildsycoca/kmimeassociations.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef KDED_KMIMEASSOCIATIONS_H -#define KDED_KMIMEASSOCIATIONS_H +#ifndef KMIMEASSOCIATIONS_H +#define KMIMEASSOCIATIONS_H #include <QSet> #include <QStringList> diff --git a/src/kbuildsycoca/vfolder_menu.h b/src/kbuildsycoca/vfolder_menu.h index f4aac24..b90f5ef 100644 --- a/src/kbuildsycoca/vfolder_menu.h +++ b/src/kbuildsycoca/vfolder_menu.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KDED_VFOLDER_MENU_H -#define KDED_VFOLDER_MENU_H +#ifndef VFOLDER_MENU_H +#define VFOLDER_MENU_H #include <QtCore/QObject> #include <QtXml/QDomDocument> _______________________________________________ kde-doc-english mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-doc-english
