Browse Source

Remove the -fpermissive definition.

invalid conversion from ‘const char*’ to ‘const uchar*’
With contribution from Slávek Banko.

Signed-off-by: gregory guy <gregory-tde@laposte.net>
pull/1/head
gregory guy 2 years ago
parent
commit
f8c20067ac
No known key found for this signature in database
GPG Key ID: 3BCCA0F7AB4536F4
  1. 2
      kpacman/CMakeLists.txt
  2. 2
      kpacman/bitfont.cpp
  3. 2
      kpacman/board.cpp

2
kpacman/CMakeLists.txt

@ -13,8 +13,6 @@ link_directories(
${TDEGAMES_LIBRARY_DIRS}
)
add_definitions( -fpermissive )
##### kpacman (executable)

2
kpacman/bitfont.cpp

@ -26,7 +26,7 @@ TQPixmap Bitfont::text(TQString str, TQColor fg, TQColor bg)
TQPixmap FG(str.length()*fontWidth, fontHeight);
TQBitmap MASK(str.length()*fontWidth, fontHeight, TRUE);
const uchar *s = str.latin1();
const uchar *s = reinterpret_cast<const unsigned char *>(str.latin1());
for (uint i = 0; i < str.length(); i++) {
if (font.width() == font.height())
bitBlt(&MASK, i*fontWidth, 0, &font,

2
kpacman/board.cpp

@ -93,7 +93,7 @@ void Board::init(Image image, TQString levelName)
break;
case Level : setup(demo_bits);
break;
case File : setup(map.latin1());
case File : setup(reinterpret_cast<const unsigned char *>(map.latin1()));
break;
default : break;
}

Loading…
Cancel
Save