SF.net SVN: jazzplusplus:[881] trunk/jazz/src/Rhythm.cpp

[<pst...@us...>]

Revision: 881
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=881&view=rev
Author:   pstieber
Date:     2011-08-05 19:48:23 +0000 (Fri, 05 Aug 2011)

Log Message:
-----------
1. Changed fname to FileName.
2. Updated string processing.

Modified Paths:
--------------
    trunk/jazz/src/Rhythm.cpp

Modified: trunk/jazz/src/Rhythm.cpp
===================================================================
--- trunk/jazz/src/Rhythm.cpp	2011-08-05 02:16:13 UTC (rev 880)
+++ trunk/jazz/src/Rhythm.cpp	2011-08-05 19:48:23 UTC (rev 881)
@@ -761,15 +761,15 @@
 
     case wxID_OPEN:
       {
-        wxString fname = file_selector(
+        wxString FileName = file_selector(
           mDefaultFileName,
           "Load Rhythm",
           false,
           has_changed,
           "*.rhy");
-        if (fname)
+        if (!FileName.empty())
         {
-          ifstream Is(fname);
+          ifstream Is(FileName.wx_str());
           Is >> *this;
           OnPaint();
         }
@@ -779,15 +779,15 @@
     case wxID_SAVE:
       {
         Win2Instrument();
-        wxString fname = file_selector(
+        wxString FileName = file_selector(
           mDefaultFileName,
           "Save Rhythm",
           true,
           has_changed,
           "*.rhy");
-        if (fname)
+        if (!FileName.empty())
         {
-          ofstream Os(fname);
+          ofstream Os(FileName.wx_str());
           Os << *this;
         }
       }
@@ -907,7 +907,7 @@
       pRhythm->n_keys  = 1;
       pRhythm->keys[0] = keys[i];
       pRhythm->mode    = MODE_ALL_OF;
-      pRhythm->SetLabel(names[i].c_str());
+      pRhythm->SetLabel(names[i]);
     }
 
     // choose controller?


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.