From 984129709978702dda1382e45b1432f626436bce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 16 Aug 2018 17:54:01 +0200 Subject: [PATCH] Fix FTBFS with stricter C++11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 958fa42aa9576a6da0c9ca5de4823cb04407a713) --- kinit/kinit.cpp | 2 +- kstyles/keramik/keramik.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp index dbe527b19..dfb7eeb6b 100644 --- a/kinit/kinit.cpp +++ b/kinit/kinit.cpp @@ -1514,7 +1514,7 @@ static void kdeinit_library_path() TQCString display = getenv(DISPLAY); if (display.isEmpty()) { - fprintf(stderr, "[kinit] Aborting. $"DISPLAY" is not set.\n"); + fprintf(stderr, "[kinit] Aborting. $" DISPLAY " is not set.\n"); exit(255); } int i; diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp index 25f2d745a..9bd977266 100644 --- a/kstyles/keramik/keramik.cpp +++ b/kstyles/keramik/keramik.cpp @@ -2799,11 +2799,11 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event ) //CHECKME: Not sure the rects are perfect.. XRectangle rects[5] = { - {0, 0, resize->size().width()-2, resize->size().height()-6}, - {0, resize->size().height()-6, resize->size().width()-2, 1}, - {1, resize->size().height()-5, resize->size().width()-3, 1}, - {2, resize->size().height()-4, resize->size().width()-5, 1}, - {3, resize->size().height()-3, resize->size().width()-7, 1} + {0, 0, (unsigned short)(resize->size().width()-2), (unsigned short)(resize->size().height()-6)}, + {0, (short)(resize->size().height()-6), (unsigned short)(resize->size().width()-2), 1}, + {1, (short)(resize->size().height()-5), (unsigned short)(resize->size().width()-3), 1}, + {2, (short)(resize->size().height()-4), (unsigned short)(resize->size().width()-5), 1}, + {3, (short)(resize->size().height()-3), (unsigned short)(resize->size().width()-7), 1} }; XShapeCombineRectangles(qt_xdisplay(), listbox->handle(), ShapeBounding, 0, 0,