Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv6504/src
Modified Files:
BatchCommands.cpp Envelope.cpp LabelTrack.cpp Project.cpp
ShuttleGui.cpp Tags.cpp
Log Message:
Fixing VC8 warnings (most of them, anyway).
Index: Envelope.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Envelope.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- Envelope.cpp 23 Sep 2006 02:28:04 -0000 1.42
+++ Envelope.cpp 1 Oct 2006 23:50:31 -0000 1.43
@@ -256,7 +256,6 @@
void Envelope::WriteXML(XMLWriter &xmlFile)
{
unsigned int ctrlPt;
- int i;
xmlFile.StartTag(wxT("envelope"));
xmlFile.WriteAttr(wxT("numpoints"), mEnv.GetCount());
Index: Tags.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Tags.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- Tags.cpp 25 Sep 2006 21:04:24 -0000 1.38
+++ Tags.cpp 1 Oct 2006 23:50:31 -0000 1.39
@@ -211,7 +211,7 @@
void Tags::WriteXML(XMLWriter &xmlFile)
{
- int i, j;
+ int j;
xmlFile.StartTag(wxT("tags"));
xmlFile.WriteAttr(wxT("title"), mTitle);
Index: BatchCommands.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/BatchCommands.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- BatchCommands.cpp 1 Oct 2006 07:23:49 -0000 1.22
+++ BatchCommands.cpp 1 Oct 2006 23:50:31 -0000 1.23
@@ -706,7 +706,6 @@
void BatchCommands::Split(const wxString & str, wxString & command, wxString &
param)
{
int splitAt;
- int i;
command.Empty();
param.Empty();
Index: LabelTrack.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/LabelTrack.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- LabelTrack.cpp 23 Sep 2006 02:28:04 -0000 1.70
+++ LabelTrack.cpp 1 Oct 2006 23:50:31 -0000 1.71
@@ -882,7 +882,7 @@
// Convert control characters to blanks
int i;
- for (i = 0; i < text.Length(); i++) {
+ for (i = 0; i < (int)text.Length(); i++) {
if (wxIscntrl(text[i])) {
text[i] = wxT(' ');
}
@@ -1735,7 +1735,7 @@
void LabelTrack::WriteXML(XMLWriter &xmlFile)
{
int len = mLabels.Count();
- int i, j;
+ int i;
xmlFile.StartTag(wxT("labeltrack"));
xmlFile.WriteAttr(wxT("name"), mName);
Index: ShuttleGui.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/ShuttleGui.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ShuttleGui.cpp 7 Sep 2006 04:04:44 -0000 1.23
+++ ShuttleGui.cpp 1 Oct 2006 23:50:31 -0000 1.24
@@ -1005,7 +1005,7 @@
else
{
wxString Temp;
- if( pChoices && ( WrappedRef.ReadAsInt() < pChoices->GetCount() ) )
+ if( pChoices && ( WrappedRef.ReadAsInt() <
(int)pChoices->GetCount() ) )
{
Temp = (*pChoices)[WrappedRef.ReadAsInt()];
}
@@ -1194,7 +1194,7 @@
if( n== wxNOT_FOUND )
n=miNoMatchSelector;
miNoMatchSelector = 0;
- if( n < Choices.GetCount() )
+ if( n < (int)Choices.GetCount() )
{
return Choices[n];
}
@@ -1218,7 +1218,7 @@
if( n== wxNOT_FOUND )
n=miNoMatchSelector;
miNoMatchSelector = 0;
- if( n < Choices.GetCount() )
+ if( n < (int)Choices.GetCount() )
{
return Choices[n];
}
Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -d -r1.282 -r1.283
--- Project.cpp 24 Sep 2006 18:10:45 -0000 1.282
+++ Project.cpp 1 Oct 2006 23:50:31 -0000 1.283
@@ -1980,8 +1980,6 @@
void AudacityProject::WriteXML(XMLWriter &xmlFile)
{
- int i;
-
// Warning: This block of code is duplicated in Save, for now...
wxString project = mFileName;
if (project.Len() > 4 && project.Mid(project.Len() - 4) == wxT(".aup"))
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
