Changed: Different methods to process operations types
--HG-- branch : develop
This commit is contained in:
parent
79632a204d
commit
38285cd8dc
3 changed files with 7 additions and 12 deletions
|
@ -146,7 +146,7 @@ int main(int argc, char *argv[])
|
|||
|
||||
if (!dialog.exec()) return 1;
|
||||
|
||||
step = config.getNextStep();
|
||||
step = config.getInstallNextStep();
|
||||
}
|
||||
else if (step == ShowInstallWizard)
|
||||
{
|
||||
|
@ -154,7 +154,7 @@ int main(int argc, char *argv[])
|
|||
|
||||
if (!dialog.exec()) return 1;
|
||||
|
||||
step = config.getNextStep();
|
||||
step = config.getInstallNextStep();
|
||||
}
|
||||
|
||||
if (step != Done)
|
||||
|
@ -164,7 +164,7 @@ int main(int argc, char *argv[])
|
|||
|
||||
if (!dialog.exec()) return 1;
|
||||
|
||||
step = config.getNextStep();
|
||||
step = config.getInstallNextStep();
|
||||
}
|
||||
|
||||
CMainWindow mainWindow;
|
||||
|
|
|
@ -91,17 +91,14 @@ void COperationDialog::processNextStep()
|
|||
switch (m_operation)
|
||||
{
|
||||
case OperationMigrate:
|
||||
processMigrateNextStep();
|
||||
case OperationInstall:
|
||||
processInstallNextStep();
|
||||
break;
|
||||
|
||||
case OperationUpdateProfiles:
|
||||
processUpdateProfilesNextStep();
|
||||
break;
|
||||
|
||||
case OperationInstall:
|
||||
processInstallNextStep();
|
||||
break;
|
||||
|
||||
case OperationUninstall:
|
||||
processUninstallNextStep();
|
||||
break;
|
||||
|
@ -111,7 +108,7 @@ void COperationDialog::processNextStep()
|
|||
}
|
||||
}
|
||||
|
||||
void COperationDialog::processMigrateNextStep()
|
||||
void COperationDialog::processInstallNextStep()
|
||||
{
|
||||
CConfigFile *config = CConfigFile::getInstance();
|
||||
|
||||
|
@ -122,7 +119,7 @@ void COperationDialog::processMigrateNextStep()
|
|||
const CProfile &configuration = config->getProfile();
|
||||
|
||||
// long operations are done in a thread
|
||||
CConfigFile::InstallationStep step = config->getNextStep();
|
||||
OperationStep step = config->getInstallNextStep();
|
||||
|
||||
switch(step)
|
||||
{
|
||||
|
|
|
@ -83,8 +83,6 @@ protected:
|
|||
void closeEvent(QCloseEvent *e);
|
||||
|
||||
void processNextStep();
|
||||
void processMigrateNextStep();
|
||||
void processUpdateProfilesNextStep();
|
||||
void processInstallNextStep();
|
||||
void processUninstallNextStep();
|
||||
void processUpdateProfilesNextStep();
|
||||
|
|
Loading…
Reference in a new issue