Fix compilation with gcc and fix some warnings with wxString Trim

anonbeat · May 20, 2020 · 6be35ba · 6be35ba
1 parent dffe91c
commit 6be35ba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/ui/jamendo/Jamendo.cpp b/src/ui/jamendo/Jamendo.cpp
@@ -487,7 +487,7 @@ guJamendoUpdateThread::~guJamendoUpdateThread()
     }
 }
 
-#if 0
+/*
 <JamendoData epoch="1282819258" documentation="http://developer.jamendo.com/en/wiki/DatabaseDumps" type="artistalbumtrack">
 <Artists>
     <artist>
@@ -538,8 +538,7 @@ guJamendoUpdateThread::~guJamendoUpdateThread()
     </artist>
 ...
 </Artists>
-#endif
-
+*/
 
 // -------------------------------------------------------------------------------- //
 void ReadJamendoXmlTrack( wxXmlNode * xmlnode, guJamendoUpdateThread * thread, guTrack * track )

diff --git a/src/ui/mediaviewer/playlists/PlayListFile.cpp b/src/ui/mediaviewer/playlists/PlayListFile.cpp
@@ -287,7 +287,7 @@ bool guPlaylistFile::ReadM3uStream( wxInputStream &playlist, const wxString &pat
         int Count = Lines.Count();
         for( Index = 0; Index < Count; Index++ )
         {
-            Lines[ Index ].Trim( wxString::both );
+            Lines[ Index ].Trim( false ).Trim( true );
             if( Lines[ Index ].IsEmpty() || ( Lines[ Index ].Find( wxT( "#EXTM3U" ) ) != wxNOT_FOUND ) )
             {
                 continue;
@@ -676,7 +676,7 @@ bool guCuePlaylistFile::LoadFromText( const wxString &content )
         int Count = Lines.Count();
         for( Index = 0; Index < Count; Index++ )
         {
-            Lines[ Index ].Trim( wxString::both );
+            Lines[ Index ].Trim( false ).Trim( true );
             wxString Line = Lines[ Index ];
             //guLogMessage( wxT( "'%s'" ), Line.c_str() );
             wxArrayString Keys = wxStringTokenize( Line, wxT( " " ) );

diff --git a/src/ui/podcasts/PodcastsPanel.cpp b/src/ui/podcasts/PodcastsPanel.cpp
@@ -1193,7 +1193,7 @@ void guPodcastPanel::AddChannel( wxCommandEvent &event )
         wxSetCursor( * wxHOURGLASS_CURSOR );
         wxTheApp->Yield();
 
-        wxString PodcastUrl = NewPodcastChannel->GetValue().Trim( wxString::both );
+        wxString PodcastUrl = NewPodcastChannel->GetValue().Trim( false ).Trim( true );
         if( !PodcastUrl.IsEmpty() )
         {
             // If we find an itunes link we replace the itpc to the standard http