Merge lp:~mvo/qtcreator-plugin-ubuntu/dialog-parents into lp:qtcreator-plugin-ubuntu

[Michael Vogt]

Added missing dialog/message box parents.

This branch adds a bunch of missing dialog/message box parents. See bug #1346783 for the rational.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:212
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/357/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/125

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/357/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

=== modified file 'src/ubuntu/ubuntuclickdialog.cpp'
--- src/ubuntu/ubuntuclickdialog.cpp	2014-06-16 15:40:12 +0000
+++ src/ubuntu/ubuntuclickdialog.cpp	2014-07-22 07:44:31 +0000
@@ -83,7 +83,7 @@
 
 int UbuntuClickDialog::runClickModal(ProjectExplorer::ProcessParameters *params)
 {
-    UbuntuClickDialog dlg;
+    UbuntuClickDialog dlg(Core::ICore::mainWindow());
     dlg.setParameters(params);
     QMetaObject::invokeMethod(&dlg,"runClick",Qt::QueuedConnection);
     dlg.exec();

=== modified file 'src/ubuntu/ubuntudevicesmodel.cpp'
--- src/ubuntu/ubuntudevicesmodel.cpp	2014-06-11 04:47:28 +0000
+++ src/ubuntu/ubuntudevicesmodel.cpp	2014-07-22 07:44:31 +0000
@@ -811,7 +811,7 @@
         ProjectExplorer::DeviceManager::instance()->removeDevice(m_knownDevices[index]->device()->id());
     else {
         emit logMessage(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_ONERROR).arg(QLatin1String(proc.readAll())));
-        QMessageBox::critical(0,tr("Could not delete emulator"),tr("The emulator %1 could not be deleted because of a error, check the logs for details").arg(name));
+        QMessageBox::critical(Core::ICore::mainWindow(),tr("Could not delete emulator"),tr("The emulator %1 could not be deleted because of a error, check the logs for details").arg(name));
     }
 
 }

=== modified file 'src/ubuntu/ubuntukitmanager.cpp'
--- src/ubuntu/ubuntukitmanager.cpp	2014-06-16 15:40:12 +0000
+++ src/ubuntu/ubuntukitmanager.cpp	2014-07-22 07:44:31 +0000
@@ -68,7 +68,7 @@
 {
     ProjectExplorer::Abi requiredAbi = ClickToolChain::architectureNameToAbi(device->architecture());
     if(requiredAbi.isNull()) {
-        QMessageBox::warning(0,
+        QMessageBox::warning(Core::ICore::mainWindow(),
                              tr("Unknown device architecture"),
                              tr("Kit autocreation for %1 is not supported!")
                              .arg(device->architecture()));
@@ -102,7 +102,7 @@
     ClickToolChain* match = findCompatibleTc();
     while(!match) {
         //create target
-        int choice = QMessageBox::question(0,
+        int choice = QMessageBox::question(Core::ICore::mainWindow(),
                               tr("No target available"),
                               tr("There is no compatible chroot available on your system, do you want to create it now?"));
 

=== modified file 'src/ubuntu/ubuntumenu.cpp'
--- src/ubuntu/ubuntumenu.cpp	2014-06-02 10:20:05 +0000
+++ src/ubuntu/ubuntumenu.cpp	2014-07-22 07:44:31 +0000
@@ -624,7 +624,7 @@
                         UbuntuDevice::ConstPtr device = UbuntuDeviceMode::instance()->device();
                         if (device) {
                             if( device->deviceState() != ProjectExplorer::IDevice::DeviceReadyToUse ) {
-                                QMessageBox::warning(0,tr("Device not ready"),tr("The currently selected device is not ready, please select another one on the devices mode"));
+                                QMessageBox::warning(Core::ICore::mainWindow(),tr("Device not ready"),tr("The currently selected device is not ready, please select another one on the devices mode"));
                                 return;
                             }