diff --git a/qucs/qucs/diagrams/diagram.cpp b/qucs/qucs/diagrams/diagram.cpp index 2d50e4ffa0..ea970ba6be 100644 --- a/qucs/qucs/diagrams/diagram.cpp +++ b/qucs/qucs/diagrams/diagram.cpp @@ -99,12 +99,6 @@ Diagram::~Diagram() Paint function for few diagrams (cartesian, smith, polar, ...) */ void Diagram::paint(ViewPainter *p) -{ - paintDiagram(p); - paintMarkers(p); -} - -void Diagram::paintDiagram(ViewPainter *p) { // paint all lines foreach(Line *pl, Lines) { @@ -159,10 +153,7 @@ void Diagram::paintDiagram(ViewPainter *p) p->drawResizeRect(cx+x2, cy-y2); p->drawResizeRect(cx+x2, cy); } -} -void Diagram::paintMarkers(ViewPainter *p) -{ // draw markers last, so they are at the top of painting layers foreach(Graph *pg, Graphs) foreach(Marker *pm, pg->Markers) diff --git a/qucs/qucs/diagrams/diagram.h b/qucs/qucs/diagrams/diagram.h index bf3da94443..77c5d1d179 100644 --- a/qucs/qucs/diagrams/diagram.h +++ b/qucs/qucs/diagrams/diagram.h @@ -72,9 +72,6 @@ class Diagram : public Element { virtual QString extraMarkerText(Marker const*) const {return "";} virtual void paint(ViewPainter*); -protected: // strictly internal - virtual void paintDiagram(ViewPainter* p); - void paintMarkers(ViewPainter* p); public: void setCenter(int, int, bool relative=false); void getCenter(int&, int&); diff --git a/qucs/qucs/diagrams/tabdiagram.cpp b/qucs/qucs/diagrams/tabdiagram.cpp index 5baf10ed63..3e0ad167e0 100644 --- a/qucs/qucs/diagrams/tabdiagram.cpp +++ b/qucs/qucs/diagrams/tabdiagram.cpp @@ -46,13 +46,8 @@ TabDiagram::~TabDiagram() { } -void TabDiagram::paint(ViewPainter *p) -{ - paintDiagram(p); -} - // ------------------------------------------------------------ -void TabDiagram::paintDiagram(ViewPainter *p) +void TabDiagram::paint(ViewPainter *p) { // paint all lines foreach(Line *pl, Lines) { diff --git a/qucs/qucs/diagrams/tabdiagram.h b/qucs/qucs/diagrams/tabdiagram.h index c3835484f3..6efc2bc869 100644 --- a/qucs/qucs/diagrams/tabdiagram.h +++ b/qucs/qucs/diagrams/tabdiagram.h @@ -29,7 +29,6 @@ class TabDiagram : public Diagram { virtual Diagram* newOne(); static Element* info(QString&, char* &, bool getNewOne=false); virtual void paint(ViewPainter*); - virtual void paintDiagram(ViewPainter *p); virtual int calcDiagram(); virtual int scroll(int); virtual bool scrollTo(int, int, int); diff --git a/qucs/qucs/diagrams/timingdiagram.cpp b/qucs/qucs/diagrams/timingdiagram.cpp index 77f40d1bba..67e3e6a9cc 100644 --- a/qucs/qucs/diagrams/timingdiagram.cpp +++ b/qucs/qucs/diagrams/timingdiagram.cpp @@ -45,13 +45,8 @@ TimingDiagram::~TimingDiagram() { } -void TimingDiagram::paint(ViewPainter *p) -{ - paintDiagram(p); -} - // ------------------------------------------------------------ -void TimingDiagram::paintDiagram(ViewPainter *p) +void TimingDiagram::paint(ViewPainter *p) { // paint all lines foreach(Line *pl, Lines) { diff --git a/qucs/qucs/diagrams/timingdiagram.h b/qucs/qucs/diagrams/timingdiagram.h index 98f7414543..90e35a9abe 100644 --- a/qucs/qucs/diagrams/timingdiagram.h +++ b/qucs/qucs/diagrams/timingdiagram.h @@ -29,7 +29,6 @@ class TimingDiagram : public TabDiagram { Diagram* newOne(); static Element* info(QString&, char* &, bool getNewOne=false); void paint(ViewPainter *p); - void paintDiagram(ViewPainter *p); int calcDiagram(); int scroll(int); bool scrollTo(int, int, int);