equal
deleted
inserted
replaced
131 |
131 |
132 bool isSignal; |
132 bool isSignal; |
133 if (mm.methodType() == QMetaMethod::Signal) |
133 if (mm.methodType() == QMetaMethod::Signal) |
134 // adding a signal |
134 // adding a signal |
135 isSignal = true; |
135 isSignal = true; |
136 else if (mm.methodType() == QMetaMethod::Slot && mm.access() == QMetaMethod::Public) |
136 else if (mm.access() == QMetaMethod::Public && (mm.methodType() == QMetaMethod::Slot || mm.methodType() == QMetaMethod::Method)) |
137 isSignal = false; |
137 isSignal = false; |
138 else |
138 else |
139 continue; // neither signal nor public slot |
139 continue; // neither signal nor public slot |
140 |
140 |
141 if (isSignal && !(flags & (QDBusConnection::ExportScriptableSignals | |
141 if (isSignal && !(flags & (QDBusConnection::ExportScriptableSignals | |
142 QDBusConnection::ExportNonScriptableSignals))) |
142 QDBusConnection::ExportNonScriptableSignals))) |
143 continue; // we're not exporting any signals |
143 continue; // we're not exporting any signals |
144 if (!isSignal && !(flags & (QDBusConnection::ExportScriptableSlots | |
144 if (!isSignal && (!(flags & (QDBusConnection::ExportScriptableSlots | QDBusConnection::ExportNonScriptableSlots)) && |
145 QDBusConnection::ExportNonScriptableSlots))) |
145 !(flags & (QDBusConnection::ExportScriptableInvokables | QDBusConnection::ExportNonScriptableInvokables)))) |
146 continue; // we're not exporting any slots |
146 continue; // we're not exporting any slots or invokables |
147 |
147 |
148 QString xml = QString::fromLatin1(" <%1 name=\"%2\">\n") |
148 QString xml = QString::fromLatin1(" <%1 name=\"%2\">\n") |
149 .arg(isSignal ? QLatin1String("signal") : QLatin1String("method")) |
149 .arg(isSignal ? QLatin1String("signal") : QLatin1String("method")) |
150 .arg(QLatin1String(signature.left(paren))); |
150 .arg(QLatin1String(signature.left(paren))); |
151 |
151 |