# HG changeset patch # User Santeri Piippo # Date 1373411843 -10800 # Node ID 91bea18bd77a169215da56366ac6055bda8824d6 # Parent 95f0ffd128fff4c461df2386f1fb52780cd7f454 Fixed compilation under windows/qt5 diff -r 95f0ffd128ff -r 91bea18bd77a src/configDialog.cpp --- a/src/configDialog.cpp Wed Jul 10 01:53:33 2013 +0300 +++ b/src/configDialog.cpp Wed Jul 10 02:17:23 2013 +0300 @@ -645,7 +645,10 @@ for( const extProgInfo & info : g_extProgInfo ) { *info.path = info.input->text(); + +#ifndef _WIN32 *info.wine = info.wineBox->isChecked(); +#endif // _WIN32 } // Save the config diff -r 95f0ffd128ff -r 91bea18bd77a src/file.cpp --- a/src/file.cpp Wed Jul 10 01:53:33 2013 +0300 +++ b/src/file.cpp Wed Jul 10 02:17:23 2013 +0300 @@ -626,10 +626,10 @@ return new LDEmpty; } - if( tokens[0].length() != 1 ) - return new LDGibberish (line, "Illogical line code"); + if( tokens[0].length() != 1 || tokens[0][0].isDigit() == false ) + return new LDGibberish( line, "Illogical line code" ); - int num = tokens[0][0].toAscii() - '0'; + int num = tokens[0][0].digitValue(); switch( num ) { case 0: diff -r 95f0ffd128ff -r 91bea18bd77a src/main.cpp --- a/src/main.cpp Wed Jul 10 01:53:33 2013 +0300 +++ b/src/main.cpp Wed Jul 10 02:17:23 2013 +0300 @@ -52,8 +52,8 @@ doPrint (g_file_stdout, args); elif (fp == stderr) doPrint (g_file_stderr, args); - - fatal ("unknown FILE* argument"); + else + fatal ("unknown FILE* argument"); } // ============================================================================= diff -r 95f0ffd128ff -r 91bea18bd77a src/misc.cpp --- a/src/misc.cpp Wed Jul 10 01:53:33 2013 +0300 +++ b/src/misc.cpp Wed Jul 10 02:17:23 2013 +0300 @@ -294,7 +294,7 @@ char* bufptr = &buf[0]; for( qchar& c : val ) - *bufptr++ = c.toAscii(); + *bufptr++ = c.toLatin1(); *bufptr = '\0'; double fval = atof( buf );