#ifdef out dummy test item

qgis · Dec 6, 2017 · dbd5215 · dbd5215
1 parent 696b21a
commit dbd5215
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/app/layout/qgslayoutapputils.cpp b/src/app/layout/qgslayoutapputils.cpp
@@ -63,8 +63,9 @@ void QgsLayoutAppUtils::registerGuiForKnownItemTypes()
     return new QgsLayoutViewTriangleRubberBand( view );
   } );
 
+#if 0
   registry->addLayoutItemGuiMetadata( new QgsLayoutItemGuiMetadata( QgsLayoutItemRegistry::LayoutItem + 1002, QStringLiteral( "test" ), QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddLabel.svg" ) ), nullptr, createRubberBand ) );
-
+#endif
 
   // map item
 

diff --git a/src/core/layout/qgslayoutitemregistry.cpp b/src/core/layout/qgslayoutitemregistry.cpp
@@ -49,13 +49,16 @@ bool QgsLayoutItemRegistry::populate()
   if ( !mMetadata.isEmpty() )
     return false;
 
+#if 0
   // add temporary item to register
   auto createTemporaryItem = []( QgsLayout * layout )->QgsLayoutItem*
   {
     return new TestLayoutItem( layout );
   };
 
   addLayoutItemType( new QgsLayoutItemMetadata( QgsLayoutItemRegistry::LayoutItem + 1002, QStringLiteral( "temp type" ), QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddLabel.svg" ) ), createTemporaryItem ) );
+#endif
+
   addLayoutItemType( new QgsLayoutItemMetadata( LayoutGroup, QStringLiteral( "Group" ), QIcon(), QgsLayoutItemGroup::create ) );
   addLayoutItemType( new QgsLayoutItemMetadata( LayoutFrame, QStringLiteral( "Frame" ), QIcon(), QgsLayoutFrame::create ) );
   addLayoutItemType( new QgsLayoutItemMetadata( LayoutPage, QStringLiteral( "Page" ), QgsApplication::getThemeIcon( QStringLiteral( "/mActionFileNew.svg" ) ), QgsLayoutItemPage::create ) );
@@ -154,6 +157,7 @@ QMap<int, QString> QgsLayoutItemRegistry::itemTypes() const
 }
 
 ///@cond TEMPORARY
+#if 0
 TestLayoutItem::TestLayoutItem( QgsLayout *layout )
   : QgsLayoutItem( layout )
 {
@@ -202,4 +206,5 @@ void TestLayoutItem::draw( QgsRenderContext &context, const QStyleOptionGraphics
   painter->restore();
   stack.end( context );
 }
+#endif
 ///@endcond
diff --git a/src/core/layout/qgslayoutitemregistry.h b/src/core/layout/qgslayoutitemregistry.h
@@ -424,6 +424,7 @@ class CORE_EXPORT QgsLayoutItemRegistry : public QObject
 
 };
 
+#if 0
 #ifndef SIP_RUN
 ///@cond TEMPORARY
 //simple item for testing
@@ -452,6 +453,7 @@ class TestLayoutItem : public QgsLayoutItem
 };
 ///@endcond
 #endif
+#endif
 
 #endif //QGSLAYOUTITEMREGISTRY_H