Differential D17719 Diff 47941 src/klauncher/klauncher.cpp

Changeset View

Standalone View

View Options

src/klauncher/klauncher.cpp

Show First 20 Lines • Show All 982 Lines • ▼ Show 20 Line(s)942{
983 983​
984 QStringList arg_list; 984​ QStringList arg_list;
985#ifdef USE_KPROCESS_FOR_KIOSLAVES 985​#ifdef USE_KPROCESS_FOR_KIOSLAVES
986 arg_list << slaveModulePath; 986​ arg_list << slaveModulePath;
987 arg_list << protocol; 987​ arg_list << protocol;
988 arg_list << mConnectionServer.address().toString(); 988​ arg_list << mConnectionServer.address().toString();
989 arg_list << app_socket; 989​ arg_list << app_socket;
990#ifdef Q_OS_WIN 990​#ifdef Q_OS_WIN
991 QString name = QLatin1String("kioslave"); 991​ QString name = QLatin1String("kioslave5");
992#else 992​#else
993 QString name = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kioslave"); 993​ QString name = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kioslave");
994#endif 994​#endif
995#else 995​#else
996 QString arg1 = protocol; 996​ QString arg1 = protocol;
997 QString arg2 = mConnectionServer.address().toString(); 997​ QString arg2 = mConnectionServer.address().toString();
998 QString arg3 = app_socket; 998​ QString arg3 = app_socket;
999 arg_list.append(arg1); 999​ arg_list.append(arg1);
Show All 13 Lines1010 if (mSlaveDebug == protocol) {
1013 request_header.arg_length = 0; 1013​ request_header.arg_length = 0;
1014 kde_safe_write(kdeinitSocket, &request_header, sizeof(request_header)); 1014​ kde_safe_write(kdeinitSocket, &request_header, sizeof(request_header));
1015 } 1015​ }
1016#endif 1016​#endif
1017 if (mSlaveValgrind == protocol) { 1017​ if (mSlaveValgrind == protocol) {
1018 arg_list.prepend(name); 1018​ arg_list.prepend(name);
1019#ifndef USE_KPROCESS_FOR_KIOSLAVES // otherwise we've already done this 1019​#ifndef USE_KPROCESS_FOR_KIOSLAVES // otherwise we've already done this
1020#ifdef Q_OS_WIN 1020​#ifdef Q_OS_WIN
1021 arg_list.prepend(QLatin1String("kioslave")); 1021​ arg_list.prepend(QLatin1String("kioslave5"));
1022#else 1022​#else
1023 arg_list.prepend(QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kioslave")); 1023​ arg_list.prepend(QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kioslave"));
1024#endif 1024​#endif
1025#endif 1025​#endif
1026 name = QStringLiteral("valgrind"); 1026​ name = QStringLiteral("valgrind");
1027 1027​
1028 if (!mSlaveValgrindSkin.isEmpty()) { 1028​ if (!mSlaveValgrindSkin.isEmpty()) {
1029 arg_list.prepend(QLatin1String("--tool=") + mSlaveValgrindSkin); 1029​ arg_list.prepend(QLatin1String("--tool=") + mSlaveValgrindSkin);
▲ Show 20 Lines • Show All 196 Lines • Show Last 20 Lines