Set the default format as INI when using custom settings path

NathanW2 · NathanW2 · commit a2d857fd9348 · 2012-06-25T19:02:02.000+10:00
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -315,6 +315,7 @@ int main( int argc, char *argv[] )
     }
     else if ( i + 1 < argc && ( arg == "--optionspath" || arg == "-o" ) )
     {
+      QSettings::setDefaultFormat( QSettings::IniFormat );
       QSettings::setPath( QSettings::IniFormat, QSettings::UserScope, argv[++i] );
     }
     else if ( i + 1 < argc && ( arg == "--configpath" || arg == "-c" ) )
@@ -417,6 +418,7 @@ int main( int argc, char *argv[] )
           break;
 
         case 'o':
+          QSettings::setDefaultFormat( QSettings::IniFormat );
           QSettings::setPath( QSettings::IniFormat, QSettings::UserScope, optarg );
           break;
 
@@ -479,6 +481,7 @@ int main( int argc, char *argv[] )
   if ( !configpath.isEmpty() )
   {
     // tell QSettings to use INI format and save the file in custom config path
+    QSettings::setDefaultFormat( QSettings::IniFormat );
     QSettings::setPath( QSettings::IniFormat, QSettings::UserScope, configpath );
   }
 

Original file line number	Diff line number	Diff line change
`@@ -315,6 +315,7 @@ int main( int argc, char *argv[] )`
`315`	`315`	`}`
`316`	`316`	`else if ( i + 1 < argc && ( arg == "--optionspath" \|\| arg == "-o" ) )`
`317`	`317`	`{`
	`318`	`+ QSettings::setDefaultFormat( QSettings::IniFormat );`
`318`	`319`	`QSettings::setPath( QSettings::IniFormat, QSettings::UserScope, argv[++i] );`
`319`	`320`	`}`
`320`	`321`	`else if ( i + 1 < argc && ( arg == "--configpath" \|\| arg == "-c" ) )`
`@@ -417,6 +418,7 @@ int main( int argc, char *argv[] )`
`417`	`418`	`break;`
`418`	`419`
`419`	`420`	`case 'o':`
	`421`	`+ QSettings::setDefaultFormat( QSettings::IniFormat );`
`420`	`422`	`QSettings::setPath( QSettings::IniFormat, QSettings::UserScope, optarg );`
`421`	`423`	`break;`
`422`	`424`
`@@ -479,6 +481,7 @@ int main( int argc, char *argv[] )`
`479`	`481`	`if ( !configpath.isEmpty() )`
`480`	`482`	`{`
`481`	`483`	`// tell QSettings to use INI format and save the file in custom config path`
	`484`	`+ QSettings::setDefaultFormat( QSettings::IniFormat );`
`482`	`485`	`QSettings::setPath( QSettings::IniFormat, QSettings::UserScope, configpath );`
`483`	`486`	`}`
`484`	`487`