xiRetimer

commit

2f39327f9149fcc26bb6efebeda1ebf7bd80e983

parent

8b0f25af9c0837b1530beb5d8f8ef3d85d0aa70b

Author

Tobias Bengfort <tobias.bengfort@gmx.net>

Date

2014-01-26 15:10

fix compiler errors

Diffstat

3 files changed, 2 insertions, 6 deletions

diff --git a/src/gui/RetimerMainFrame.cpp b/src/gui/RetimerMainFrame.cpp

@@ -249,7 +249,7 @@ void RetimerMainFrame::process() {
  249   249 		reportError(_T("Could not process data!"));
  250   250 	}
  251   251 
  252    -1 	wxProgressDialog::wxProgressDialog* dialog = new wxProgressDialog(_T("processing..."), _T("please wait"));
   -1   252 	wxProgressDialog* dialog = new wxProgressDialog(_T("processing..."), _T("please wait"));
  253   253 	dialog->Show();
  254   254 	while (sample->getProcessing()) {
  255   255 		dialog->Update(int(sample->getFinished() * 100));
@@ -260,6 +260,6 @@ void RetimerMainFrame::process() {
  260   260 
  261   261 
  262   262 void RetimerMainFrame::reportError(wxString string) {
  263    -1 	wxMessageDialog::wxMessageDialog* dialog = new wxMessageDialog(this, string, _T("Error"), wxOK | wxICON_ERROR);
   -1   263 	wxMessageDialog* dialog = new wxMessageDialog(this, string, _T("Error"), wxOK | wxICON_ERROR);
  264   264 	dialog->ShowModal();
  265   265 }

diff --git a/src/marker.cpp b/src/marker.cpp

@@ -84,8 +84,6 @@ void Marker::setInterpolationMode(int m) {
   84    84 float Marker::getLengthf() {
   85    85 	if (getLength() > 0) {
   86    86 		return getNew(getLength() - 1) - getNew(0);
   87    -1 	} else {
   88    -1 		return NULL;
   89    87 	}
   90    88 }
   91    89 

diff --git a/src/xiarray.cpp b/src/xiarray.cpp

@@ -15,8 +15,6 @@ xiArray::~xiArray() {
   15    15 float xiArray::get(int i) {
   16    16 	if (i >= 0 && i < getLength()) {
   17    17 		return array[i];
   18    -1 	} else {
   19    -1 		return NULL;
   20    18 	}
   21    19 }
   22    20