chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 03:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup: Invoking QProcess::startDetached as a static method

Browse Source
This commit is contained in:
Mark Watkins 2011-11-08 19:19:44 +10:00
parent ac9530027e
commit 75d12223b4
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
preferencesdialog.cpp
View File

@ -276,33 +276,23 @@ void PreferencesDialog::Save()
if (needs_restart) {
if (QMessageBox::question(this,"Restart Required","One or more of the changes you have made will require this application to be restarted, in order for these changes to come into effect.\nWould you like do this now?",QMessageBox::Yes,QMessageBox::No)==QMessageBox::Yes) {
QProcess proc;
QStringList args;
QString apppath;
#ifdef Q_OS_MAC
// In Mac OS the full path of aplication binary is:
// <base-path>/myApp.app/Contents/MacOS/myApp
//apppath=QApplication::instance()->applicationDirPath()+"/../../../SleepyHead.app";
apppath=QApplication::instance()->applicationDirPath().section("/",0,-3);
if (proc.startDetached("open",QStringList() << apppath)) {
if (QProcess::startDetached("open",QStringList() << apppath)) {
QApplication::instance()->exit();
} else {
if (QDesktopServices::openUrl(apppath)) {
QApplication::instance()->exit();
} else QMessageBox::warning(this,"Gah!","If you can read this, two seperate application restart commands didn't work. Mark want's to know the following string:"+apppath,QMessageBox::Ok);
}
/*qDebug() << "Hi Jimbo! :)";
qDebug() << "applicationFilePath:" << QApplication::instance()->applicationFilePath();
qDebug() << "applicationDirPath:" << QApplication::instance()->applicationDirPath();
qDebug() << "Chopped String:" << apppath;
qDebug() << "That last one should end in SleepyHead.app"; */
//qDebug() << "Would restart on mac if this was correct" << args;
//qDebug() << "repeating applicationDirPath for clarity: " << QApplication::instance()->applicationDirPath();
#else
apppath=QApplication::instance()->applicationFilePath();
if (QDesktopServices::openUrl(apppath)) {
//if (proc.startDetached(QApplication::instance()->applicationFilePath(),args)) {
//if (QProcess::startDetached(QApplication::instance()->applicationFilePath(),args)) {
QApplication::instance()->exit();
}
#endif