Remove splitting of paint routines

between paintDiagram() and paintMarker() that was introduced to
handle marker hiding during printing.
This is now handled differently (see previous commit) so there can be
just a single paint() routine now.

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)

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&);

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) {

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);

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) {

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);