Clean up main.h inclusion list

qucs/components/libcomp.cpp

@@ -18,6 +18,7 @@
 #include "libcomp.h"
 #include "main.h"
 #include "misc.h"
+#include "node.h"
 #include "extsimkernels/qucs2spice.h"
 #include "extsimkernels/spicecompat.h"
 

qucs/components/mutual2.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "main.h"
+#include "node.h"
 #include "mutual2.h"
 
 #include<QFontMetrics>

qucs/components/rfedd.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 #include "rfedd.h"
 #include "main.h"
+#include "node.h"
 
 #include <QFileInfo>
 #include <QFontMetrics>

qucs/components/rfedd2p.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 #include "rfedd2p.h"
 #include "main.h"
+#include "node.h"
 
 #include <QFileInfo>
 #include <QFontMetrics>

qucs/components/rlcg.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 #include "main.h"
 #include "rlcg.h"
+#include "node.h"
 
 #include "extsimkernels/spicecompat.h"
 

qucs/components/sparamfile.cpp

@@ -17,6 +17,7 @@
 #include "sparamfile.h"
 #include "main.h"
 #include "misc.h"
+#include "node.h"
 
 #include <QFileInfo>
 

qucs/components/spicefile.cpp

@@ -33,6 +33,7 @@
 
 #include "spicefile.h"
 #include "main.h"
+#include "node.h"
 #include "qucs.h"
 #include "misc.h"
 #include "extsimkernels/spicecompat.h"

qucs/components/verilogfile.cpp

@@ -18,6 +18,7 @@
 #include "verilogfile.h"
 #include "main.h"
 #include "misc.h"
+#include "node.h"
 
 #include <QTextStream>
 #include <QRegularExpression>

qucs/components/vhdlfile.cpp

@@ -17,6 +17,7 @@
 #include "vhdlfile.h"
 #include "main.h"
 #include "misc.h"
+#include "node.h"
 
 #include <QTextStream>
 #include <QRegularExpression>

qucs/dialogs/labeldialog.cpp

@@ -17,6 +17,7 @@
 #include "labeldialog.h"
 #include "../wirelabel.h"
 #include "main.h"
+#include "extsimkernels/spicecompat.h"
 
 #include <QLabel>
 #include <QLineEdit>

qucs/main.h

@@ -27,10 +27,6 @@
 #include <QStringList>
 #include <QDir>
 
-#include "wire.h"
-#include "node.h"
-#include "diagrams/diagram.h"
-#include "extsimkernels/spicecompat.h"
 
 class QucsApp;
 class Component;

qucs/module.h

@@ -21,6 +21,7 @@
 #include <QList>
 #include <QHash>
 #include <QMap>
+#include "component.h"
 
 class QPixmap;
 

qucs/qucs_init.cpp

@@ -22,6 +22,7 @@
 #include "main.h"
 #include "misc.h"
 #include "qucs.h"
+#include "extsimkernels/spicecompat.h"
 #include "octave_window.h"
 
 #include <QAction>

qucs/spicecomponents/sp_disto.cpp

@@ -18,7 +18,7 @@
 #include "main.h"
 #include "misc.h"
 #include "extsimkernels/spicecompat.h"
-
+#include <cmath>
 
 SpiceDisto::SpiceDisto()
 {
@@ -93,8 +93,8 @@ QString SpiceDisto::spice_netlist(bool isXyce)
             Fstart *= fac;
             misc::str2num(Props.at(2)->Value,Fstop,unit,fac);
             Fstop *= fac;
-            double Nd = ceil(log10(Fstop/Fstart)); // number of decades
-            double Npd = ceil((Np - 1)/Nd); // points per decade
+            double Nd = std::ceil(std::log10(Fstop/Fstart)); // number of decades
+            double Npd = std::ceil((Np - 1)/Nd); // points per decade
             points = QString::number(Npd);
         } else {
             points = Props.at(3)->Value;

qucs/spicecomponents/sp_noise.cpp

@@ -18,6 +18,7 @@
 #include "main.h"
 #include "misc.h"
 #include "extsimkernels/spicecompat.h"
+#include <cmath>
 
 
 SpiceNoise::SpiceNoise()
@@ -94,8 +95,8 @@ QString SpiceNoise::spice_netlist(bool isXyce)
         Fstart *= fac;
         misc::str2num(Props.at(2)->Value,Fstop,unit,fac);
         Fstop *= fac;
-        double Nd = ceil(log10(Fstop/Fstart)); // number of decades
-        double Npd = ceil((Np - 1)/Nd); // points per decade
+        double Nd = std::ceil(std::log10(Fstop/Fstart)); // number of decades
+        double Npd = std::ceil((Np - 1)/Nd); // points per decade
         points = QString::number(Npd);
     } else {
         points = Props.at(3)->Value;

qucs/spicecomponents/spicegeneric.cpp

@@ -20,6 +20,7 @@
 #include "spicegeneric.h"
 
 #include "main.h"
+#include "node.h"
 #include "extsimkernels/spicecompat.h"
 
 

qucs/spicecomponents/spicelibcomp.cpp

@@ -18,6 +18,7 @@
 #include "spicelibcomp.h"
 #include "main.h"
 #include "misc.h"
+#include "node.h"
 #include "extsimkernels/spicecompat.h"
 
 #include <QTextStream>

qucs/spicecomponents/xspicegeneric.cpp

@@ -22,6 +22,7 @@
 #include "xspicegeneric.h"
 
 #include "main.h"
+#include "node.h"
 #include "extsimkernels/spicecompat.h"
 
 

qucs/textdoc.cpp

@@ -20,6 +20,7 @@ Copyright (C) 2014 by Guilherme Brondani Torri <guitorri@gmail.com>
 #endif
 #include <QAction>
 #include <QMessageBox>
+#include <QTextStream>
 
 #include "main.h"
 #include "misc.h"