From f8c20067ac98a79de7c4d0c118ceb37338263034 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Tue, 1 Sep 2020 16:40:27 +0200 Subject: [PATCH] =?UTF-8?q?Remove=20the=20-fpermissive=20definition.=20inv?= =?UTF-8?q?alid=20conversion=20from=20=E2=80=98const=20char*=E2=80=99=20to?= =?UTF-8?q?=20=E2=80=98const=20uchar*=E2=80=99=20With=20contribution=20fro?= =?UTF-8?q?m=20Sl=C3=A1vek=20Banko.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gregory guy --- kpacman/CMakeLists.txt | 2 -- kpacman/bitfont.cpp | 2 +- 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(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(map.latin1())); break; default : break; }