From 1bd8340f14e1ed6ece1b8b573126bc43ae63144f Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 3 Dec 2017 18:07:12 +0100 Subject: [PATCH] cc_item_picture.h: remove virtual declaration from setPicture() Is not really required. Avoids possible compile/linker errors like "...no reference..." for some coming changes. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/e9883cbd2de134dd0c2d11bbf489a860f8d7219b Author: Thilo Graf Date: 2017-12-03 (Sun, 03 Dec 2017) ------------------ This commit was generated by Migit --- src/gui/components/cc_item_picture.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/components/cc_item_picture.h b/src/gui/components/cc_item_picture.h index fe42604e7..c96c4e221 100644 --- a/src/gui/components/cc_item_picture.h +++ b/src/gui/components/cc_item_picture.h @@ -141,9 +141,9 @@ class CComponentsPicture : public CComponentsItem } ///sets an image name (unscaled icons only), full image path or url to an image file - virtual void setPicture(const std::string& picture_name); + void setPicture(const std::string& picture_name); ///sets an image name (unscaled icons only), full image path or url to an image file - virtual void setPicture(const char* picture_name); + void setPicture(const char* picture_name); ///returns current assigned image name std::string getPictureName(){return pic_name;}