Skip to content

Commit

Permalink
cleanup EPG replacements
Browse files Browse the repository at this point in the history
  • Loading branch information
vanhofen authored and Frankenstone committed Oct 12, 2024
1 parent 3587fa3 commit 71b7f47
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 11 deletions.
4 changes: 0 additions & 4 deletions src/gui/channellist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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') );
Expand Down Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion src/gui/epgplus.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 : "");

Expand Down
3 changes: 0 additions & 3 deletions src/gui/epgview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
3 changes: 0 additions & 3 deletions src/gui/eventlist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 71b7f47

Please sign in to comment.