From 0ac0f87f1f51159778d4691a498e892ea914cf9f Mon Sep 17 00:00:00 2001 From: yodalee Date: Sun, 2 Nov 2014 21:29:26 +0800 Subject: [PATCH] clean the header include in painting arrow.cpp: Q3PointArray -> QPolygon * unused header: arrowdialog.cpp ellipse.cpp ellipsearc.cpp graphicline.cpp painting.cpp rectangle.cpp graphictext.cpp * unnecessary include: filldialog.h graphictextdialog.h id_dialog.h * add include: graphicline.h: add QPen graphictext.h: add QFont, QColor, QString portsymbol.h: add QString * remove comment painting.h --- qucs/paintings/arrow.cpp | 8 ++------ qucs/paintings/arrowdialog.cpp | 1 - qucs/paintings/ellipse.cpp | 4 ---- qucs/paintings/ellipsearc.cpp | 3 --- qucs/paintings/filldialog.h | 2 -- qucs/paintings/graphicline.cpp | 3 --- qucs/paintings/graphicline.h | 2 ++ qucs/paintings/graphictext.cpp | 5 ----- qucs/paintings/graphictext.h | 4 ++++ qucs/paintings/graphictextdialog.h | 1 - qucs/paintings/id_dialog.h | 3 --- qucs/paintings/painting.cpp | 2 -- qucs/paintings/painting.h | 2 -- qucs/paintings/portsymbol.h | 1 + qucs/paintings/rectangle.cpp | 5 ----- 15 files changed, 9 insertions(+), 37 deletions(-) diff --git a/qucs/paintings/arrow.cpp b/qucs/paintings/arrow.cpp index 3e60e399..e84ab702 100644 --- a/qucs/paintings/arrow.cpp +++ b/qucs/paintings/arrow.cpp @@ -19,11 +19,7 @@ #include "arrowdialog.h" #include "schematic.h" -#include -#include -#include -//Added by qt3to4: -#include +#include #include @@ -50,7 +46,7 @@ Arrow::~Arrow() // -------------------------------------------------------------------------- void Arrow::paint(ViewPainter *p) { - Q3PointArray Points; + QPolygon Points; int x1_, y1_, x2_, y2_, x3_, y3_; if(isSelected) { p->Painter->setPen(QPen(Qt::darkGray,Pen.width()+5)); diff --git a/qucs/paintings/arrowdialog.cpp b/qucs/paintings/arrowdialog.cpp index fd579bd7..1842db27 100644 --- a/qucs/paintings/arrowdialog.cpp +++ b/qucs/paintings/arrowdialog.cpp @@ -17,7 +17,6 @@ #include "arrowdialog.h" -//#include #include #include #include diff --git a/qucs/paintings/ellipse.cpp b/qucs/paintings/ellipse.cpp index c5fed6ff..30d15678 100644 --- a/qucs/paintings/ellipse.cpp +++ b/qucs/paintings/ellipse.cpp @@ -18,10 +18,6 @@ #include "ellipse.h" #include "filldialog.h" #include "schematic.h" -#include -#include -#include -#include Ellipse::Ellipse(bool _filled) diff --git a/qucs/paintings/ellipsearc.cpp b/qucs/paintings/ellipsearc.cpp index b089e9c9..28d562c5 100644 --- a/qucs/paintings/ellipsearc.cpp +++ b/qucs/paintings/ellipsearc.cpp @@ -19,9 +19,6 @@ #include "filldialog.h" #include "main.h" #include "schematic.h" -#include -#include -#include #include diff --git a/qucs/paintings/filldialog.h b/qucs/paintings/filldialog.h index d4b02f9a..02a2a1a7 100644 --- a/qucs/paintings/filldialog.h +++ b/qucs/paintings/filldialog.h @@ -19,8 +19,6 @@ #define FILLDIALOG_H #include -#include -#include class QVBoxLayout; class QLabel; diff --git a/qucs/paintings/graphicline.cpp b/qucs/paintings/graphicline.cpp index 1373c940..7d70b8cf 100644 --- a/qucs/paintings/graphicline.cpp +++ b/qucs/paintings/graphicline.cpp @@ -18,9 +18,6 @@ #include "graphicline.h" #include "filldialog.h" #include "schematic.h" -#include -#include -#include #include diff --git a/qucs/paintings/graphicline.h b/qucs/paintings/graphicline.h index 65773ba6..a228c97e 100644 --- a/qucs/paintings/graphicline.h +++ b/qucs/paintings/graphicline.h @@ -20,6 +20,8 @@ #include "painting.h" +#include + class GraphicLine : public Painting { public: diff --git a/qucs/paintings/graphictext.cpp b/qucs/paintings/graphictext.cpp index 7ce86ef0..afe82b84 100644 --- a/qucs/paintings/graphictext.cpp +++ b/qucs/paintings/graphictext.cpp @@ -22,11 +22,6 @@ #include "graphictextdialog.h" #include "schematic.h" #include "qucs.h" -#include -#include -#include -#include -#include #include diff --git a/qucs/paintings/graphictext.h b/qucs/paintings/graphictext.h index b84370df..0d9b5a59 100644 --- a/qucs/paintings/graphictext.h +++ b/qucs/paintings/graphictext.h @@ -20,6 +20,10 @@ #include "painting.h" +#include +#include +#include + class GraphicText : public Painting { public: diff --git a/qucs/paintings/graphictextdialog.h b/qucs/paintings/graphictextdialog.h index ee1138e5..1c5ba830 100644 --- a/qucs/paintings/graphictextdialog.h +++ b/qucs/paintings/graphictextdialog.h @@ -19,7 +19,6 @@ #define GRAPHICTEXTDIALOG_H #include -#include class QLineEdit; class QTextEdit; diff --git a/qucs/paintings/id_dialog.h b/qucs/paintings/id_dialog.h index 12e18b55..8f0694c8 100644 --- a/qucs/paintings/id_dialog.h +++ b/qucs/paintings/id_dialog.h @@ -20,9 +20,6 @@ #include #include -//Added by qt3to4: -#include - class ID_Text; class Q3ListView; diff --git a/qucs/paintings/painting.cpp b/qucs/paintings/painting.cpp index b6c5b080..e969e0c4 100644 --- a/qucs/paintings/painting.cpp +++ b/qucs/paintings/painting.cpp @@ -16,8 +16,6 @@ ***************************************************************************/ #include #include "painting.h" -#include -using namespace std; Painting::Painting() { diff --git a/qucs/paintings/painting.h b/qucs/paintings/painting.h index 604ed6ba..f60f29a7 100644 --- a/qucs/paintings/painting.h +++ b/qucs/paintings/painting.h @@ -20,8 +20,6 @@ #include "element.h" #include "viewpainter.h" -//class QPainter; -//class Schematic; class Painting : public Element { diff --git a/qucs/paintings/portsymbol.h b/qucs/paintings/portsymbol.h index 42f9d71e..c80b0c11 100644 --- a/qucs/paintings/portsymbol.h +++ b/qucs/paintings/portsymbol.h @@ -20,6 +20,7 @@ #include "painting.h" +#include class PortSymbol : public Painting { public: diff --git a/qucs/paintings/rectangle.cpp b/qucs/paintings/rectangle.cpp index e09bbf26..11be7a98 100644 --- a/qucs/paintings/rectangle.cpp +++ b/qucs/paintings/rectangle.cpp @@ -17,11 +17,6 @@ #include #include "rectangle.h" #include "filldialog.h" - -#include -#include -#include -#include #include "schematic.h" Rectangle::Rectangle(bool _filled)