ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/s10k/Vago/wizardfactory.h
(Generate patch)

Comparing s10k/Vago/wizardfactory.h (file contents):
Revision 1092 by s10k, Sat Dec 30 13:43:28 2017 UTC vs.
Revision 1093 by s10k, Sat Dec 30 13:57:32 2017 UTC

# Line 8 | Line 8 | template<typename T>
8   class WizardFactory : public T
9   {
10   public:
11 <    static void startInstance(const QString &appDir, const QString &workspaceWizardLocation, QSettings *vagoSettings, Logger *myLogger){
12 <        (new WizardFactory<T>(appDir, workspaceWizardLocation, vagoSettings, myLogger))->exec();
11 >    static void startInstance(const QString &appDir, const QString &workspaceWizardLocation, QSettings *vagoSettings){
12 >        (new WizardFactory<T>(appDir, workspaceWizardLocation, vagoSettings))->exec();
13      }
14   private:
15      // We need to have a constructor to be able to acess "exec" protected function
# Line 17 | Line 17 | private:
17      (
18              const QString &appDir,
19              const QString &workspaceWizardLocation,
20 <            QSettings *vagoSettings,
21 <            Logger *myLogger
22 <    ):T(appDir, workspaceWizardLocation, vagoSettings, myLogger){}
20 >            QSettings *vagoSettings
21 >    ):T(appDir, workspaceWizardLocation, vagoSettings){}
22   };
23  
24   // Specialization for SoundWizard (it receives extra variables)
# Line 27 | Line 26 | template<>
26   class WizardFactory<SoundWizard> : public SoundWizard
27   {
28   public:
29 <    static void startInstance(const QString &appDir, const QString &workspaceWizardLocation, QSettings *vagoSettings, Logger *myLogger, QHash<QString, QString> *commandMap){
30 <        (new WizardFactory(appDir, workspaceWizardLocation, vagoSettings, myLogger, commandMap))->exec();
29 >    static void startInstance(const QString &appDir, const QString &workspaceWizardLocation, QSettings *vagoSettings, QHash<QString, QString> *commandMap){
30 >        (new WizardFactory(appDir, workspaceWizardLocation, vagoSettings, commandMap))->exec();
31      }
32   private:
33      WizardFactory
# Line 36 | Line 35 | private:
35              const QString &appDir,
36              const QString &workspaceWizardLocation,
37              QSettings *vagoSettings,
39            Logger *myLogger,
38              QHash<QString, QString> *commandMap
39 <    ):SoundWizard(appDir, workspaceWizardLocation, vagoSettings, myLogger, commandMap){}
39 >    ):SoundWizard(appDir, workspaceWizardLocation, vagoSettings, commandMap){}
40   };
41  
42  

Diff Legend

Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)