nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-16 01:19:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

QT5 -- 1 of 3

Browse Source 
Porting the codebase to QT 5 (5.2) to get the
latest bug fixes, performance and improved platform
support.

This first part is to fixup the codebase to compile
on Qt 5, but some aspects have been broken (video).

The second part is to migrate from Qwt 6.0.1 to the
latest Qwt for multiaxis support.

The third part will be to fixup any platform specific
issues or issues identified at runtime.
This commit is contained in:
Mark Liversedge
2013-12-09 09:57:13 +00:00
parent 2d9e71b500
commit aa8605e8d5
186 changed files with 552 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/SrmDevice.cpp
View File

@@ -124,14 +124,14 @@ SrmDevice::open( QString &err )
// serial port device anyway.
#ifdef SRMIO_HAVE_WINCOM
io = srmio_iow32_new( dev->name().toAscii().constData(), &serr );
io = srmio_iow32_new( dev->name().toLatin1().constData(), &serr );
if( ! io ){
err = tr("failed to allocate device handle: %1")
.arg(serr.message);
return false;
}
#elif defined(SRMIO_HAVE_TERMIOS)
io = srmio_ios_new( dev->name().toAscii().constData(), &serr );
io = srmio_ios_new( dev->name().toLatin1().constData(), &serr );
if( ! io ){
err = tr("failed to allocate device handle: %1")
.arg(serr.message);
@@ -146,7 +146,7 @@ SrmDevice::open( QString &err )
} else if( dev->type() == "D2XX" ){
#ifdef SRMIO_HAVE_D2XX
io = srmio_d2xx_description_new(
dev->name().toAscii().constData(), &serr );
dev->name().toLatin1().constData(), &serr );
if( ! io ){
err = tr("failed to allocate device handle: %1")
.arg(serr.message);
@@ -560,7 +560,7 @@ SrmDevice::download( const QDir &tmpdir,
}
file.startTime.setTime_t( 0.1 * stime );
fh = fopen( file.name.toAscii().constData(), "wb" );
fh = fopen( file.name.toLatin1().constData(), "wb" );
if( ! fh ){
srmio_data_free(fixed);
err = tr( "failed to open file %1: %2")