From 50846625129121eb4c6be33db5807599054e5b63 Mon Sep 17 00:00:00 2001 From: Vadim Kuznetsov Date: Tue, 15 Feb 2022 22:41:25 +0100 Subject: [PATCH] Remove QtCore include to supress warning on Qt5.12 --- qucs/components/eqndefined.cpp | 7 ++++++- qucs/extsimkernels/abstractspicekernel.h | 8 +++++++- qucs/extsimkernels/codemodelgen.h | 5 ++++- qucs/extsimkernels/externsimdialog.h | 2 +- qucs/extsimkernels/ngspice.h | 4 +++- qucs/extsimkernels/qucs2spice.h | 2 +- qucs/extsimkernels/spicecompat.cpp | 2 ++ qucs/extsimkernels/spicecompat.h | 3 ++- qucs/extsimkernels/verilogawriter.h | 4 +++- qucs/extsimkernels/xspice_cmbuilder.h | 4 +++- qucs/extsimkernels/xyce.h | 5 ++++- qucs/qt3_compat/q3gdict.cpp | 3 ++- qucs/qt3_compat/q3gdict.h | 1 - qucs/qt3_compat/q3valuelist.h | 23 +++++++---------------- qucs/spicecomponents/spicegeneric.cpp | 2 +- qucs/spicecomponents/xspicegeneric.cpp | 3 ++- 16 files changed, 48 insertions(+), 30 deletions(-) diff --git a/qucs/components/eqndefined.cpp b/qucs/components/eqndefined.cpp index 1a395d3b..9c55fcd3 100644 --- a/qucs/components/eqndefined.cpp +++ b/qucs/components/eqndefined.cpp @@ -19,7 +19,12 @@ #include "schematic.h" #include "extsimkernels/spicecompat.h" #include "extsimkernels/verilogawriter.h" -#include + +#include +#include +#include +#include +#include #include diff --git a/qucs/extsimkernels/abstractspicekernel.h b/qucs/extsimkernels/abstractspicekernel.h index 96d83e89..374346c7 100644 --- a/qucs/extsimkernels/abstractspicekernel.h +++ b/qucs/extsimkernels/abstractspicekernel.h @@ -20,7 +20,13 @@ #ifndef ABSTRACTSPICEKERNEL_H #define ABSTRACTSPICEKERNEL_H -#include +#include +#include +#include +#include +#include +#include + #include "schematic.h" /*! diff --git a/qucs/extsimkernels/codemodelgen.h b/qucs/extsimkernels/codemodelgen.h index 99b36a44..44326088 100644 --- a/qucs/extsimkernels/codemodelgen.h +++ b/qucs/extsimkernels/codemodelgen.h @@ -23,7 +23,10 @@ #ifndef CODEMODELGEN_H #define CODEMODELGEN_H -#include +#include +#include +#include + #include /*! diff --git a/qucs/extsimkernels/externsimdialog.h b/qucs/extsimkernels/externsimdialog.h index c65647d8..e39380e8 100644 --- a/qucs/extsimkernels/externsimdialog.h +++ b/qucs/extsimkernels/externsimdialog.h @@ -19,7 +19,7 @@ #define EXTERNSIMDIALOG_H #include -#include + #include "schematic.h" #include "ngspice.h" #include "xyce.h" diff --git a/qucs/extsimkernels/ngspice.h b/qucs/extsimkernels/ngspice.h index ca8a71cb..f47e92a6 100644 --- a/qucs/extsimkernels/ngspice.h +++ b/qucs/extsimkernels/ngspice.h @@ -19,7 +19,9 @@ #ifndef NGSPICE_H #define NGSPICE_H -#include +#include +#include +#include #include "schematic.h" #include "abstractspicekernel.h" diff --git a/qucs/extsimkernels/qucs2spice.h b/qucs/extsimkernels/qucs2spice.h index 91c7dd98..284bc5f4 100644 --- a/qucs/extsimkernels/qucs2spice.h +++ b/qucs/extsimkernels/qucs2spice.h @@ -20,7 +20,7 @@ #ifndef QUCS2SPICE_H #define QUCS2SPICE_H -#include +#include /*! \file qucs2spice.h diff --git a/qucs/extsimkernels/spicecompat.cpp b/qucs/extsimkernels/spicecompat.cpp index 6afa3bd1..2cecd3b8 100644 --- a/qucs/extsimkernels/spicecompat.cpp +++ b/qucs/extsimkernels/spicecompat.cpp @@ -1,6 +1,8 @@ #include "spicecompat.h" #include "main.h" +#include + /*! * \brief spicecompat::check_refdes If starting letters of the component name * match spice model (i.e. R1, C1, L1)returns Name. Otherwise function diff --git a/qucs/extsimkernels/spicecompat.h b/qucs/extsimkernels/spicecompat.h index 5ebf2a49..e5a28c22 100644 --- a/qucs/extsimkernels/spicecompat.h +++ b/qucs/extsimkernels/spicecompat.h @@ -1,7 +1,8 @@ #ifndef SPICECOMPAT_H #define SPICECOMPAT_H -#include +#include +#include /*! \brief spicecompat namespace contains definitions responsible diff --git a/qucs/extsimkernels/verilogawriter.h b/qucs/extsimkernels/verilogawriter.h index 073487b8..49a9b085 100644 --- a/qucs/extsimkernels/verilogawriter.h +++ b/qucs/extsimkernels/verilogawriter.h @@ -23,7 +23,9 @@ #ifndef VERILOGAWRITER_H #define VERILOGAWRITER_H -#include +#include +#include +#include #include /*! diff --git a/qucs/extsimkernels/xspice_cmbuilder.h b/qucs/extsimkernels/xspice_cmbuilder.h index 42e890df..45a8d60d 100644 --- a/qucs/extsimkernels/xspice_cmbuilder.h +++ b/qucs/extsimkernels/xspice_cmbuilder.h @@ -19,7 +19,9 @@ #ifndef XSPICE_CMBUILDER_H #define XSPICE_CMBUILDER_H -#include +#include +#include +#include #include "schematic.h" class XSPICE_CMbuilder diff --git a/qucs/extsimkernels/xyce.h b/qucs/extsimkernels/xyce.h index f77e6a5d..a2e53a62 100644 --- a/qucs/extsimkernels/xyce.h +++ b/qucs/extsimkernels/xyce.h @@ -18,7 +18,10 @@ #ifndef XYCE_H #define XYCE_H -#include +#include +#include +#include +#include #include "abstractspicekernel.h" /*! diff --git a/qucs/qt3_compat/q3gdict.cpp b/qucs/qt3_compat/q3gdict.cpp index 44f58d27..9de5962e 100644 --- a/qucs/qt3_compat/q3gdict.cpp +++ b/qucs/qt3_compat/q3gdict.cpp @@ -41,7 +41,8 @@ #include "q3gdict.h" #include "qt_compat.h" -#include +#include +#include #include #include diff --git a/qucs/qt3_compat/q3gdict.h b/qucs/qt3_compat/q3gdict.h index 2c21c4f6..dc7b7ca5 100644 --- a/qucs/qt3_compat/q3gdict.h +++ b/qucs/qt3_compat/q3gdict.h @@ -43,7 +43,6 @@ #define Q3GDICT_H #include "q3ptrcollection.h" -#include class Q3GDictIterator; class Q3GDItList; diff --git a/qucs/qt3_compat/q3valuelist.h b/qucs/qt3_compat/q3valuelist.h index cf3f375c..0ba9e779 100644 --- a/qucs/qt3_compat/q3valuelist.h +++ b/qucs/qt3_compat/q3valuelist.h @@ -42,22 +42,16 @@ #ifndef Q3VALUELIST_H #define Q3VALUELIST_H -#include -#include -#include -#include +#include +#include +#include +#include #ifndef QT_NO_STL #include #include #endif -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Qt3SupportLight) - template class Q3ValueListIterator : public QLinkedList::iterator { @@ -210,7 +204,7 @@ public: }; template -Q_OUTOFLINE_TEMPLATE void Q3ValueList::insert(typename Q3ValueList::Iterator pos, +void Q3ValueList::insert(typename Q3ValueList::Iterator pos, typename Q3ValueList::size_type n, const T& x) { for (; n > 0; --n) @@ -219,20 +213,17 @@ Q_OUTOFLINE_TEMPLATE void Q3ValueList::insert(typename Q3ValueList::Iterat #ifndef QT_NO_DATASTREAM template -Q_OUTOFLINE_TEMPLATE QDataStream& operator>>(QDataStream& s, Q3ValueList& l) +QDataStream& operator>>(QDataStream& s, Q3ValueList& l) { return operator>>(s, static_cast &>(l)); } template -Q_OUTOFLINE_TEMPLATE QDataStream& operator<<(QDataStream& s, const Q3ValueList& l) +QDataStream& operator<<(QDataStream& s, const Q3ValueList& l) { return operator<<(s, static_cast &>(l)); } #endif -QT_END_NAMESPACE - -QT_END_HEADER #endif // Q3VALUELIST_H diff --git a/qucs/spicecomponents/spicegeneric.cpp b/qucs/spicecomponents/spicegeneric.cpp index 66427c0e..92de539a 100644 --- a/qucs/spicecomponents/spicegeneric.cpp +++ b/qucs/spicecomponents/spicegeneric.cpp @@ -14,7 +14,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include #include #include "spicegeneric.h" diff --git a/qucs/spicecomponents/xspicegeneric.cpp b/qucs/spicecomponents/xspicegeneric.cpp index 42eb5445..3fb66877 100644 --- a/qucs/spicecomponents/xspicegeneric.cpp +++ b/qucs/spicecomponents/xspicegeneric.cpp @@ -14,7 +14,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include +#include #include #include "xspicegeneric.h"