From 180eacc2af8a69b8ee947750ae7708b78c499f7d Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 28 Jan 2016 18:17:01 +0100 Subject: Revert files that shouldn't have been changed in this branch... --- plugingui/font.cc | 4 ++-- plugingui/widget.cc | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'plugingui') diff --git a/plugingui/font.cc b/plugingui/font.cc index d02efe7..bcaa027 100644 --- a/plugingui/font.cc +++ b/plugingui/font.cc @@ -88,9 +88,9 @@ size_t Font::textHeight(const std::string& text) const return img_font.height(); } -void Font::setLetterSpacing(int letter_spacing) +void Font::setLetterSpacing(int letterSpacing) { - spacing = letter_spacing; + spacing = letterSpacing; } int Font::letterSpacing() const diff --git a/plugingui/widget.cc b/plugingui/widget.cc index 5c8ff46..4b92e65 100644 --- a/plugingui/widget.cc +++ b/plugingui/widget.cc @@ -136,7 +136,6 @@ size_t Widget::height() size_t Widget::windowX() { size_t window_x = x(); - if(parent) { window_x += parent->windowX(); -- cgit v1.2.3