202 if (!container) |
202 if (!container) |
203 return; |
203 return; |
204 |
204 |
205 if (!dlgProperties) { |
205 if (!dlgProperties) { |
206 dlgProperties = new ChangeProperties(this); |
206 dlgProperties = new ChangeProperties(this); |
207 connect(container, SIGNAL(propertyChanged(const QString&)), dlgProperties, SLOT(updateProperties())); |
207 connect(container, SIGNAL(propertyChanged(QString)), dlgProperties, SLOT(updateProperties())); |
208 } |
208 } |
209 dlgProperties->setControl(container); |
209 dlgProperties->setControl(container); |
210 dlgProperties->show(); |
210 dlgProperties->show(); |
211 } |
211 } |
212 |
212 |
334 scripts->addObject(ax); |
334 scripts->addObject(ax); |
335 } |
335 } |
336 |
336 |
337 QAxScript *script = scripts->load(file, file); |
337 QAxScript *script = scripts->load(file, file); |
338 if (script) { |
338 if (script) { |
339 connect(script, SIGNAL(error(int, const QString&, int, const QString&)), |
339 connect(script, SIGNAL(error(int,QString,int,QString)), |
340 this, SLOT(logMacro(int, const QString&, int, const QString&))); |
340 this, SLOT(logMacro(int,QString,int,QString))); |
341 actionScriptingRun->setEnabled(true); |
341 actionScriptingRun->setEnabled(true); |
342 } |
342 } |
343 #else |
343 #else |
344 QMessageBox::information(this, tr("Function not available"), |
344 QMessageBox::information(this, tr("Function not available"), |
345 tr("QAxScript functionality is not available with this compiler.")); |
345 tr("QAxScript functionality is not available with this compiler.")); |
372 while (it != list.end()) { |
372 while (it != list.end()) { |
373 QWidget *container = *it; |
373 QWidget *container = *it; |
374 |
374 |
375 QAxWidget *ax = qobject_cast<QAxWidget*>(container); |
375 QAxWidget *ax = qobject_cast<QAxWidget*>(container); |
376 if (ax) { |
376 if (ax) { |
377 container->disconnect(SIGNAL(signal(const QString&, int, void*))); |
377 container->disconnect(SIGNAL(signal(QString,int,void*))); |
378 if (actionLogSignals->isChecked()) |
378 if (actionLogSignals->isChecked()) |
379 connect(container, SIGNAL(signal(const QString&, int, void*)), this, SLOT(logSignal(const QString&, int, void*))); |
379 connect(container, SIGNAL(signal(QString,int,void*)), this, SLOT(logSignal(QString,int,void*))); |
380 |
380 |
381 container->disconnect(SIGNAL(exception(int,const QString&,const QString&,const QString&))); |
381 container->disconnect(SIGNAL(exception(int,QString,QString,QString))); |
382 connect(container, SIGNAL(exception(int,const QString&,const QString&,const QString&)), |
382 connect(container, SIGNAL(exception(int,QString,QString,QString)), |
383 this, SLOT(logException(int,const QString&,const QString&,const QString&))); |
383 this, SLOT(logException(int,QString,QString,QString))); |
384 |
384 |
385 container->disconnect(SIGNAL(propertyChanged(const QString&))); |
385 container->disconnect(SIGNAL(propertyChanged(QString))); |
386 if (actionLogProperties->isChecked()) |
386 if (actionLogProperties->isChecked()) |
387 connect(container, SIGNAL(propertyChanged(const QString&)), this, SLOT(logPropertyChanged(const QString&))); |
387 connect(container, SIGNAL(propertyChanged(QString)), this, SLOT(logPropertyChanged(QString))); |
388 container->blockSignals(actionFreezeEvents->isChecked()); |
388 container->blockSignals(actionFreezeEvents->isChecked()); |
389 } |
389 } |
390 |
390 |
391 ++it; |
391 ++it; |
392 } |
392 } |