From 71b7f4740f2f6384bdbc642c942cf756972896f8 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 12 Oct 2024 10:47:16 +0200 Subject: [PATCH] cleanup EPG replacements --- src/gui/channellist.cpp | 4 ---- src/gui/epgplus.cpp | 2 +- src/gui/epgview.cpp | 3 --- src/gui/eventlist.cpp | 3 --- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 9bb21b348..98592a02d 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1713,7 +1713,6 @@ void CChannelList::paintDetails(int index) } if (!(text2.empty())) { - text2 = str_replace("\\n", " ", text2); while ( text2.find_first_of("[ -.+*#?=!$%&/]+") == 0 ) text2 = text2.substr( 1 ); text2 = text2.substr( 0, text2.find('\n') ); @@ -2742,9 +2741,6 @@ void CChannelList::processTextToArray(std::string text, int screening) // UTF-8 std::string aktWord = ""; int aktWidth = 0; - if(!text.empty()) - text = str_replace("\\n", "\n", text); - text += ' '; const char *text_= text.c_str(); diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index 03da8f9b3..9908e678b 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -391,7 +391,7 @@ void EpgPlus::ChannelEventEntry::paint(bool pisSelected, bool toggleColor) if(!shortepg.empty()) { shortepg = str_replace("\n", " ", shortepg); - shortepg = str_replace("\\n", " ", shortepg); + shortepg = str_replace("\t", " ", shortepg); } this->footer->paintEventDetails(this->channelEvent.description, ret ? shortepg : ""); diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index c57ae89c9..d1c3d5ea8 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -190,9 +190,6 @@ void CEpgData::processTextToArray(std::string text, int screening, bool has_cove std::string aktWord = ""; int aktWidth = 0; - if(!text.empty()) - text = str_replace("\\n", "\n", text); - text += ' '; char* text_= (char*) text.c_str(); diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 7a27ac13f..e0c2273a9 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -820,9 +820,6 @@ void CEventList::paintDescription(int index) else infozone_text = g_Locale->getText(LOCALE_EPGLIST_NOEVENTS); - if(!infozone_text.empty()) - infozone_text = str_replace("\\n", "\n", infozone_text); - infozone->setText(infozone_text, CTextBox::TOP, g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_EVENT]); infozone->doPaintBg(false); infozone->doPaintTextBoxBg(true);