move replace_all function to base/string.h

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

diff --git a/lib/gui/esubtitle.cpp b/lib/gui/esubtitle.cpp
index f859c170ac27710275ad885c5ef0a803272dba1b..ca5c20d789fee53540f9b50683ded51bb6cdd591 100644 (file)
--- a/lib/gui/esubtitle.cpp
+++ b/lib/gui/esubtitle.cpp
@@ -11,12 +11,13 @@
        */      
 
 eSubtitleWidget::eSubtitleWidget(eWidget *parent)
-       : eWidget(parent), m_hide_subtitles_timer(eApp)
+       : eWidget(parent), m_hide_subtitles_timer(eTimer::create(eApp))
 {
        setBackgroundColor(gRGB(0,0,0,255));
        m_page_ok = 0;
        m_dvb_page_ok = 0;
-       CONNECT(m_hide_subtitles_timer.timeout, eSubtitleWidget::clearPage);
+       m_pango_page_ok = 0;
+       CONNECT(m_hide_subtitles_timer->timeout, eSubtitleWidget::clearPage);
 }
 
 #define startX 50
@@ -46,7 +47,7 @@ void eSubtitleWidget::setPage(const eDVBTeletextSubtitlePage &p)
                        m_visible_region.rects.push_back(area);
                }
        }
-       m_hide_subtitles_timer.start(7500, true);
+       m_hide_subtitles_timer->start(7500, true);
        invalidate(m_visible_region);  // invalidate new regions
 }
 
@@ -62,7 +63,7 @@ void eSubtitleWidget::setPage(const eDVBSubtitlePage &p)
                m_visible_region.rects.push_back(eRect(it->m_position, it->m_pixmap->size()));
        }
        m_dvb_page_ok = 1;
-       m_hide_subtitles_timer.start(7500, true);
+       m_hide_subtitles_timer->start(7500, true);
        invalidate(m_visible_region);  // invalidate new regions
 }
 
@@ -93,7 +94,7 @@ void eSubtitleWidget::setPage(const ePangoSubtitlePage &p)
                }
        }
        int timeout_ms = m_pango_page.m_timeout;
-       m_hide_subtitles_timer.start(timeout_ms, true);
+       m_hide_subtitles_timer->start(timeout_ms, true);
        invalidate(m_visible_region);  // invalidate new regions
 }
 
@@ -113,15 +114,6 @@ void eSubtitleWidget::setPixmap(ePtr<gPixmap> &pixmap, gRegion changed)
        invalidate(changed);
 }
 
-std::string eSubtitleWidget::replace_all(const std::string &in, const std::string &entity, const std::string &symbol)
-{
-       std::string out = in;
-       std::string::size_type loc = 0;
-       while (( loc = out.find(entity, loc)) != std::string::npos )
-       out.replace(loc, entity.length(), symbol);
-       return out;
-}
-
 int eSubtitleWidget::event(int event, void *data, void *data2)
 {
        switch (event)