summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-08-16 17:54:01 +0200
committerSlávek Banko <slavek.banko@axis.cz>2018-08-16 17:54:16 +0200
commitbd4b955ff6cf7f89e67f2d70138fab662f042e91 (patch)
treecbe39a817f10eac1a76232094965fb936a99dca8
parent086cc055d4addb53912c874023eae4f6db58b619 (diff)
downloadtdelibs-bd4b955ff6cf7f89e67f2d70138fab662f042e91.tar.gz
tdelibs-bd4b955ff6cf7f89e67f2d70138fab662f042e91.zip
Fix FTBFS with stricter C++11
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 958fa42aa9576a6da0c9ca5de4823cb04407a713)
-rw-r--r--tdeinit/tdeinit.cpp2
-rw-r--r--tdestyles/keramik/keramik.cpp10
2 files changed, 6 insertions, 6 deletions
diff --git a/tdeinit/tdeinit.cpp b/tdeinit/tdeinit.cpp
index 576f71923..566a8bda0 100644
--- a/tdeinit/tdeinit.cpp
+++ b/tdeinit/tdeinit.cpp
@@ -1514,7 +1514,7 @@ static void tdeinit_library_path()
TQCString display = getenv(DISPLAY);
if (display.isEmpty())
{
- fprintf(stderr, "[tdeinit] Aborting. $"DISPLAY" is not set.\n");
+ fprintf(stderr, "[tdeinit] Aborting. $" DISPLAY " is not set.\n");
exit(255);
}
int i;
diff --git a/tdestyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp
index ca8dea403..1f93a5344 100644
--- a/tdestyles/keramik/keramik.cpp
+++ b/tdestyles/keramik/keramik.cpp
@@ -2833,11 +2833,11 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
//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(tqt_xdisplay(), listbox->handle(), ShapeBounding, 0, 0,