Menu
▾
▴
[Scidavis-svn-log] SF.net SVN: scidavis:[1398] branches/development
|
From: <dpo...@us...> - 2014-01-25 12:34:44
|
Revision: 1398
http://sourceforge.net/p/scidavis/svn/1398
Author: dpozitron
Date: 2014-01-25 12:34:39 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
Fighting with warnings
Modified Paths:
--------------
branches/development/3rdparty/minigzip/minigzip.c
branches/development/scidavis/src/ApplicationWindow.cpp
branches/development/scidavis/src/ExpDecayDialog.cpp
branches/development/scidavis/src/FilterDialog.cpp
branches/development/scidavis/src/FitDialog.cpp
branches/development/scidavis/src/Graph.h
branches/development/scidavis/src/InterpolationDialog.cpp
branches/development/scidavis/src/LayerDialog.cpp
branches/development/scidavis/src/LineDialog.cpp
branches/development/scidavis/src/MuParserScripting.h
branches/development/scidavis/src/PatternBox.h
branches/development/scidavis/src/PlotDialog.cpp
branches/development/scidavis/src/PolynomFitDialog.cpp
branches/development/scidavis/src/SymbolBox.h
Modified: branches/development/3rdparty/minigzip/minigzip.c
===================================================================
--- branches/development/3rdparty/minigzip/minigzip.c 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/3rdparty/minigzip/minigzip.c 2014-01-25 12:34:39 UTC (rev 1398)
@@ -108,7 +108,7 @@
int gz_compress_mmap OF((FILE *in, gzFile out));
#endif
void gz_uncompress OF((gzFile in, FILE *out));
-void file_compress OF((char *file, char *mode));
+void file_compress OF((const char *file, const char *mode));
void file_uncompress OF((char *file));
int main OF((int argc, char *argv[]));
@@ -222,8 +222,8 @@
* original.
*/
void file_compress(file, mode)
- char *file;
- char *mode;
+ const char *file;
+ const char *mode;
{
local char outfile[MAX_NAME_LEN];
FILE *in;
Modified: branches/development/scidavis/src/ApplicationWindow.cpp
===================================================================
--- branches/development/scidavis/src/ApplicationWindow.cpp 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/ApplicationWindow.cpp 2014-01-25 12:34:39 UTC (rev 1398)
@@ -167,7 +167,7 @@
extern "C"
{
-void file_compress(char *file, char *mode);
+void file_compress(const char *file, const char *mode);
}
ApplicationWindow::ApplicationWindow()
Modified: branches/development/scidavis/src/ExpDecayDialog.cpp
===================================================================
--- branches/development/scidavis/src/ExpDecayDialog.cpp 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/ExpDecayDialog.cpp 2014-01-25 12:34:39 UTC (rev 1398)
@@ -110,7 +110,7 @@
gl1->addWidget(boxStart, 5, 1);
gl1->addWidget(new QLabel(tr("Color")), 6, 0 );
- boxColor = new ColorBox(false);
+ boxColor = new ColorBox();
boxColor->setColor(QColor(Qt::red));
gl1->addWidget(boxColor, 6, 1);
Modified: branches/development/scidavis/src/FilterDialog.cpp
===================================================================
--- branches/development/scidavis/src/FilterDialog.cpp 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/FilterDialog.cpp 2014-01-25 12:34:39 UTC (rev 1398)
@@ -63,7 +63,7 @@
boxStart->setText(tr("0"));
gl1->addWidget(boxStart, 1, 1);
- boxColor = new ColorBox(false);
+ boxColor = new ColorBox();
boxColor->setColor(QColor(Qt::red));
if (type >= FFTFilter::BandPass)
{
Modified: branches/development/scidavis/src/FitDialog.cpp
===================================================================
--- branches/development/scidavis/src/FitDialog.cpp 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/FitDialog.cpp 2014-01-25 12:34:39 UTC (rev 1398)
@@ -132,7 +132,7 @@
gl1->addWidget(boxAlgorithm, 4, 1);
gl1->addWidget(new QLabel( tr("Color")), 5, 0);
- boxColor = new ColorBox( false );
+ boxColor = new ColorBox();
boxColor->setColor(QColor(Qt::red));
gl1->addWidget(boxColor, 5, 1);
Modified: branches/development/scidavis/src/Graph.h
===================================================================
--- branches/development/scidavis/src/Graph.h 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/Graph.h 2014-01-25 12:34:39 UTC (rev 1398)
@@ -189,7 +189,7 @@
double selectedXEndValue();
long curveKey(int curve){return c_keys[curve];}
- int curveIndex(long key){return c_keys.indexOf(key);};
+ int curveIndex(long key) const {return c_keys.indexOf(key);}
//! Map curve pointer to index.
int curveIndex(QwtPlotCurve *c) const;
//! map curve title to index
Modified: branches/development/scidavis/src/InterpolationDialog.cpp
===================================================================
--- branches/development/scidavis/src/InterpolationDialog.cpp 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/InterpolationDialog.cpp 2014-01-25 12:34:39 UTC (rev 1398)
@@ -78,7 +78,7 @@
gl1->addWidget(new QLabel(tr("Color")), 5, 0);
- boxColor = new ColorBox(false);
+ boxColor = new ColorBox();
boxColor->setColor(QColor(Qt::red));
gl1->addWidget(boxColor, 5, 1);
gl1->setRowStretch(6, 1);
Modified: branches/development/scidavis/src/LayerDialog.cpp
===================================================================
--- branches/development/scidavis/src/LayerDialog.cpp 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/LayerDialog.cpp 2014-01-25 12:34:39 UTC (rev 1398)
@@ -61,14 +61,14 @@
QGridLayout *gl2 = new QGridLayout(gb2);
gl2->addWidget(new QLabel(tr("Horizontal")), 0, 0);
- alignHorBox = new QComboBox( false );
+ alignHorBox = new QComboBox();
alignHorBox->insertItem( tr( "Center" ) );
alignHorBox->insertItem( tr( "Left" ) );
alignHorBox->insertItem( tr( "Right" ) );
gl2->addWidget(alignHorBox, 0, 1);
gl2->addWidget(new QLabel( tr( "Vertical" )), 1, 0 );
- alignVertBox = new QComboBox( false );
+ alignVertBox = new QComboBox();
alignVertBox->insertItem( tr( "Center" ) );
alignVertBox->insertItem( tr( "Top" ) );
alignVertBox->insertItem( tr( "Bottom" ) );
Modified: branches/development/scidavis/src/LineDialog.cpp
===================================================================
--- branches/development/scidavis/src/LineDialog.cpp 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/LineDialog.cpp 2014-01-25 12:34:39 UTC (rev 1398)
@@ -63,7 +63,7 @@
gl1->addWidget(colorBox, 0, 1);
gl1->addWidget(new QLabel(tr("Line type")), 1, 0);
- styleBox = new QComboBox( FALSE);
+ styleBox = new QComboBox();
styleBox->insertItem("_____");
styleBox->insertItem("- - -");
styleBox->insertItem(".....");
@@ -74,7 +74,7 @@
setLineStyle(lm->style());
gl1->addWidget(new QLabel(tr("Line width")), 2, 0);
- widthBox = new QComboBox( FALSE );
+ widthBox = new QComboBox();
widthBox->insertItem( tr( "1" ) );
widthBox->insertItem( tr( "2" ) );
widthBox->insertItem( tr( "3" ) );
Modified: branches/development/scidavis/src/MuParserScripting.h
===================================================================
--- branches/development/scidavis/src/MuParserScripting.h 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/MuParserScripting.h 2014-01-25 12:34:39 UTC (rev 1398)
@@ -71,7 +71,7 @@
struct mathFunction
{
- char *name;
+ const char *name;
int numargs;
double (*fun1)(double);
double (*fun2)(double,double);
Modified: branches/development/scidavis/src/PatternBox.h
===================================================================
--- branches/development/scidavis/src/PatternBox.h 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/PatternBox.h 2014-01-25 12:34:39 UTC (rev 1398)
@@ -36,8 +36,8 @@
{
Q_OBJECT
public:
- PatternBox(bool rw, QWidget *parent);
- PatternBox(QWidget *parent);
+ PatternBox(bool rw, QWidget *parent = 0);
+ PatternBox(QWidget *parent = 0);
void setPattern(const Qt::BrushStyle& c);
Qt::BrushStyle getSelectedPattern() const;
Modified: branches/development/scidavis/src/PlotDialog.cpp
===================================================================
--- branches/development/scidavis/src/PlotDialog.cpp 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/PlotDialog.cpp 2014-01-25 12:34:39 UTC (rev 1398)
@@ -377,11 +377,11 @@
QGridLayout *gl1 = new QGridLayout();
gl1->addWidget(new QLabel( tr( "Color" )), 0, 0);
- boxPieLineColor = new ColorBox(false);
+ boxPieLineColor = new ColorBox();
gl1->addWidget(boxPieLineColor, 0, 1);
gl1->addWidget(new QLabel(tr( "Style" )), 1, 0);
- boxPieLineStyle = new QComboBox( false );
+ boxPieLineStyle = new QComboBox();
boxPieLineStyle->insertItem("_____");
boxPieLineStyle->insertItem("- - -");
boxPieLineStyle->insertItem(".....");
@@ -400,11 +400,11 @@
QGridLayout *gl2 = new QGridLayout();
gl2->addWidget(new QLabel( tr( "First color" )), 0, 0);
- boxFirstColor = new ColorBox(false);
+ boxFirstColor = new ColorBox();
gl2->addWidget(boxFirstColor, 0, 1);
gl2->addWidget(new QLabel( tr( "Pattern" )), 1, 0);
- boxPiePattern = new PatternBox(false);
+ boxPiePattern = new PatternBox();
gl2->addWidget(boxPiePattern, 1, 1);
gl2->addWidget(new QLabel( tr( "Pie radius" )), 2, 0);
@@ -500,7 +500,7 @@
gl1->addWidget(boxLineWidth, 2, 1);
gl1->addWidget(new QLabel(tr( "Color" )), 3, 0);
- boxLineColor = new ColorBox( false);
+ boxLineColor = new ColorBox();
gl1->addWidget(boxLineColor, 3, 1);
gl1->setRowStretch (4, 1);
@@ -508,10 +508,10 @@
fillGroupBox->setCheckable(true);
QGridLayout *gl2 = new QGridLayout(fillGroupBox);
gl2->addWidget(new QLabel(tr( "Fill color" )), 0, 0);
- boxAreaColor = new ColorBox(false);
+ boxAreaColor = new ColorBox();
gl2->addWidget(boxAreaColor, 0, 1);
gl2->addWidget(new QLabel(tr( "Pattern" )), 1, 0);
- boxPattern = new PatternBox(false);
+ boxPattern = new PatternBox();
gl2->addWidget(boxPattern, 1, 1);
gl2->setRowStretch (2, 1);
@@ -535,7 +535,7 @@
QGroupBox *gb = new QGroupBox();
QGridLayout *gl = new QGridLayout(gb);
gl->addWidget(new QLabel(tr( "Style" )), 0, 0);
- boxSymbolStyle = new SymbolBox(false);
+ boxSymbolStyle = new SymbolBox();
gl->addWidget(boxSymbolStyle, 0, 1);
gl->addWidget(new QLabel(tr( "Size" )), 1, 0);
boxSymbolSize = new QSpinBox();
@@ -544,10 +544,10 @@
gl->addWidget(boxSymbolSize, 1, 1);
boxFillSymbol = new QCheckBox( tr( "Fill Color" ));
gl->addWidget(boxFillSymbol, 2, 0);
- boxFillColor = new ColorBox(false);
+ boxFillColor = new ColorBox();
gl->addWidget(boxFillColor, 2, 1);
gl->addWidget(new QLabel(tr( "Edge Color" )), 3, 0);
- boxSymbolColor = new ColorBox( false);
+ boxSymbolColor = new ColorBox();
gl->addWidget(boxSymbolColor, 3, 1);
gl->addWidget(new QLabel(tr( "Edge Width" )), 4, 0);
boxPenWidth = new QSpinBox();
@@ -675,23 +675,23 @@
QGridLayout *gl1 = new QGridLayout(gb1);
gl1->addWidget(new QLabel(tr( "Max" )), 0, 0);
- boxMaxStyle = new SymbolBox(false);
+ boxMaxStyle = new SymbolBox();
gl1->addWidget(boxMaxStyle, 0, 1);
gl1->addWidget(new QLabel(tr( "99%" )), 1, 0);
- box99Style = new SymbolBox(false);
+ box99Style = new SymbolBox();
gl1->addWidget(box99Style, 1, 1);
gl1->addWidget(new QLabel(tr( "Mean" )), 2, 0);
- boxMeanStyle = new SymbolBox( false);
+ boxMeanStyle = new SymbolBox();
gl1->addWidget(boxMeanStyle, 2, 1);
gl1->addWidget(new QLabel(tr( "1%" )), 3, 0);
- box1Style = new SymbolBox(false);
+ box1Style = new SymbolBox();
gl1->addWidget(box1Style, 3, 1);
gl1->addWidget(new QLabel(tr( "Min" )), 4, 0);
- boxMinStyle = new SymbolBox(false);
+ boxMinStyle = new SymbolBox();
gl1->addWidget(boxMinStyle, 4, 1);
gl1->setRowStretch(5, 1);
@@ -705,11 +705,11 @@
boxFillSymbols = new QCheckBox(tr( "Fill Color" ));
gl2->addWidget(boxFillSymbols, 1, 0);
- boxPercFillColor = new ColorBox(false);
+ boxPercFillColor = new ColorBox();
gl2->addWidget(boxPercFillColor, 1, 1);
gl2->addWidget(new QLabel(tr( "Edge Color" )), 2, 0);
- boxEdgeColor = new ColorBox(false);
+ boxEdgeColor = new ColorBox();
gl2->addWidget(boxEdgeColor, 2, 1);
gl2->addWidget(new QLabel(tr( "Edge Width" )), 3, 0);
@@ -962,7 +962,7 @@
QGroupBox *gb1 = new QGroupBox();
QGridLayout *gl1 = new QGridLayout(gb1);
gl1->addWidget(new QLabel(tr( "Color" )), 0, 0);
- vectColorBox = new ColorBox(false);
+ vectColorBox = new ColorBox();
gl1->addWidget(vectColorBox, 0, 1);
gl1->addWidget(new QLabel(tr( "Line Width" )), 1, 0);
vectWidthBox = new QSpinBox();
@@ -988,17 +988,17 @@
QGridLayout *gl3 = new QGridLayout(GroupBoxVectEnd);
labelXEnd = new QLabel(tr( "X End" ));
gl3->addWidget(labelXEnd, 0, 0);
- xEndBox = new QComboBox(false);
+ xEndBox = new QComboBox();
gl3->addWidget(xEndBox, 0, 1);
labelYEnd = new QLabel(tr( "Y End" ));
gl3->addWidget(labelYEnd, 1, 0);
- yEndBox = new QComboBox( false);
+ yEndBox = new QComboBox();
gl3->addWidget(yEndBox, 1, 1);
labelPosition = new QLabel(tr( "Position" ));
gl3->addWidget(labelPosition, 2, 0);
- vectPosBox = new QComboBox( false);
+ vectPosBox = new QComboBox();
vectPosBox->addItem(tr("Tail"));
vectPosBox->addItem(tr("Middle"));
vectPosBox->addItem(tr("Head"));
Modified: branches/development/scidavis/src/PolynomFitDialog.cpp
===================================================================
--- branches/development/scidavis/src/PolynomFitDialog.cpp 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/PolynomFitDialog.cpp 2014-01-25 12:34:39 UTC (rev 1398)
@@ -70,7 +70,7 @@
gl1->addWidget(boxEnd, 3, 1);
gl1->addWidget(new QLabel( tr("Color")), 4, 0);
- boxColor = new ColorBox( false);
+ boxColor = new ColorBox();
boxColor->setColor(QColor(Qt::red));
gl1->addWidget(boxColor, 4, 1);
Modified: branches/development/scidavis/src/SymbolBox.h
===================================================================
--- branches/development/scidavis/src/SymbolBox.h 2014-01-25 09:11:19 UTC (rev 1397)
+++ branches/development/scidavis/src/SymbolBox.h 2014-01-25 12:34:39 UTC (rev 1398)
@@ -37,8 +37,8 @@
{
Q_OBJECT
public:
- SymbolBox(bool rw, QWidget *parent);
- SymbolBox(QWidget *parent);
+ SymbolBox(bool rw, QWidget *parent = 0);
+ SymbolBox(QWidget *parent = 0);
void setStyle(const QwtSymbol::Style& c);
QwtSymbol::Style selectedSymbol() const;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
