Mercurial > ldforge / changeset

--- a/src/ldObject.cpp	Sun Jan 29 15:25:26 2017 +0200
+++ b/src/ldObject.cpp	Sun Jan 29 15:28:48 2017 +0200
@@ -418,49 +418,6 @@
 
 // =============================================================================
 //
-// Get type name by enumerator
-//
-QString LDObject::typeName (LDObjectType type)
-{
-	return LDObject::getDefault (type)->typeName();
-}
-
-// =============================================================================
-//
-// Get a description of a list of LDObjects
-//
-QString LDObject::describeObjects (const LDObjectList& objs)
-{
-	QString text;
-
-	if (objs.isEmpty())
-		return "nothing"; // :)
-
-	for (LDObjectType objType = OBJ_FirstType; objType < OBJ_NumTypes; ++objType)
-	{
-		int count = 0;
-
-		for (LDObject* obj : objs)
-		{
-			if (obj->type() == objType)
-				count++;
-		}
-
-		if (count == 0)
-			continue;
-
-		if (not text.isEmpty())
-			text += ", ";
-
-		QString noun = format ("%1%2", typeName (objType), plural (count));
-		text += format ("%1 %2", count, noun);
-	}
-
-	return text;
-}
-
-// =============================================================================
-//
 // Object after this in the current file
 //
 LDObject* LDObject::next() const
@@ -549,30 +506,6 @@
 
 // =============================================================================
 //
-// Returns a default-constructed LDObject by the given type
-//
-LDObject* LDObject::getDefault (const LDObjectType type)
-{
-	switch (type)
-	{
-	case OBJ_Comment:		return LDSpawn<LDComment>();
-	case OBJ_Bfc:			return LDSpawn<LDBfc>();
-	case OBJ_Line:			return LDSpawn<LDLine>();
-	case OBJ_CondLine:		return LDSpawn<LDCondLine>();
-	case OBJ_SubfileReference:		return LDSpawn<LDSubfileReference>();
-	case OBJ_Triangle:		return LDSpawn<LDTriangle>();
-	case OBJ_Quad:			return LDSpawn<LDQuad>();
-	case OBJ_Empty:			return LDSpawn<LDEmpty>();
-	case OBJ_Error:			return LDSpawn<LDError>();
-	case OBJ_Overlay:		return LDSpawn<LDOverlay>();
-	case OBJ_BezierCurve:	return LDSpawn<LDBezierCurve>();
-	case OBJ_NumTypes:		break;
-	}
-	return nullptr;
-}
-
-// =============================================================================
-//
 void LDObject::invert() {}
 void LDBfc::invert() {}
 void LDEmpty::invert() {}

--- a/src/ldObject.h	Sun Jan 29 15:25:26 2017 +0200
+++ b/src/ldObject.h	Sun Jan 29 15:28:48 2017 +0200
@@ -130,10 +130,7 @@
 	virtual QString typeName() const = 0;
 	const Vertex& vertex (int i) const;
 
-	static QString describeObjects (const LDObjectList& objs);
 	static LDObject* fromID(int32 id);
-	static LDObject* getDefault (const LDObjectType type);
-	static QString typeName (LDObjectType type);
 
 signals:
 	void codeChanged(int position, QString before, QString after);