From 9b42049abeec8df03180ed2573459dd45fb28674 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 7 May 2017 23:52:20 +0200 Subject: [PATCH] clang compatibility Fixed some compile issues with clang and some warnings. --- scripts/mkqtdecl_common/produce.rb | 6 ++-- src/db/dbArray.h | 6 ++-- src/db/dbCellHullGenerator.cc | 4 +-- src/db/dbCellHullGenerator.h | 1 - src/db/dbEdge.h | 2 +- src/db/dbLibraryManager.cc | 1 + src/db/dbLibraryManager.h | 5 ---- src/db/dbPCellVariant.h | 1 - src/db/dbPolygon.h | 2 +- src/db/dbPolygonGenerators.cc | 3 +- src/db/dbPolygonTools.cc | 4 +-- src/db/dbShapeIterator.cc | 2 +- src/db/dbStream.cc | 1 + src/db/dbStream.h | 6 ---- src/db/dbTilingProcessor.cc | 6 +--- src/db/dbTrans.h | 2 +- src/db/dbUserObject.cc | 2 ++ src/db/dbUserObject.h | 4 --- src/edt/edtMainService.cc | 3 +- src/edt/edtService.cc | 2 -- src/edt/edtService.h | 1 - src/gsi/gsiClass.h | 13 -------- src/gsi/gsiExpression.cc | 2 +- src/gsi/gsiExpression.h | 4 +-- src/gsi/gsiMethodsVar.h | 12 ++++---- src/gsi/gsiTypes.h | 5 ++-- ...AbstractTextDocumentLayout_PaintContext.cc | 2 +- ...clQAbstractTextDocumentLayout_Selection.cc | 2 +- src/gsiqt4/gsiDeclQFactoryInterface.cc | 2 +- src/gsiqt4/gsiDeclQMetaObject.cc | 2 +- .../gsiDeclQTextCodec_ConverterState.cc | 2 +- src/gsiqt4/gsiDeclQTextEdit_ExtraSelection.cc | 2 +- src/gsiqt4/gsiDeclQTextLayout_FormatRange.cc | 2 +- src/gsiqt4/gsiDeclQTextOption_Tab.cc | 2 +- src/gsiqt4/gsiDeclQtTypeTraits.h | 4 +-- src/gsiqt4/gsiQtExternals.h | 4 +-- ...iDeclQAbstractEventDispatcher_TimerInfo.cc | 2 +- ...AbstractTextDocumentLayout_PaintContext.cc | 2 +- ...clQAbstractTextDocumentLayout_Selection.cc | 2 +- src/gsiqt5/gsiDeclQAccessible_State.cc | 2 +- .../gsiDeclQAudioSystemFactoryInterface.cc | 2 +- src/gsiqt5/gsiDeclQByteArrayDataPtr.cc | 2 +- src/gsiqt5/gsiDeclQCamera_FrameRateRange.cc | 2 +- src/gsiqt5/gsiDeclQFactoryInterface.cc | 2 +- ...iDeclQIconEngine_AvailableSizesArgument.cc | 2 +- src/gsiqt5/gsiDeclQJsonParseError.cc | 2 +- src/gsiqt5/gsiDeclQMapDataBase.cc | 2 +- src/gsiqt5/gsiDeclQMapNodeBase.cc | 2 +- ...gsiDeclQMediaServiceCameraInfoInterface.cc | 2 +- ...DeclQMediaServiceDefaultDeviceInterface.cc | 2 +- .../gsiDeclQMediaServiceFeaturesInterface.cc | 2 +- ...clQMediaServiceProviderFactoryInterface.cc | 2 +- ...lQMediaServiceSupportedDevicesInterface.cc | 2 +- ...lQMediaServiceSupportedFormatsInterface.cc | 2 +- src/gsiqt5/gsiDeclQMetaObject.cc | 2 +- .../gsiDeclQPagedPaintDevice_Margins.cc | 2 +- src/gsiqt5/gsiDeclQStaticPlugin.cc | 2 +- src/gsiqt5/gsiDeclQStringDataPtr.cc | 2 +- .../gsiDeclQTextCodec_ConverterState.cc | 2 +- src/gsiqt5/gsiDeclQTextEdit_ExtraSelection.cc | 2 +- src/gsiqt5/gsiDeclQTextLayout_FormatRange.cc | 2 +- src/gsiqt5/gsiDeclQTextOption_Tab.cc | 2 +- src/gsiqt5/gsiDeclQTimeZone_OffsetData.cc | 2 +- src/gsiqt5/gsiDeclQtTypeTraits.h | 30 +++++++++---------- src/gsiqt5/gsiQtExternals.h | 30 +++++++++---------- src/img/imgLandmarksDialog.cc | 3 +- src/lay/layHelpProvider.cc | 10 ++++--- src/lay/layMacroInterpreter.cc | 8 +++-- src/lay/layMacroInterpreter.h | 6 ---- src/laybasic/layDrawing.cc | 2 +- src/laybasic/layDrawing.h | 1 - src/laybasic/layParsedLayerSource.h | 2 +- src/laybasic/layPlugin.cc | 6 +++- src/laybasic/layPlugin.h | 3 -- src/laybasic/layRedrawLayerInfo.h | 2 +- src/rba/rba.h | 2 +- src/rdb/rdbFile.cc | 12 ++++---- src/rdb/rdbReader.h | 5 ---- src/tl/tlFileSystemWatcher.cc | 3 -- src/tl/tlObjectCollection.h | 8 +++++ src/tl/tlVariant.h | 2 +- src/unit_tests/gsiTest.h | 2 +- src/unit_tests/tlClassRegistry.cc | 8 +++-- src/unit_tests/tlDeferredExecution.cc | 2 -- 84 files changed, 145 insertions(+), 180 deletions(-) diff --git a/scripts/mkqtdecl_common/produce.rb b/scripts/mkqtdecl_common/produce.rb index 85dad6166..780736aed 100755 --- a/scripts/mkqtdecl_common/produce.rb +++ b/scripts/mkqtdecl_common/produce.rb @@ -1833,7 +1833,7 @@ END ofile.puts("") ofile.puts("// -----------------------------------------------------------------------") - ofile.puts("// class #{cls}") + ofile.puts("// #{struct.kind.to_s} #{cls}") if has_metaobject @@ -2287,7 +2287,7 @@ END if !is_child_class # only for top-level classes external declarations are produced currently - @ext_decls << "class #{cls};\nnamespace gsi { GSIQT_PUBLIC gsi::Class<#{cls}> &qtdecl_#{clsn} (); }\n\n" + @ext_decls << "#{struct.kind.to_s} #{cls};\nnamespace gsi { GSIQT_PUBLIC gsi::Class<#{cls}> &qtdecl_#{clsn} (); }\n\n" end ofile.puts("") @@ -2835,7 +2835,7 @@ END if cls =~ /^(.*?)::/ ttfile.puts("#include <#{$1}>") else - ttfile.puts("class #{cls};") + ttfile.puts("#{struct.kind.to_s} #{cls};") end ttfile.puts("namespace tl {") diff --git a/src/db/dbArray.h b/src/db/dbArray.h index 303cc057f..083a02843 100644 --- a/src/db/dbArray.h +++ b/src/db/dbArray.h @@ -2213,7 +2213,7 @@ private: trans_type m_trans; basic_array *mp_base; - void transform_into_from (const unit_trans_type &tr, const array &d) + void transform_into_from (const unit_trans_type & /*tr*/, const array & /*d*/) { // .. nothing to do .. } @@ -2249,7 +2249,7 @@ private: set_complex (t.mag (), t.rcos (), d); } - void translate_from (const unit_trans_type &tr, const array &d, db::generic_repository &rep, db::ArrayRepository &array_rep) + void translate_from (const unit_trans_type & /*tr*/, const array & /*d*/, db::generic_repository & /*rep*/, db::ArrayRepository & /*array_rep*/) { // .. nothing to do .. } @@ -2297,7 +2297,7 @@ private: } } - void transform_from (const unit_trans_type &tr, const array &d) + void transform_from (const unit_trans_type & /*tr*/, const array & /*d*/) { // .. nothing to do .. } diff --git a/src/db/dbCellHullGenerator.cc b/src/db/dbCellHullGenerator.cc index fe6221985..ef912ffef 100644 --- a/src/db/dbCellHullGenerator.cc +++ b/src/db/dbCellHullGenerator.cc @@ -202,7 +202,7 @@ private: const size_t default_complexity = 100; CellHullGenerator::CellHullGenerator (const db::Layout &layout) - : mp_layout (&layout), m_all_layers (true), m_small_cell_size (100), m_complexity (default_complexity) + : m_all_layers (true), m_small_cell_size (100), m_complexity (default_complexity) { for (db::Layout::layer_iterator l = layout.begin_layers (); l != layout.end_layers (); ++l) { m_layers.push_back ((*l).first); @@ -210,7 +210,7 @@ CellHullGenerator::CellHullGenerator (const db::Layout &layout) } CellHullGenerator::CellHullGenerator (const db::Layout &layout, const std::vector &layers) - : mp_layout (&layout), m_all_layers (true), m_small_cell_size (100), m_complexity (default_complexity) + : m_all_layers (true), m_small_cell_size (100), m_complexity (default_complexity) { std::set ll; ll.insert (layers.begin (), layers.end ()); diff --git a/src/db/dbCellHullGenerator.h b/src/db/dbCellHullGenerator.h index a54494a65..787a83956 100644 --- a/src/db/dbCellHullGenerator.h +++ b/src/db/dbCellHullGenerator.h @@ -61,7 +61,6 @@ public: } private: - const db::Layout *mp_layout; std::vector m_layers; bool m_all_layers; db::Coord m_small_cell_size; diff --git a/src/db/dbEdge.h b/src/db/dbEdge.h index ee022ae78..034a965e3 100644 --- a/src/db/dbEdge.h +++ b/src/db/dbEdge.h @@ -589,7 +589,7 @@ public: * * @return The transformation that must be applied to render the original edge */ - void reduce (unit_trans &tr) + void reduce (unit_trans & /*tr*/) { // .. no reduction possible .. } diff --git a/src/db/dbLibraryManager.cc b/src/db/dbLibraryManager.cc index 1eac69871..a15d9be50 100644 --- a/src/db/dbLibraryManager.cc +++ b/src/db/dbLibraryManager.cc @@ -34,6 +34,7 @@ namespace tl { template<> DB_PUBLIC tl::Registrar *tl::Registrar::instance = 0; + template class DB_PUBLIC tl::RegisteredClass; } namespace db diff --git a/src/db/dbLibraryManager.h b/src/db/dbLibraryManager.h index 69a3647be..17839fdb9 100644 --- a/src/db/dbLibraryManager.h +++ b/src/db/dbLibraryManager.h @@ -152,11 +152,6 @@ private: } -namespace tl -{ - // make registration available to external DLL's - template class DB_PUBLIC tl::RegisteredClass; -} #endif diff --git a/src/db/dbPCellVariant.h b/src/db/dbPCellVariant.h index e0b07ec46..49436b67b 100644 --- a/src/db/dbPCellVariant.h +++ b/src/db/dbPCellVariant.h @@ -151,7 +151,6 @@ protected: private: pcell_parameters_type m_parameters; mutable std::string m_display_name; - mutable bool m_valid_display_name; size_t m_pcell_id; bool m_registered; }; diff --git a/src/db/dbPolygon.h b/src/db/dbPolygon.h index 5217ce508..657e056c8 100644 --- a/src/db/dbPolygon.h +++ b/src/db/dbPolygon.h @@ -2665,7 +2665,7 @@ public: * * Asserts, if begin called. */ - const contour_type &hole (unsigned int h) const + const contour_type &hole (unsigned int /*h*/) const { tl_assert (false); return hull (); // to please the compiler diff --git a/src/db/dbPolygonGenerators.cc b/src/db/dbPolygonGenerators.cc index 2d9f09448..660daf747 100644 --- a/src/db/dbPolygonGenerators.cc +++ b/src/db/dbPolygonGenerators.cc @@ -153,7 +153,7 @@ class PGContourList { public: PGContourList () - : m_free_contours (-1), m_next_id (1) + : m_free_contours (-1) { } PGPolyContour &operator[] (size_t n) @@ -240,7 +240,6 @@ public: private: long m_free_contours; - size_t m_next_id; std::vector m_contours; }; diff --git a/src/db/dbPolygonTools.cc b/src/db/dbPolygonTools.cc index 45fade572..c6c62f36f 100644 --- a/src/db/dbPolygonTools.cc +++ b/src/db/dbPolygonTools.cc @@ -694,7 +694,7 @@ smooth_contour (db::Polygon::polygon_contour_iterator from, db::Polygon::polygon bool can_drop = false; - if (db::Coord(p1.distance(p0)) <= d && db::sprod_sign (p2 - p1, p0 - pm1) > 0 && abs (db::vprod (p2 - p1, p0 - pm1)) < 0.8 * p2.distance (p1) * p0.distance (pm1)) { + if (db::Coord (p1.distance(p0)) <= d && db::sprod_sign (p2 - p1, p0 - pm1) > 0 && std::abs (db::vprod (p2 - p1, p0 - pm1)) < 0.8 * p2.distance (p1) * p0.distance (pm1)) { // jog configurations with small edges are candidates can_drop = true; } else if (db::vprod_sign (p2 - p1, p1 - p0) < 0) { @@ -702,7 +702,7 @@ smooth_contour (db::Polygon::polygon_contour_iterator from, db::Polygon::polygon can_drop = true; } else { // convex corners enclosing a little more than 45 degree are candidates too - can_drop = (db::sprod_sign (p2 - p1, p1 - p0) > 0 && abs (db::vprod (p2 - p1, p1 - p0)) < 0.8 * p2.distance (p1) * p1.distance (p0)); + can_drop = (db::sprod_sign (p2 - p1, p1 - p0) > 0 && std::abs (db::vprod (p2 - p1, p1 - p0)) < 0.8 * p2.distance (p1) * p1.distance (p0)); } for (size_t j = pi0; can_drop; ) { diff --git a/src/db/dbShapeIterator.cc b/src/db/dbShapeIterator.cc index 1b7e34f09..82091f5e2 100644 --- a/src/db/dbShapeIterator.cc +++ b/src/db/dbShapeIterator.cc @@ -31,7 +31,7 @@ namespace db template inline db::Shape -iterator_to_shape (db::Shapes *shapes, const db::layer &l, const Iter &iter) +iterator_to_shape (db::Shapes *shapes, const db::layer & /*l*/, const Iter &iter) { // for unstable containers, we simply use the pointer as a reference return db::Shape (shapes, *iter); diff --git a/src/db/dbStream.cc b/src/db/dbStream.cc index e1c8c61e3..d77b279c0 100644 --- a/src/db/dbStream.cc +++ b/src/db/dbStream.cc @@ -29,6 +29,7 @@ namespace tl { template<> DB_PUBLIC tl::Registrar *tl::Registrar::instance = 0; + template class DB_PUBLIC tl::RegisteredClass; } namespace db diff --git a/src/db/dbStream.h b/src/db/dbStream.h index 2dfba6869..fc1463988 100644 --- a/src/db/dbStream.h +++ b/src/db/dbStream.h @@ -107,12 +107,6 @@ public: } -namespace tl -{ - // make registration available to external DLL's - template class DB_PUBLIC tl::RegisteredClass; -} - #endif diff --git a/src/db/dbTilingProcessor.cc b/src/db/dbTilingProcessor.cc index 67a7b82f7..08f87f5b5 100644 --- a/src/db/dbTilingProcessor.cc +++ b/src/db/dbTilingProcessor.cc @@ -440,8 +440,7 @@ class TilingProcessorCountFunction : public tl::EvalFunction { public: - TilingProcessorCountFunction (TilingProcessor *proc) - : mp_proc (proc) + TilingProcessorCountFunction (TilingProcessor * /*proc*/) { // .. nothing yet .. } @@ -450,9 +449,6 @@ public: { // TODO: ... implement .. } - -private: - TilingProcessor *mp_proc; }; void diff --git a/src/db/dbTrans.h b/src/db/dbTrans.h index 323f66644..b70d66b85 100644 --- a/src/db/dbTrans.h +++ b/src/db/dbTrans.h @@ -318,7 +318,7 @@ struct unit_trans */ template inline unit_trans -operator* (const unit_trans &t1, const unit_trans &t2) +operator* (const unit_trans & /*t1*/, const unit_trans & /*t2*/) { return unit_trans(); } diff --git a/src/db/dbUserObject.cc b/src/db/dbUserObject.cc index ace35dfe6..6533a5208 100644 --- a/src/db/dbUserObject.cc +++ b/src/db/dbUserObject.cc @@ -27,7 +27,9 @@ namespace tl { template<> DB_PUBLIC tl::Registrar > *tl::Registrar >::instance = 0; + template class DB_PUBLIC tl::RegisteredClass >; template<> DB_PUBLIC tl::Registrar > *tl::Registrar >::instance = 0; + template class DB_PUBLIC tl::RegisteredClass >; } namespace db diff --git a/src/db/dbUserObject.h b/src/db/dbUserObject.h index 194a89759..0aedfde0c 100644 --- a/src/db/dbUserObject.h +++ b/src/db/dbUserObject.h @@ -503,10 +503,6 @@ typedef tl::RegisteredClass > DUserObjectDe namespace tl { - // make registration available to external DLL's - template class DB_PUBLIC tl::RegisteredClass >; - template class DB_PUBLIC tl::RegisteredClass >; - /** * @brief The type traits for the user object type */ diff --git a/src/edt/edtMainService.cc b/src/edt/edtMainService.cc index ed68863c3..de472949c 100644 --- a/src/edt/edtMainService.cc +++ b/src/edt/edtMainService.cc @@ -2012,7 +2012,7 @@ class NewObjectsSelection { public: NewObjectsSelection (int cv_index, db::cell_index_type topcell, lay::LayoutView *view) - : m_cv_index (cv_index), m_topcell (topcell), mp_view (view) + : m_cv_index (cv_index), m_topcell (topcell) { mp_polygon_service = view->get_plugin (); mp_box_service = view->get_plugin (); @@ -2071,7 +2071,6 @@ private: edt::InstService *mp_inst_service; int m_cv_index; db::cell_index_type m_topcell; - lay::LayoutView *mp_view; }; void diff --git a/src/edt/edtService.cc b/src/edt/edtService.cc index bd9b9446e..752b3123d 100644 --- a/src/edt/edtService.cc +++ b/src/edt/edtService.cc @@ -70,7 +70,6 @@ Service::Service (db::Manager *manager, lay::LayoutView *view, db::ShapeIterator m_editing (false), m_immediate (false), m_cell_inst_service (false), m_flags (flags), - m_line_width (1), m_vertex_size (3), m_move_sel (false), m_moving (false), m_connect_ac (lay::AC_Any), m_move_ac (lay::AC_Any), m_alt_ac (lay::AC_Global), m_snap_to_objects (false), @@ -92,7 +91,6 @@ Service::Service (db::Manager *manager, lay::LayoutView *view) m_editing (false), m_immediate (false), m_cell_inst_service (true), m_flags (db::ShapeIterator::Nothing), - m_line_width (1), m_vertex_size (3), m_move_sel (false), m_moving (false), m_connect_ac (lay::AC_Any), m_move_ac (lay::AC_Any), m_alt_ac (lay::AC_Global), m_snap_to_objects (true), diff --git a/src/edt/edtService.h b/src/edt/edtService.h index 1a9e5bd04..3a6d3574f 100644 --- a/src/edt/edtService.h +++ b/src/edt/edtService.h @@ -532,7 +532,6 @@ private: // The look of the markers QColor m_color; - int m_line_width, m_vertex_size; // The current transformation on movement db::DTrans m_move_trans; diff --git a/src/gsi/gsiClass.h b/src/gsi/gsiClass.h index dad3bee6c..c5d961523 100644 --- a/src/gsi/gsiClass.h +++ b/src/gsi/gsiClass.h @@ -243,19 +243,6 @@ private: // ----------------------------------------------------------------------------- // GSI implementation -template -void *_take_and_create (SerialArgs & /*args*/, tl::false_tag /*has_copy_ctor*/) -{ - tl_assert (false); // cannot copy object of this type - return 0; -} - -template -void *_take_and_create (SerialArgs &from, tl::true_tag /*has_copy_ctor*/) -{ - return from.template take_object (); -} - template void *_get_vector_of (SerialArgs & /*from*/, const ArgType & /*a*/, void * /*data*/, void (* /*cb*/) (void * /*data*/, void * /*obj*/), tl::false_tag /*has_copy_ctor*/) { diff --git a/src/gsi/gsiExpression.cc b/src/gsi/gsiExpression.cc index 08311f123..8250f2371 100644 --- a/src/gsi/gsiExpression.cc +++ b/src/gsi/gsiExpression.cc @@ -1092,7 +1092,7 @@ initialize_expressions () // VariantUserClassImpl implementation VariantUserClassImpl::VariantUserClassImpl () - : mp_cls (0), mp_self (0), mp_object_cls (0), m_reference (false), m_is_const (false) + : mp_cls (0), mp_self (0), mp_object_cls (0), m_is_const (false) { // .. nothing yet .. } diff --git a/src/gsi/gsiExpression.h b/src/gsi/gsiExpression.h index 65189c393..331ea8c59 100644 --- a/src/gsi/gsiExpression.h +++ b/src/gsi/gsiExpression.h @@ -35,7 +35,7 @@ namespace gsi { class ClassBase; -class NoAdaptorTag; +struct NoAdaptorTag; template class Class; /** @@ -59,7 +59,7 @@ public: private: const gsi::ClassBase *mp_cls; const tl::VariantUserClassBase *mp_self, *mp_object_cls; - bool m_reference, m_is_const; + bool m_is_const; virtual void execute_gsi (const tl::ExpressionParserContext &context, tl::Variant &out, tl::Variant &object, const std::string &method, const std::vector &args) const; diff --git a/src/gsi/gsiMethodsVar.h b/src/gsi/gsiMethodsVar.h index e66a65d14..be6ce90b3 100644 --- a/src/gsi/gsiMethodsVar.h +++ b/src/gsi/gsiMethodsVar.h @@ -813,9 +813,9 @@ public: } #if _COUNT != 0 - virtual void call (void *cls, SerialArgs &args, SerialArgs &ret) const + virtual void call (void * /*cls*/, SerialArgs &args, SerialArgs &ret) const #else - virtual void call (void *cls, SerialArgs &, SerialArgs &ret) const + virtual void call (void * /*cls*/, SerialArgs &, SerialArgs &ret) const #endif { this->mark_called (); @@ -862,9 +862,9 @@ public: } #if _COUNT != 0 - virtual void call (void *cls, SerialArgs &args, SerialArgs &ret) const + virtual void call (void * /*cls*/, SerialArgs &args, SerialArgs &ret) const #else - virtual void call (void *cls, SerialArgs &, SerialArgs &ret) const + virtual void call (void * /*cls*/, SerialArgs &, SerialArgs &ret) const #endif { this->mark_called (); @@ -1249,9 +1249,9 @@ public: } #if _COUNT != 0 - virtual void call (void *cls, SerialArgs &args, SerialArgs &ret) const + virtual void call (void * /*cls*/, SerialArgs &args, SerialArgs &ret) const #else - virtual void call (void *cls, SerialArgs &, SerialArgs &ret) const + virtual void call (void * /*cls*/, SerialArgs &, SerialArgs &ret) const #endif { this->mark_called (); diff --git a/src/gsi/gsiTypes.h b/src/gsi/gsiTypes.h index e13dc6734..4e8dea99d 100644 --- a/src/gsi/gsiTypes.h +++ b/src/gsi/gsiTypes.h @@ -61,7 +61,7 @@ class MapAdaptor; class StringAdaptor; class VariantAdaptor; class ClassBase; -class NoAdaptorTag; +struct NoAdaptorTag; template class Class; template struct ClassTag; template class IterAdaptor; @@ -1376,8 +1376,9 @@ public: * is an iterator delivering the given types of a vector of the given types and * adds class informations if the type is "T_object", "T_object_ref", "T_object_cref". */ -struct GSI_PUBLIC ArgType +class GSI_PUBLIC ArgType { +public: /** * @brief Default constructor * diff --git a/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc b/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc index a05f98165..fab073f25 100644 --- a/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc +++ b/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QAbstractTextDocumentLayout::PaintContext +// struct QAbstractTextDocumentLayout::PaintContext // Constructor QAbstractTextDocumentLayout::PaintContext::PaintContext() diff --git a/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_Selection.cc b/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_Selection.cc index 9fabcc57c..af72cd7e9 100644 --- a/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_Selection.cc +++ b/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_Selection.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QAbstractTextDocumentLayout::Selection +// struct QAbstractTextDocumentLayout::Selection // Constructor QAbstractTextDocumentLayout::Selection::Selection() diff --git a/src/gsiqt4/gsiDeclQFactoryInterface.cc b/src/gsiqt4/gsiDeclQFactoryInterface.cc index 2f6694da5..d270fdb90 100644 --- a/src/gsiqt4/gsiDeclQFactoryInterface.cc +++ b/src/gsiqt4/gsiDeclQFactoryInterface.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QFactoryInterface +// struct QFactoryInterface // QStringList QFactoryInterface::keys() diff --git a/src/gsiqt4/gsiDeclQMetaObject.cc b/src/gsiqt4/gsiDeclQMetaObject.cc index 5cfe4cf40..671de86fc 100644 --- a/src/gsiqt4/gsiDeclQMetaObject.cc +++ b/src/gsiqt4/gsiDeclQMetaObject.cc @@ -39,7 +39,7 @@ #include // ----------------------------------------------------------------------- -// class QMetaObject +// struct QMetaObject // Constructor QMetaObject::QMetaObject() diff --git a/src/gsiqt4/gsiDeclQTextCodec_ConverterState.cc b/src/gsiqt4/gsiDeclQTextCodec_ConverterState.cc index 1e6102d3a..db0698b02 100644 --- a/src/gsiqt4/gsiDeclQTextCodec_ConverterState.cc +++ b/src/gsiqt4/gsiDeclQTextCodec_ConverterState.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QTextCodec::ConverterState +// struct QTextCodec::ConverterState // Constructor QTextCodec::ConverterState::ConverterState(QFlags f) diff --git a/src/gsiqt4/gsiDeclQTextEdit_ExtraSelection.cc b/src/gsiqt4/gsiDeclQTextEdit_ExtraSelection.cc index 905b20432..dfef674cc 100644 --- a/src/gsiqt4/gsiDeclQTextEdit_ExtraSelection.cc +++ b/src/gsiqt4/gsiDeclQTextEdit_ExtraSelection.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QTextEdit::ExtraSelection +// struct QTextEdit::ExtraSelection // Constructor QTextEdit::ExtraSelection::ExtraSelection() diff --git a/src/gsiqt4/gsiDeclQTextLayout_FormatRange.cc b/src/gsiqt4/gsiDeclQTextLayout_FormatRange.cc index 807795a4d..68cfd0efd 100644 --- a/src/gsiqt4/gsiDeclQTextLayout_FormatRange.cc +++ b/src/gsiqt4/gsiDeclQTextLayout_FormatRange.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QTextLayout::FormatRange +// struct QTextLayout::FormatRange // Constructor QTextLayout::FormatRange::FormatRange() diff --git a/src/gsiqt4/gsiDeclQTextOption_Tab.cc b/src/gsiqt4/gsiDeclQTextOption_Tab.cc index b8cb4f919..1c3fe3aad 100644 --- a/src/gsiqt4/gsiDeclQTextOption_Tab.cc +++ b/src/gsiqt4/gsiDeclQTextOption_Tab.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QTextOption::Tab +// struct QTextOption::Tab // Constructor QTextOption::Tab::Tab() diff --git a/src/gsiqt4/gsiDeclQtTypeTraits.h b/src/gsiqt4/gsiDeclQtTypeTraits.h index 4fa9d5abc..ff2dc23ed 100644 --- a/src/gsiqt4/gsiDeclQtTypeTraits.h +++ b/src/gsiqt4/gsiDeclQtTypeTraits.h @@ -1198,7 +1198,7 @@ template <> struct type_traits : public type_traits { }; } -class QFactoryInterface; +struct QFactoryInterface; namespace tl { template <> struct type_traits : public type_traits { typedef tl::false_tag has_copy_constructor; @@ -2775,7 +2775,7 @@ template <> struct type_traits : public type_traits { }; } -class QMetaObject; +struct QMetaObject; namespace tl { template <> struct type_traits : public type_traits { }; diff --git a/src/gsiqt4/gsiQtExternals.h b/src/gsiqt4/gsiQtExternals.h index c6747cf18..b972a7063 100644 --- a/src/gsiqt4/gsiQtExternals.h +++ b/src/gsiqt4/gsiQtExternals.h @@ -339,7 +339,7 @@ namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QEvent (); } class QEventLoop; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QEventLoop (); } -class QFactoryInterface; +struct QFactoryInterface; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFactoryInterface (); } class QFile; @@ -729,7 +729,7 @@ namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMetaEnum (); } class QMetaMethod; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMetaMethod (); } -class QMetaObject; +struct QMetaObject; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMetaObject (); } class QMetaProperty; diff --git a/src/gsiqt5/gsiDeclQAbstractEventDispatcher_TimerInfo.cc b/src/gsiqt5/gsiDeclQAbstractEventDispatcher_TimerInfo.cc index d4ad211da..b531e35ba 100644 --- a/src/gsiqt5/gsiDeclQAbstractEventDispatcher_TimerInfo.cc +++ b/src/gsiqt5/gsiDeclQAbstractEventDispatcher_TimerInfo.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QAbstractEventDispatcher::TimerInfo +// struct QAbstractEventDispatcher::TimerInfo // Constructor QAbstractEventDispatcher::TimerInfo::TimerInfo(int id, int i, Qt::TimerType t) diff --git a/src/gsiqt5/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc b/src/gsiqt5/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc index a05f98165..fab073f25 100644 --- a/src/gsiqt5/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc +++ b/src/gsiqt5/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QAbstractTextDocumentLayout::PaintContext +// struct QAbstractTextDocumentLayout::PaintContext // Constructor QAbstractTextDocumentLayout::PaintContext::PaintContext() diff --git a/src/gsiqt5/gsiDeclQAbstractTextDocumentLayout_Selection.cc b/src/gsiqt5/gsiDeclQAbstractTextDocumentLayout_Selection.cc index 9fabcc57c..af72cd7e9 100644 --- a/src/gsiqt5/gsiDeclQAbstractTextDocumentLayout_Selection.cc +++ b/src/gsiqt5/gsiDeclQAbstractTextDocumentLayout_Selection.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QAbstractTextDocumentLayout::Selection +// struct QAbstractTextDocumentLayout::Selection // Constructor QAbstractTextDocumentLayout::Selection::Selection() diff --git a/src/gsiqt5/gsiDeclQAccessible_State.cc b/src/gsiqt5/gsiDeclQAccessible_State.cc index 05a100402..eba3896b0 100644 --- a/src/gsiqt5/gsiDeclQAccessible_State.cc +++ b/src/gsiqt5/gsiDeclQAccessible_State.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QAccessible::State +// struct QAccessible::State // Constructor QAccessible::State::State() diff --git a/src/gsiqt5/gsiDeclQAudioSystemFactoryInterface.cc b/src/gsiqt5/gsiDeclQAudioSystemFactoryInterface.cc index cd8c0a72f..6950126c8 100644 --- a/src/gsiqt5/gsiDeclQAudioSystemFactoryInterface.cc +++ b/src/gsiqt5/gsiDeclQAudioSystemFactoryInterface.cc @@ -37,7 +37,7 @@ #include // ----------------------------------------------------------------------- -// class QAudioSystemFactoryInterface +// struct QAudioSystemFactoryInterface // QList QAudioSystemFactoryInterface::availableDevices(QAudio::Mode) diff --git a/src/gsiqt5/gsiDeclQByteArrayDataPtr.cc b/src/gsiqt5/gsiDeclQByteArrayDataPtr.cc index 7fe104c40..1ad818cba 100644 --- a/src/gsiqt5/gsiDeclQByteArrayDataPtr.cc +++ b/src/gsiqt5/gsiDeclQByteArrayDataPtr.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QByteArrayDataPtr +// struct QByteArrayDataPtr // Constructor QByteArrayDataPtr::QByteArrayDataPtr() diff --git a/src/gsiqt5/gsiDeclQCamera_FrameRateRange.cc b/src/gsiqt5/gsiDeclQCamera_FrameRateRange.cc index 2b4519dbb..61590305d 100644 --- a/src/gsiqt5/gsiDeclQCamera_FrameRateRange.cc +++ b/src/gsiqt5/gsiDeclQCamera_FrameRateRange.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QCamera::FrameRateRange +// struct QCamera::FrameRateRange // Constructor QCamera::FrameRateRange::FrameRateRange() diff --git a/src/gsiqt5/gsiDeclQFactoryInterface.cc b/src/gsiqt5/gsiDeclQFactoryInterface.cc index 2f6694da5..d270fdb90 100644 --- a/src/gsiqt5/gsiDeclQFactoryInterface.cc +++ b/src/gsiqt5/gsiDeclQFactoryInterface.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QFactoryInterface +// struct QFactoryInterface // QStringList QFactoryInterface::keys() diff --git a/src/gsiqt5/gsiDeclQIconEngine_AvailableSizesArgument.cc b/src/gsiqt5/gsiDeclQIconEngine_AvailableSizesArgument.cc index 5dd124932..b657189e5 100644 --- a/src/gsiqt5/gsiDeclQIconEngine_AvailableSizesArgument.cc +++ b/src/gsiqt5/gsiDeclQIconEngine_AvailableSizesArgument.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QIconEngine::AvailableSizesArgument +// struct QIconEngine::AvailableSizesArgument // Constructor QIconEngine::AvailableSizesArgument::AvailableSizesArgument() diff --git a/src/gsiqt5/gsiDeclQJsonParseError.cc b/src/gsiqt5/gsiDeclQJsonParseError.cc index a003730a2..1449c5685 100644 --- a/src/gsiqt5/gsiDeclQJsonParseError.cc +++ b/src/gsiqt5/gsiDeclQJsonParseError.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QJsonParseError +// struct QJsonParseError // Constructor QJsonParseError::QJsonParseError() diff --git a/src/gsiqt5/gsiDeclQMapDataBase.cc b/src/gsiqt5/gsiDeclQMapDataBase.cc index 22c2e66fd..e3c79e696 100644 --- a/src/gsiqt5/gsiDeclQMapDataBase.cc +++ b/src/gsiqt5/gsiDeclQMapDataBase.cc @@ -35,7 +35,7 @@ #include // ----------------------------------------------------------------------- -// class QMapDataBase +// struct QMapDataBase // Constructor QMapDataBase::QMapDataBase() diff --git a/src/gsiqt5/gsiDeclQMapNodeBase.cc b/src/gsiqt5/gsiDeclQMapNodeBase.cc index 75391a720..6de964ab6 100644 --- a/src/gsiqt5/gsiDeclQMapNodeBase.cc +++ b/src/gsiqt5/gsiDeclQMapNodeBase.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QMapNodeBase +// struct QMapNodeBase // Constructor QMapNodeBase::QMapNodeBase() diff --git a/src/gsiqt5/gsiDeclQMediaServiceCameraInfoInterface.cc b/src/gsiqt5/gsiDeclQMediaServiceCameraInfoInterface.cc index 45bc9a0c5..96719c1fd 100644 --- a/src/gsiqt5/gsiDeclQMediaServiceCameraInfoInterface.cc +++ b/src/gsiqt5/gsiDeclQMediaServiceCameraInfoInterface.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QMediaServiceCameraInfoInterface +// struct QMediaServiceCameraInfoInterface // int QMediaServiceCameraInfoInterface::cameraOrientation(const QByteArray &device) diff --git a/src/gsiqt5/gsiDeclQMediaServiceDefaultDeviceInterface.cc b/src/gsiqt5/gsiDeclQMediaServiceDefaultDeviceInterface.cc index 746362d3c..3aba0baf0 100644 --- a/src/gsiqt5/gsiDeclQMediaServiceDefaultDeviceInterface.cc +++ b/src/gsiqt5/gsiDeclQMediaServiceDefaultDeviceInterface.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QMediaServiceDefaultDeviceInterface +// struct QMediaServiceDefaultDeviceInterface // QByteArray QMediaServiceDefaultDeviceInterface::defaultDevice(const QByteArray &service) diff --git a/src/gsiqt5/gsiDeclQMediaServiceFeaturesInterface.cc b/src/gsiqt5/gsiDeclQMediaServiceFeaturesInterface.cc index 3e1ecb062..9a12e955b 100644 --- a/src/gsiqt5/gsiDeclQMediaServiceFeaturesInterface.cc +++ b/src/gsiqt5/gsiDeclQMediaServiceFeaturesInterface.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QMediaServiceFeaturesInterface +// struct QMediaServiceFeaturesInterface // QFlags QMediaServiceFeaturesInterface::supportedFeatures(const QByteArray &service) diff --git a/src/gsiqt5/gsiDeclQMediaServiceProviderFactoryInterface.cc b/src/gsiqt5/gsiDeclQMediaServiceProviderFactoryInterface.cc index 6188b5b42..b0615f427 100644 --- a/src/gsiqt5/gsiDeclQMediaServiceProviderFactoryInterface.cc +++ b/src/gsiqt5/gsiDeclQMediaServiceProviderFactoryInterface.cc @@ -35,7 +35,7 @@ #include // ----------------------------------------------------------------------- -// class QMediaServiceProviderFactoryInterface +// struct QMediaServiceProviderFactoryInterface // QMediaService *QMediaServiceProviderFactoryInterface::create(QString const &key) diff --git a/src/gsiqt5/gsiDeclQMediaServiceSupportedDevicesInterface.cc b/src/gsiqt5/gsiDeclQMediaServiceSupportedDevicesInterface.cc index 28e7ee2e0..432ddae10 100644 --- a/src/gsiqt5/gsiDeclQMediaServiceSupportedDevicesInterface.cc +++ b/src/gsiqt5/gsiDeclQMediaServiceSupportedDevicesInterface.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QMediaServiceSupportedDevicesInterface +// struct QMediaServiceSupportedDevicesInterface // QString QMediaServiceSupportedDevicesInterface::deviceDescription(const QByteArray &service, const QByteArray &device) diff --git a/src/gsiqt5/gsiDeclQMediaServiceSupportedFormatsInterface.cc b/src/gsiqt5/gsiDeclQMediaServiceSupportedFormatsInterface.cc index fb1ff5b20..2f5f09fb9 100644 --- a/src/gsiqt5/gsiDeclQMediaServiceSupportedFormatsInterface.cc +++ b/src/gsiqt5/gsiDeclQMediaServiceSupportedFormatsInterface.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QMediaServiceSupportedFormatsInterface +// struct QMediaServiceSupportedFormatsInterface // QMultimedia::SupportEstimate QMediaServiceSupportedFormatsInterface::hasSupport(const QString &mimeType, const QStringList &codecs) diff --git a/src/gsiqt5/gsiDeclQMetaObject.cc b/src/gsiqt5/gsiDeclQMetaObject.cc index 1a59d4ba0..2279c2b97 100644 --- a/src/gsiqt5/gsiDeclQMetaObject.cc +++ b/src/gsiqt5/gsiDeclQMetaObject.cc @@ -39,7 +39,7 @@ #include // ----------------------------------------------------------------------- -// class QMetaObject +// struct QMetaObject // Constructor QMetaObject::QMetaObject() diff --git a/src/gsiqt5/gsiDeclQPagedPaintDevice_Margins.cc b/src/gsiqt5/gsiDeclQPagedPaintDevice_Margins.cc index bcd6369c5..ca6b3e363 100644 --- a/src/gsiqt5/gsiDeclQPagedPaintDevice_Margins.cc +++ b/src/gsiqt5/gsiDeclQPagedPaintDevice_Margins.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QPagedPaintDevice::Margins +// struct QPagedPaintDevice::Margins // Constructor QPagedPaintDevice::Margins::Margins() diff --git a/src/gsiqt5/gsiDeclQStaticPlugin.cc b/src/gsiqt5/gsiDeclQStaticPlugin.cc index f00e42959..b678ca140 100644 --- a/src/gsiqt5/gsiDeclQStaticPlugin.cc +++ b/src/gsiqt5/gsiDeclQStaticPlugin.cc @@ -35,7 +35,7 @@ #include // ----------------------------------------------------------------------- -// class QStaticPlugin +// struct QStaticPlugin // Constructor QStaticPlugin::QStaticPlugin() diff --git a/src/gsiqt5/gsiDeclQStringDataPtr.cc b/src/gsiqt5/gsiDeclQStringDataPtr.cc index bd6a6a672..efa52c674 100644 --- a/src/gsiqt5/gsiDeclQStringDataPtr.cc +++ b/src/gsiqt5/gsiDeclQStringDataPtr.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QStringDataPtr +// struct QStringDataPtr // Constructor QStringDataPtr::QStringDataPtr() diff --git a/src/gsiqt5/gsiDeclQTextCodec_ConverterState.cc b/src/gsiqt5/gsiDeclQTextCodec_ConverterState.cc index 1e6102d3a..db0698b02 100644 --- a/src/gsiqt5/gsiDeclQTextCodec_ConverterState.cc +++ b/src/gsiqt5/gsiDeclQTextCodec_ConverterState.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QTextCodec::ConverterState +// struct QTextCodec::ConverterState // Constructor QTextCodec::ConverterState::ConverterState(QFlags f) diff --git a/src/gsiqt5/gsiDeclQTextEdit_ExtraSelection.cc b/src/gsiqt5/gsiDeclQTextEdit_ExtraSelection.cc index 905b20432..dfef674cc 100644 --- a/src/gsiqt5/gsiDeclQTextEdit_ExtraSelection.cc +++ b/src/gsiqt5/gsiDeclQTextEdit_ExtraSelection.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QTextEdit::ExtraSelection +// struct QTextEdit::ExtraSelection // Constructor QTextEdit::ExtraSelection::ExtraSelection() diff --git a/src/gsiqt5/gsiDeclQTextLayout_FormatRange.cc b/src/gsiqt5/gsiDeclQTextLayout_FormatRange.cc index 807795a4d..68cfd0efd 100644 --- a/src/gsiqt5/gsiDeclQTextLayout_FormatRange.cc +++ b/src/gsiqt5/gsiDeclQTextLayout_FormatRange.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QTextLayout::FormatRange +// struct QTextLayout::FormatRange // Constructor QTextLayout::FormatRange::FormatRange() diff --git a/src/gsiqt5/gsiDeclQTextOption_Tab.cc b/src/gsiqt5/gsiDeclQTextOption_Tab.cc index 1ade62b87..d6471a4eb 100644 --- a/src/gsiqt5/gsiDeclQTextOption_Tab.cc +++ b/src/gsiqt5/gsiDeclQTextOption_Tab.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QTextOption::Tab +// struct QTextOption::Tab // Constructor QTextOption::Tab::Tab() diff --git a/src/gsiqt5/gsiDeclQTimeZone_OffsetData.cc b/src/gsiqt5/gsiDeclQTimeZone_OffsetData.cc index 74f534a25..7746d93c7 100644 --- a/src/gsiqt5/gsiDeclQTimeZone_OffsetData.cc +++ b/src/gsiqt5/gsiDeclQTimeZone_OffsetData.cc @@ -34,7 +34,7 @@ #include // ----------------------------------------------------------------------- -// class QTimeZone::OffsetData +// struct QTimeZone::OffsetData // Constructor QTimeZone::OffsetData::OffsetData() diff --git a/src/gsiqt5/gsiDeclQtTypeTraits.h b/src/gsiqt5/gsiDeclQtTypeTraits.h index 73d132f5a..eba0986d8 100644 --- a/src/gsiqt5/gsiDeclQtTypeTraits.h +++ b/src/gsiqt5/gsiDeclQtTypeTraits.h @@ -1085,7 +1085,7 @@ template <> struct type_traits : public type_traits struct type_traits : public type_traits { typedef tl::false_tag has_copy_constructor; @@ -1196,7 +1196,7 @@ template <> struct type_traits : public type_traits }; } -class QByteArrayDataPtr; +struct QByteArrayDataPtr; namespace tl { template <> struct type_traits : public type_traits { }; @@ -2291,7 +2291,7 @@ template <> struct type_traits : public type_traits }; } -class QFactoryInterface; +struct QFactoryInterface; namespace tl { template <> struct type_traits : public type_traits { typedef tl::false_tag has_copy_constructor; @@ -3721,7 +3721,7 @@ template <> struct type_traits : public type_traits }; } -class QJsonParseError; +struct QJsonParseError; namespace tl { template <> struct type_traits : public type_traits { }; @@ -3995,14 +3995,14 @@ template <> struct type_traits : public type_traits { }; } -class QMapDataBase; +struct QMapDataBase; namespace tl { template <> struct type_traits : public type_traits { typedef tl::false_tag has_copy_constructor; }; } -class QMapNodeBase; +struct QMapNodeBase; namespace tl { template <> struct type_traits : public type_traits { }; @@ -4292,7 +4292,7 @@ template <> struct type_traits : public type_traits }; } -class QMediaServiceCameraInfoInterface; +struct QMediaServiceCameraInfoInterface; namespace tl { template <> struct type_traits : public type_traits { typedef tl::false_tag has_copy_constructor; @@ -4306,7 +4306,7 @@ template <> struct type_traits : publi }; } -class QMediaServiceDefaultDeviceInterface; +struct QMediaServiceDefaultDeviceInterface; namespace tl { template <> struct type_traits : public type_traits { typedef tl::false_tag has_copy_constructor; @@ -4320,7 +4320,7 @@ template <> struct type_traits : pu }; } -class QMediaServiceFeaturesInterface; +struct QMediaServiceFeaturesInterface; namespace tl { template <> struct type_traits : public type_traits { typedef tl::false_tag has_copy_constructor; @@ -4334,7 +4334,7 @@ template <> struct type_traits : public }; } -class QMediaServiceProviderFactoryInterface; +struct QMediaServiceProviderFactoryInterface; namespace tl { template <> struct type_traits : public type_traits { typedef tl::false_tag has_copy_constructor; @@ -4369,7 +4369,7 @@ template <> struct type_traits : public typ }; } -class QMediaServiceSupportedDevicesInterface; +struct QMediaServiceSupportedDevicesInterface; namespace tl { template <> struct type_traits : public type_traits { typedef tl::false_tag has_copy_constructor; @@ -4383,7 +4383,7 @@ template <> struct type_traits : }; } -class QMediaServiceSupportedFormatsInterface; +struct QMediaServiceSupportedFormatsInterface; namespace tl { template <> struct type_traits : public type_traits { typedef tl::false_tag has_copy_constructor; @@ -4552,7 +4552,7 @@ template <> struct type_traits : public type_traits { }; } -class QMetaObject; +struct QMetaObject; namespace tl { template <> struct type_traits : public type_traits { }; @@ -6380,7 +6380,7 @@ template <> struct type_traits : public type }; } -class QStaticPlugin; +struct QStaticPlugin; namespace tl { template <> struct type_traits : public type_traits { }; @@ -6426,7 +6426,7 @@ template <> struct type_traits : public type_traits { }; } -class QStringDataPtr; +struct QStringDataPtr; namespace tl { template <> struct type_traits : public type_traits { }; diff --git a/src/gsiqt5/gsiQtExternals.h b/src/gsiqt5/gsiQtExternals.h index 686e66726..a61e6a2ee 100644 --- a/src/gsiqt5/gsiQtExternals.h +++ b/src/gsiqt5/gsiQtExternals.h @@ -258,7 +258,7 @@ namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAudioProbe (); } class QAudioRecorder; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAudioRecorder (); } -class QAudioSystemFactoryInterface; +struct QAudioSystemFactoryInterface; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAudioSystemFactoryInterface (); } class QAudioSystemPlugin; @@ -291,7 +291,7 @@ namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QBuffer (); } class QButtonGroup; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QButtonGroup (); } -class QByteArrayDataPtr; +struct QByteArrayDataPtr; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QByteArrayDataPtr (); } class QByteArrayMatcher; @@ -603,7 +603,7 @@ namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QEventTransiti class QExposeEvent; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QExposeEvent (); } -class QFactoryInterface; +struct QFactoryInterface; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFactoryInterface (); } class QFile; @@ -942,7 +942,7 @@ namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QJsonDocument (); class QJsonObject; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QJsonObject (); } -class QJsonParseError; +struct QJsonParseError; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QJsonParseError (); } class QJsonValue; @@ -1023,10 +1023,10 @@ namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QLoggingCatego class QMainWindow; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMainWindow (); } -class QMapDataBase; +struct QMapDataBase; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMapDataBase (); } -class QMapNodeBase; +struct QMapNodeBase; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMapNodeBase (); } class QMargins; @@ -1095,16 +1095,16 @@ namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMediaResource ( class QMediaService; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMediaService (); } -class QMediaServiceCameraInfoInterface; +struct QMediaServiceCameraInfoInterface; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMediaServiceCameraInfoInterface (); } -class QMediaServiceDefaultDeviceInterface; +struct QMediaServiceDefaultDeviceInterface; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMediaServiceDefaultDeviceInterface (); } -class QMediaServiceFeaturesInterface; +struct QMediaServiceFeaturesInterface; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMediaServiceFeaturesInterface (); } -class QMediaServiceProviderFactoryInterface; +struct QMediaServiceProviderFactoryInterface; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMediaServiceProviderFactoryInterface (); } class QMediaServiceProviderHint; @@ -1113,10 +1113,10 @@ namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMedi class QMediaServiceProviderPlugin; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMediaServiceProviderPlugin (); } -class QMediaServiceSupportedDevicesInterface; +struct QMediaServiceSupportedDevicesInterface; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMediaServiceSupportedDevicesInterface (); } -class QMediaServiceSupportedFormatsInterface; +struct QMediaServiceSupportedFormatsInterface; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMediaServiceSupportedFormatsInterface (); } class QMediaStreamsControl; @@ -1164,7 +1164,7 @@ namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMetaEnum (); } class QMetaMethod; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMetaMethod (); } -class QMetaObject; +struct QMetaObject; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMetaObject (); } class QMetaProperty; @@ -1656,7 +1656,7 @@ namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QState (); } class QStateMachine; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStateMachine (); } -class QStaticPlugin; +struct QStaticPlugin; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStaticPlugin (); } class QStaticText; @@ -1671,7 +1671,7 @@ namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStatusTipEvent class QStorageInfo; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStorageInfo (); } -class QStringDataPtr; +struct QStringDataPtr; namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStringDataPtr (); } class QStringListModel; diff --git a/src/img/imgLandmarksDialog.cc b/src/img/imgLandmarksDialog.cc index dd382453a..41c4f3db3 100644 --- a/src/img/imgLandmarksDialog.cc +++ b/src/img/imgLandmarksDialog.cc @@ -146,7 +146,7 @@ class LandmarkEditorService public: LandmarkEditorService (lay::LayoutView *view, img::Object *img) : lay::ViewService (view->view_object_widget ()), - mp_view (view), mp_image (img), m_selected (-1), m_dragging (false), + mp_image (img), m_selected (-1), m_dragging (false), m_mode (LandmarksDialog::None) { update (); @@ -362,7 +362,6 @@ public: tl::Event updated_event; private: - lay::LayoutView *mp_view; img::Object *mp_image; std::vector m_markers; int m_selected; diff --git a/src/lay/layHelpProvider.cc b/src/lay/layHelpProvider.cc index ba4dbefac..b3f8c9527 100644 --- a/src/lay/layHelpProvider.cc +++ b/src/lay/layHelpProvider.cc @@ -27,10 +27,6 @@ namespace lay { -// registration point for help providers -template<> -tl::Registrar *tl::Registrar::instance = 0; - // -------------------------------------------------------------------------------------- // HelpProvider implementation @@ -41,3 +37,9 @@ HelpProvider::HelpProvider () } +namespace tl +{ + // registration point for help providers + template<> + tl::Registrar *Registrar::instance = 0; +} diff --git a/src/lay/layMacroInterpreter.cc b/src/lay/layMacroInterpreter.cc index bc69fc7be..5b09755f4 100644 --- a/src/lay/layMacroInterpreter.cc +++ b/src/lay/layMacroInterpreter.cc @@ -31,9 +31,6 @@ namespace lay { -template<> -tl::Registrar *tl::Registrar::instance = 0; - void MacroInterpreter::execute (const lay::Macro *) const { @@ -126,3 +123,8 @@ MacroInterpreter::suffix (const std::string &dsl_name) } +namespace tl +{ + template<> tl::Registrar *Registrar::instance = 0; + template class LAY_PUBLIC tl::RegisteredClass; +} diff --git a/src/lay/layMacroInterpreter.h b/src/lay/layMacroInterpreter.h index d94ec0584..b032477e7 100644 --- a/src/lay/layMacroInterpreter.h +++ b/src/lay/layMacroInterpreter.h @@ -179,12 +179,6 @@ public: } -namespace tl -{ - // make registration available to external DLL's - template class LAY_PUBLIC tl::RegisteredClass; -} - #endif diff --git a/src/laybasic/layDrawing.cc b/src/laybasic/layDrawing.cc index 68337b65a..5d278ad4a 100644 --- a/src/laybasic/layDrawing.cc +++ b/src/laybasic/layDrawing.cc @@ -28,7 +28,7 @@ namespace lay { Drawing::Drawing (unsigned int num_planes, Drawings *drawings) - : m_num_planes (num_planes), mp_drawings (drawings) + : m_num_planes (num_planes) { drawings->push_back (this); } diff --git a/src/laybasic/layDrawing.h b/src/laybasic/layDrawing.h index 9ea545981..daac69601 100644 --- a/src/laybasic/layDrawing.h +++ b/src/laybasic/layDrawing.h @@ -127,7 +127,6 @@ public: private: unsigned int m_num_planes; - Drawings *mp_drawings; }; /** diff --git a/src/laybasic/layParsedLayerSource.h b/src/laybasic/layParsedLayerSource.h index 6d48792b7..c6aca4234 100644 --- a/src/laybasic/layParsedLayerSource.h +++ b/src/laybasic/layParsedLayerSource.h @@ -42,7 +42,7 @@ namespace db namespace lay { -struct LayerProperties; +class LayerProperties; class LayoutView; class PropertySelectorBase; diff --git a/src/laybasic/layPlugin.cc b/src/laybasic/layPlugin.cc index ea2858034..76bdebaaa 100644 --- a/src/laybasic/layPlugin.cc +++ b/src/laybasic/layPlugin.cc @@ -45,7 +45,6 @@ namespace lay // PluginDeclaration implementation static int s_next_id = 0; -template<> LAYBASIC_PUBLIC tl::Registrar *tl::Registrar::instance = 0; PluginDeclaration::PluginDeclaration () : m_id (++s_next_id), m_editable_enabled (true) @@ -581,3 +580,8 @@ PluginRoot::instance () } +namespace tl +{ + template<> LAYBASIC_PUBLIC Registrar *tl::Registrar::instance = 0; + template class LAYBASIC_PUBLIC tl::RegisteredClass; +} diff --git a/src/laybasic/layPlugin.h b/src/laybasic/layPlugin.h index 848fd95f7..6d0b20a4b 100644 --- a/src/laybasic/layPlugin.h +++ b/src/laybasic/layPlugin.h @@ -871,9 +871,6 @@ inline bool test_and_set (T &target, const T &source) namespace tl { - // make registration available to external DLL's - template class LAYBASIC_PUBLIC tl::RegisteredClass; - // disable copy ctor for PluginRoot template <> struct type_traits : public type_traits { typedef tl::false_tag has_copy_constructor; diff --git a/src/laybasic/layRedrawLayerInfo.h b/src/laybasic/layRedrawLayerInfo.h index 60f582ca0..298948589 100644 --- a/src/laybasic/layRedrawLayerInfo.h +++ b/src/laybasic/layRedrawLayerInfo.h @@ -31,7 +31,7 @@ namespace lay { -struct LayerProperties; +class LayerProperties; /** * @brief A helper struct to describe one entry in the redraw queue diff --git a/src/rba/rba.h b/src/rba/rba.h index c310da255..8a428a658 100644 --- a/src/rba/rba.h +++ b/src/rba/rba.h @@ -52,7 +52,7 @@ public: { } }; -class RubyInterpreterPrivateData; +struct RubyInterpreterPrivateData; /** * @brief The ruby interpreter wrapper class diff --git a/src/rdb/rdbFile.cc b/src/rdb/rdbFile.cc index 9075b1ee1..85e3f7f99 100644 --- a/src/rdb/rdbFile.cc +++ b/src/rdb/rdbFile.cc @@ -190,10 +190,12 @@ class StandardFormatDeclaration static tl::RegisteredClass format_decl (new StandardFormatDeclaration (), 0, "KLayout-RDB"); -// ------------------------------------------------------------- - -template<> -RDB_PUBLIC tl::Registrar *tl::Registrar::instance = 0; - } +// ------------------------------------------------------------- + +namespace tl +{ + template<> RDB_PUBLIC tl::Registrar *tl::Registrar::instance = 0; + template class RDB_PUBLIC tl::RegisteredClass; +} diff --git a/src/rdb/rdbReader.h b/src/rdb/rdbReader.h index 8f2fb2398..39ba9c530 100644 --- a/src/rdb/rdbReader.h +++ b/src/rdb/rdbReader.h @@ -160,10 +160,5 @@ private: } -namespace tl { - // make registration available to external DLL's - template class RDB_PUBLIC tl::RegisteredClass; -} - #endif diff --git a/src/tl/tlFileSystemWatcher.cc b/src/tl/tlFileSystemWatcher.cc index 17c262e0e..e415b1473 100644 --- a/src/tl/tlFileSystemWatcher.cc +++ b/src/tl/tlFileSystemWatcher.cc @@ -31,9 +31,6 @@ namespace tl { -// Timer interval (in ms) -const int timer_interval = 100; - // The maximum allowed processing tim const int processing_time = 20; diff --git a/src/tl/tlObjectCollection.h b/src/tl/tlObjectCollection.h index ef3c4f133..b6fc72f7f 100644 --- a/src/tl/tlObjectCollection.h +++ b/src/tl/tlObjectCollection.h @@ -447,6 +447,10 @@ template class weak_collection : public weak_or_shared_collection { +public: + weak_collection () + : weak_or_shared_collection () + { } }; /** @@ -456,6 +460,10 @@ template class shared_collection : public weak_or_shared_collection { +public: + shared_collection () + : weak_or_shared_collection () + { } }; } diff --git a/src/tl/tlVariant.h b/src/tl/tlVariant.h index b30c2a38e..a20c0a528 100644 --- a/src/tl/tlVariant.h +++ b/src/tl/tlVariant.h @@ -43,7 +43,7 @@ namespace gsi { class ClassBase; - class NoAdaptorTag; + struct NoAdaptorTag; template class Class; template const ClassBase *cls_decl (); } diff --git a/src/unit_tests/gsiTest.h b/src/unit_tests/gsiTest.h index 4641eacb4..4ecf6e892 100644 --- a/src/unit_tests/gsiTest.h +++ b/src/unit_tests/gsiTest.h @@ -245,7 +245,7 @@ struct A_NC A_NC (int nn) : A (nn) { } private: - friend class B; + friend struct B; A_NC (const A_NC &a) : A (a) { } A_NC &operator= (const A_NC &); diff --git a/src/unit_tests/tlClassRegistry.cc b/src/unit_tests/tlClassRegistry.cc index 44722c3da..326b5977d 100644 --- a/src/unit_tests/tlClassRegistry.cc +++ b/src/unit_tests/tlClassRegistry.cc @@ -113,7 +113,9 @@ TEST(3) } -template <> tl::Registrar *tl::Registrar::instance = 0; -template <> tl::Registrar *tl::Registrar::instance = 0; - +namespace tl +{ + template <> tl::Registrar *Registrar::instance = 0; + template <> tl::Registrar *Registrar::instance = 0; +} diff --git a/src/unit_tests/tlDeferredExecution.cc b/src/unit_tests/tlDeferredExecution.cc index 058fe8be2..33de6dd76 100644 --- a/src/unit_tests/tlDeferredExecution.cc +++ b/src/unit_tests/tlDeferredExecution.cc @@ -44,8 +44,6 @@ public: TEST(1) { - tl::DeferredMethodScheduler scheduler (); - g_na = g_nb = 0; QCoreApplication::instance ()->processEvents ();