Commit 14e2ede4 authored by Dirk Mueller's avatar Dirk Mueller

the usual "daily unbreak compilation"

svn path=/trunk/KDE/kdeedu/kmplot/; revision=534838
parent ffdd461c
......@@ -93,7 +93,7 @@ class View : public QWidget, virtual public ViewIface
Screen,
Printer,
SVG,
Pixmap,
Pixmap
};
/// Reimplemented to draw all stuff to the view.
void draw( QPaintDevice *, PlotMedium medium );
......@@ -124,7 +124,7 @@ class View : public QWidget, virtual public ViewIface
enum PositionFormatting
{
DecimalFormat, ///< Plain text, using no scientific notation; just decimal expansion.
ScientificFormat, ///< Rich text, possibly using scientific notation (mult x 10 ^ exp).
ScientificFormat ///< Rich text possibly using scientific notation (mult x 10 ^ exp).
};
/**
* @return a string for displaying the x or y coordinate in the statusbar.
......@@ -404,7 +404,7 @@ public slots:
ZoomInDrawing, ///< drawing a rectangle for zooming in
ZoomOutDrawing, ///< drawing a rectangle for zooming out
AboutToTranslate, ///< user has clicked on an empty spot, but hasn't moved the mouse yet
Translating, ///< dragging the view with the mouse
Translating ///< dragging the view with the mouse
};
/// The current editing status
......
......@@ -51,7 +51,7 @@ enum GridStyle
GridNone,
GridLines,
GridCrosses,
GridPolar,
GridPolar
};
class View;
......@@ -90,7 +90,7 @@ class CDiagr
enum ClipBehaviour
{
ClipAll, ///< Clips any points going over the edge of the diagram
ClipInfinite, ///< Clips only infinite and NaN points going over the edge
ClipInfinite ///< Clips only infinite and NaN points going over the edge
};
/**
* @{
......
......@@ -67,7 +67,7 @@ class EquationEdit : public QTextEdit
enum InputType
{
Function,
Expression,
Expression
};
EquationEdit( QWidget * parent );
......
......@@ -114,7 +114,7 @@ class Equation
Cartesian,
ParametricX,
ParametricY,
Polar,
Polar
};
Equation( Type type, Function * parent );
......@@ -269,14 +269,14 @@ class Function
Derivative0,
Derivative1,
Derivative2,
Integral,
Integral
};
enum Type
{
Cartesian,
Parametric,
Polar,
Polar
};
Function( Type type );
......
......@@ -238,7 +238,7 @@ class Parser : public QObject, virtual public ParserIface
EmptyFunction,
CapitalInFunctionName, ///< function name contains a capital letter
NoSuchFunction,
UserDefinedConstantInExpression, ///< evalation expression may not use user defined constants
UserDefinedConstantInExpression ///< evalation expression may not use user defined constants
};
~Parser();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment