diff -ruN -X /root/tmp/patchignore.14383 /root/tmp/patch/lvs/Makefile /root/compile/lvs/Makefile --- /root/tmp/patch/lvs/Makefile 2004-03-25 14:24:24.000000000 -0700 +++ /root/compile/lvs/Makefile 2004-12-17 10:45:28.000000000 -0700 @@ -6,4 +6,5 @@ cd motiond; ./Install mkdir -p /usr/local/lvs/conf - +clean: + cd src; make clean diff -ruN -X /root/tmp/patchignore.14383 /root/tmp/patch/lvs/src/Configuration.cpp /root/compile/lvs/src/Configuration.cpp --- /root/tmp/patch/lvs/src/Configuration.cpp 2004-04-12 11:30:05.000000000 -0600 +++ /root/compile/lvs/src/Configuration.cpp 2004-12-17 11:01:59.000000000 -0700 @@ -81,7 +81,7 @@ // Video files path Entry = XmlConfig->GetEntryAutoCreate(0, "appsettings property name = Video Files Path"); - XmlConfig->SetValue(Entry->ParentEntry, "value", VideoFilesDir); + XmlConfig->SetValue(Entry->ParentEntry, "value", (char*)VideoFilesDir); // Number of cameras NumberOfCameras = CamerasSpinBox->value(); diff -ruN -X /root/tmp/patchignore.14383 /root/tmp/patch/lvs/src/TForm.cpp /root/compile/lvs/src/TForm.cpp --- /root/tmp/patch/lvs/src/TForm.cpp 2004-04-12 14:10:05.000000000 -0600 +++ /root/compile/lvs/src/TForm.cpp 2004-12-17 11:01:59.000000000 -0700 @@ -54,22 +54,22 @@ // Form height SaveValue.Sprintf("%d",height()); Entry = XmlConfig->GetEntryAutoCreate(0, "appsettings property name = height"); - XmlConfig->SetValue(Entry->ParentEntry, "value", SaveValue); + XmlConfig->SetValue(Entry->ParentEntry, "value", (char*)SaveValue); // Form witdh SaveValue.Sprintf("%d",width()); Entry = XmlConfig->GetEntryAutoCreate(0, "appsettings property name = width"); - XmlConfig->SetValue(Entry->ParentEntry, "value", SaveValue); + XmlConfig->SetValue(Entry->ParentEntry, "value", (char*)SaveValue); // Form top SaveValue.Sprintf("%d",pos().y()); Entry = XmlConfig->GetEntryAutoCreate(0, "appsettings property name = top"); - XmlConfig->SetValue(Entry->ParentEntry, "value", SaveValue); + XmlConfig->SetValue(Entry->ParentEntry, "value", (char*)SaveValue); // Form left SaveValue.Sprintf("%d",pos().x()); Entry = XmlConfig->GetEntryAutoCreate(0, "appsettings property name = left"); - XmlConfig->SetValue(Entry->ParentEntry, "value", SaveValue); + XmlConfig->SetValue(Entry->ParentEntry, "value", (char*)SaveValue); } printf("delete XmlConfig;\n"); delete XmlConfig; @@ -150,51 +150,51 @@ // Form height GetValue.Sprintf("%d",height()); Entry = XmlConfig->GetEntryAutoCreate(0, "appsettings property name = height"); - GetValue = XmlConfig->GetValueDefault(Entry->ParentEntry, "value", GetValue); + GetValue = XmlConfig->GetValueDefault(Entry->ParentEntry, "value", (char*)GetValue); SetFormHeight = GetValue.ToInt(); if((SetFormHeight < 300)||(SetFormHeight > 1300)) { GetValue.Sprintf("%d",height()); SetFormHeight = height(); - XmlConfig->SetValue(Entry->ParentEntry, "value", GetValue); + XmlConfig->SetValue(Entry->ParentEntry, "value", (char*)GetValue); } // Form witdh GetValue.Sprintf("%d",width()); Entry = XmlConfig->GetEntryAutoCreate(0, "appsettings property name = width"); - GetValue = XmlConfig->GetValueDefault(Entry->ParentEntry, "value", GetValue); + GetValue = XmlConfig->GetValueDefault(Entry->ParentEntry, "value", (char*)GetValue); SetFormWidth = GetValue.ToInt(); if((SetFormWidth < 300)||(SetFormWidth > 1300)) { GetValue.Sprintf("%d",width()); SetFormWidth = width(); - XmlConfig->SetValue(Entry->ParentEntry, "value", GetValue); + XmlConfig->SetValue(Entry->ParentEntry, "value", (char*)GetValue); } // Form top SetFormTop = (qApp->desktop()->height() / 2) - (SetFormHeight / 2); GetValue.Sprintf("%d",SetFormTop); Entry = XmlConfig->GetEntryAutoCreate(0, "appsettings property name = top"); - GetValue = XmlConfig->GetValueDefault(Entry->ParentEntry, "value", GetValue); + GetValue = XmlConfig->GetValueDefault(Entry->ParentEntry, "value", (char*)GetValue); SetFormTop = GetValue.ToInt(); if((SetFormTop < 0)||(SetFormTop > 1000)) { SetFormTop = (qApp->desktop()->height() / 2) - (SetFormHeight / 2); GetValue.Sprintf("%d",SetFormTop); - XmlConfig->SetValue(Entry->ParentEntry, "value", GetValue); + XmlConfig->SetValue(Entry->ParentEntry, "value", (char*)GetValue); } // Form left SetFormLeft = (qApp->desktop()->height() / 2) - (SetFormHeight / 2); GetValue.Sprintf("%d",SetFormLeft); Entry = XmlConfig->GetEntryAutoCreate(0, "appsettings property name = left"); - GetValue = XmlConfig->GetValueDefault(Entry->ParentEntry, "value", GetValue); + GetValue = XmlConfig->GetValueDefault(Entry->ParentEntry, "value", (char*)GetValue); SetFormLeft = GetValue.ToInt(); if((SetFormLeft < 0)||(SetFormLeft > 1000)) { SetFormLeft = (qApp->desktop()->height() / 2) - (SetFormWidth / 2); GetValue.Sprintf("%d",SetFormLeft); - XmlConfig->SetValue(Entry->ParentEntry, "value", GetValue); + XmlConfig->SetValue(Entry->ParentEntry, "value", (char*)GetValue); } setGeometry(SetFormLeft, SetFormTop, SetFormWidth, SetFormHeight); GeometryChanged = false;