From 6032a0785c65fc6dd2e64b6b655d339514e6de8d Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Tue, 14 Jun 2016 19:53:44 +0200
Subject: [PATCH] Changed: Different methods to process operations types

---
 code/ryzom/tools/client/ryzom_installer/src/main.cpp  |  6 +++---
 .../client/ryzom_installer/src/operationdialog.cpp    | 11 ++++-------
 .../client/ryzom_installer/src/operationdialog.h      |  2 --
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/code/ryzom/tools/client/ryzom_installer/src/main.cpp b/code/ryzom/tools/client/ryzom_installer/src/main.cpp
index 4d91fa088..97ba78ce9 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/main.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/main.cpp
@@ -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;
diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
index ccd59b2a6..61ada6074 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
@@ -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)
 	{
diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h
index fdee8b404..8e41c5034 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h
+++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h
@@ -83,8 +83,6 @@ protected:
 	void closeEvent(QCloseEvent *e);
 
 	void processNextStep();
-	void processMigrateNextStep();
-	void processUpdateProfilesNextStep();
 	void processInstallNextStep();
 	void processUninstallNextStep();
 	void processUpdateProfilesNextStep();