diff options
| author | gregory guy <gregory-tde@laposte.net> | 2020-09-01 16:40:27 +0200 |
|---|---|---|
| committer | gregory guy <gregory-tde@laposte.net> | 2020-09-01 16:40:27 +0200 |
| commit | f8c20067ac98a79de7c4d0c118ceb37338263034 (patch) | |
| tree | 575ca577a686f7724b3681d3ad5635f91d4aeebd | |
| parent | c83d313b75a94b616158be8cbc57a7717f3ec0e1 (diff) | |
| download | tdepacman-f8c20067ac98a79de7c4d0c118ceb37338263034.tar.gz tdepacman-f8c20067ac98a79de7c4d0c118ceb37338263034.zip | |
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>
| -rw-r--r-- | kpacman/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kpacman/bitfont.cpp | 2 | ||||
| -rw-r--r-- | kpacman/board.cpp | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/kpacman/CMakeLists.txt b/kpacman/CMakeLists.txt index 985e259..c4dae7a 100644 --- a/kpacman/CMakeLists.txt +++ b/kpacman/CMakeLists.txt @@ -13,8 +13,6 @@ link_directories( ${TDEGAMES_LIBRARY_DIRS} ) -add_definitions( -fpermissive ) - ##### kpacman (executable) diff --git a/kpacman/bitfont.cpp b/kpacman/bitfont.cpp index 28a265e..f1535fb 100644 --- a/kpacman/bitfont.cpp +++ b/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, diff --git a/kpacman/board.cpp b/kpacman/board.cpp index 8a07310..621a086 100644 --- a/kpacman/board.cpp +++ b/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; } |