diff -ur QtDMM-0.8.12.orig/src/dmm.cpp QtDMM-0.8.12/src/dmm.cpp --- QtDMM-0.8.12.orig/src/dmm.cpp 2007-12-25 14:26:19.000000000 +0300 +++ QtDMM-0.8.12/src/dmm.cpp 2009-06-10 23:12:09.000000000 +0400 @@ -418,7 +418,7 @@ { val += re->string()[i]; } - if (re->string()[4]&0x0f != 0x0a) + if ((re->string()[4] & 0x0f) != 0x0a) { val += re->string()[4]; } @@ -721,10 +721,10 @@ m_error = tr( "Connected" ) + " (" + m_name + " @ " + m_device + ")"; } -char *DMM::RS22812Digit( int byte ) +const char *DMM::RS22812Digit( int byte ) { - int digit[10] = { 0xd7, 0x50, 0xb5, 0xf1, 0x72, 0xe3, 0xe7, 0x51, 0xf7, 0xf3 }; - char *c_digit[10] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" }; + int digit[10] = { 0xd7, 0x50, 0xb5, 0xf1, 0x72, 0xe3, 0xe7, 0x51, 0xf7, 0xf3 }; + const char *c_digit[10] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" }; byte &= 0x0f7; @@ -1545,10 +1545,10 @@ m_error = tr( "Connected" ) + " (" + m_name + " @ " + m_device + ")"; } -char *DMM::vc820Digit( int byte ) +const char *DMM::vc820Digit( int byte ) { - int digit[10] = { 0x7d, 0x05, 0x5b, 0x1f, 0x27, 0x3e, 0x7e, 0x15, 0x7f, 0x3f }; - char *c_digit[10] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" }; + int digit[10] = { 0x7d, 0x05, 0x5b, 0x1f, 0x27, 0x3e, 0x7e, 0x15, 0x7f, 0x3f }; + const char *c_digit[10] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" }; byte &= 0x7f; diff -ur QtDMM-0.8.12.orig/src/dmm.h QtDMM-0.8.12/src/dmm.h --- QtDMM-0.8.12.orig/src/dmm.h 2007-12-25 14:26:43.000000000 +0300 +++ QtDMM-0.8.12/src/dmm.h 2009-06-10 23:10:59.000000000 +0400 @@ -82,8 +82,8 @@ void readVC940Continuous( ReadEvent * ); void readQM1537Continuous( ReadEvent * ); void readRS22812Continuous( ReadEvent * ); - char *vc820Digit( int ); - char *RS22812Digit( int ); + const char *vc820Digit( int ); + const char *RS22812Digit( int ); }; diff -ur QtDMM-0.8.12.orig/src/dmmprefs.h QtDMM-0.8.12/src/dmmprefs.h --- QtDMM-0.8.12.orig/src/dmmprefs.h 2007-11-24 23:52:07.000000000 +0300 +++ QtDMM-0.8.12/src/dmmprefs.h 2009-06-10 23:13:34.000000000 +0400 @@ -26,7 +26,7 @@ struct DMMInfo { - char *name; + const char *name; int baud; int protocol; int bits;