fix size long options

jef · jef · commit a99fb37b4070 · 2009-07-24T13:54:32.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@11173 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -296,8 +296,8 @@ int main( int argc, char *argv[] )
         /* These options don't set a flag.
          *  We distinguish them by their indices. */
         {"snapshot", required_argument, 0, 's'},
-        {"width", required_argument, 0, 'w'},
-        {"height", required_argument, 0, 'h'},
+        {"width",    required_argument, 0, 'w'},
+        {"height",   required_argument, 0, 'h'},
         {"lang",     required_argument, 0, 'l'},
         {"project",  required_argument, 0, 'p'},
         {"extent",   required_argument, 0, 'e'},
@@ -398,11 +398,11 @@ int main( int argc, char *argv[] )
     {
       mySnapshotFileName = QDir::convertSeparators( QFileInfo( QFile::decodeName( argv[++i] ) ).absoluteFilePath() );
     }
-    else if ( i + 1 < argc && ( arg == "-width" || arg == "-w" ) )
+    else if ( i + 1 < argc && ( arg == "--width" || arg == "-w" ) )
     {
       mySnapshotWidth = QString( argv[++i] ).toInt();
     }
-    else if ( i + 1 < argc && ( arg == "-height" || arg == "-h" ) )
+    else if ( i + 1 < argc && ( arg == "--height" || arg == "-h" ) )
     {
       mySnapshotHeight = QString( argv[++i] ).toInt();
     }

Original file line number	Diff line number	Diff line change
`@@ -296,8 +296,8 @@ int main( int argc, char *argv[] )`
`296`	`296`	`/* These options don't set a flag.`
`297`	`297`	`* We distinguish them by their indices. */`
`298`	`298`	`{"snapshot", required_argument, 0, 's'},`
`299`		`- {"width", required_argument, 0, 'w'},`
`300`		`- {"height", required_argument, 0, 'h'},`
	`299`	`+ {"width", required_argument, 0, 'w'},`
	`300`	`+ {"height", required_argument, 0, 'h'},`
`301`	`301`	`{"lang", required_argument, 0, 'l'},`
`302`	`302`	`{"project", required_argument, 0, 'p'},`
`303`	`303`	`{"extent", required_argument, 0, 'e'},`
`@@ -398,11 +398,11 @@ int main( int argc, char *argv[] )`
`398`	`398`	`{`
`399`	`399`	`mySnapshotFileName = QDir::convertSeparators( QFileInfo( QFile::decodeName( argv[++i] ) ).absoluteFilePath() );`
`400`	`400`	`}`
`401`		`- else if ( i + 1 < argc && ( arg == "-width" \|\| arg == "-w" ) )`
	`401`	`+ else if ( i + 1 < argc && ( arg == "--width" \|\| arg == "-w" ) )`
`402`	`402`	`{`
`403`	`403`	`mySnapshotWidth = QString( argv[++i] ).toInt();`
`404`	`404`	`}`
`405`		`- else if ( i + 1 < argc && ( arg == "-height" \|\| arg == "-h" ) )`
	`405`	`+ else if ( i + 1 < argc && ( arg == "--height" \|\| arg == "-h" ) )`
`406`	`406`	`{`
`407`	`407`	`mySnapshotHeight = QString( argv[++i] ).toInt();`
`408`	`408`	`}`