Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2

[enigma2.git] / lib / gui / esubtitle.h

diff --git a/lib/gui/esubtitle.h b/lib/gui/esubtitle.h
index b81faf799b55e7fbacfea753dbc7e26f1f26809d..1635e6de3ef6831148cd377aa11347e84919fa87 100644 (file)
--- a/lib/gui/esubtitle.h
+++ b/lib/gui/esubtitle.h
@@ -53,12 +53,12 @@ private:
        int m_pango_page_ok;
        ePangoSubtitlePage m_pango_page;
 
-       eTimer m_hide_subtitles_timer;
+       ePtr<eTimer> m_hide_subtitles_timer;
 
        gRegion m_visible_region;
 
        ePtr<gPixmap> m_pixmap;  // pixmap to paint on next evtPaint
-       std::string eSubtitleWidget::replace_all(const std::string &in, const std::string &entity, const std::string &symbol);
+       std::string replace_all(const std::string &in, const std::string &entity, const std::string &symbol);
 };
 
 #endif