Rename DiagramItemRegistry to DiagramItemFactory

5 files changed, 17 insertions, 17 deletions

diff --git a/src/diagramdocument.cpp b/src/diagramdocument.cpp
index 02033da..d48e90b 100644
--- a/src/diagramdocument.cpp
+++ b/src/diagramdocument.cpp
@@ -226,7 +226,7 @@ DiagramDocument::save(const QString &fileName)
 	setFileName(fileName);
 }
 
-#include "diagramitemregistry.h"
+#include "diagramitemfactory.h"
 
 void
 DiagramDocument::load(const QString &fileName)
@@ -243,7 +243,7 @@ DiagramDocument::load(const QString &fileName)
 	QDomElement itemElement = itemListElement.firstChildElement("item");
 	while (!itemElement.isNull()) {
 		QString itemTypeName = itemElement.attribute("type");
-		DiagramItem *item = DiagramItemRegistry::createItem(itemTypeName);
+		DiagramItem *item = DiagramItemFactory::createItem(itemTypeName);
 		if (item == NULL) {
 			qWarning() << "Unknown item type:" << itemTypeName;
 		}
diff --git a/src/diagramitem.cpp b/src/diagramitem.cpp
index bcb5e24..41e028f 100644
--- a/src/diagramitem.cpp
+++ b/src/diagramitem.cpp
@@ -19,7 +19,7 @@
 #include <QDebug>
 #include "diagramdocument.h"
 #include "diagramitem.h"
-#include "diagramitemregistry.h"
+#include "diagramitemfactory.h"
 
 DiagramItem::DiagramItem(DiagramItem *parent)
 	: QGraphicsItem(parent)
@@ -101,7 +101,7 @@ DiagramItem::fromMimeData(const QMimeData *mimeData)
 	if (element.isNull())
 		return 0;
 
-	DiagramItem *item = DiagramItemRegistry::createItem(element.attribute("type"));
+	DiagramItem *item = DiagramItemFactory::createItem(element.attribute("type"));
 	if (item == NULL)
 		return 0;
 
diff --git a/src/diagramitemregistry.cpp b/src/diagramitemfactory.cpp
index d33df18..093d980 100644
--- a/src/diagramitemregistry.cpp
+++ b/src/diagramitemfactory.cpp
@@ -16,21 +16,21 @@
 
 #include <QDebug>
 #include "diagramitem.h"
-#include "diagramitemregistry.h"
+#include "diagramitemfactory.h"
 
-DiagramItemRegistry *DiagramItemRegistry::m_registry = 0;
+DiagramItemFactory *DiagramItemFactory::m_registry = 0;
 
 template <class T> DiagramItem *__createItem() { return new T(); }
 #define ADD_TYPE(x) m_map[x::staticTypeName()] = &(__createItem<x>);
 
 DiagramItem *
-DiagramItemRegistry::createItem(const QString &typeName)
+DiagramItemFactory::createItem(const QString &typeName)
 {
-	if (!DiagramItemRegistry::m_registry)
-		DiagramItemRegistry::m_registry = new DiagramItemRegistry();
-	if (!DiagramItemRegistry::m_registry->m_map.contains(typeName))
+	if (!DiagramItemFactory::m_registry)
+		DiagramItemFactory::m_registry = new DiagramItemFactory();
+	if (!DiagramItemFactory::m_registry->m_map.contains(typeName))
 		return 0;
-	return DiagramItemRegistry::m_registry->m_map[typeName]();
+	return DiagramItemFactory::m_registry->m_map[typeName]();
 }
 
 // =========================================================================
@@ -39,7 +39,7 @@ DiagramItemRegistry::createItem(const QString &typeName)
 #include "items/database/databasetable.h"
 #include "items/database/databaserelationship.h"
 
-DiagramItemRegistry::DiagramItemRegistry()
+DiagramItemFactory::DiagramItemFactory()
 {
 	ADD_TYPE(DatabaseTable);
 	ADD_TYPE(DatabaseRelationship);
diff --git a/src/diagramitemregistry.h b/src/diagramitemfactory.h
index 7806574..eaaae2f 100644
--- a/src/diagramitemregistry.h
+++ b/src/diagramitemfactory.h
@@ -22,14 +22,14 @@ class DiagramItem;
 
 typedef DiagramItem *(*createItemFunc)();
 
-class DiagramItemRegistry
+class DiagramItemFactory
 {
 public:
 	static DiagramItem *createItem(const QString &typeName);
 
 private:
-	DiagramItemRegistry();
-	static DiagramItemRegistry *m_registry;
+	DiagramItemFactory();
+	static DiagramItemFactory *m_registry;
 	QMap<QString, createItemFunc> m_map;
 };
 
diff --git a/src/src.pro b/src/src.pro
index 38efe2d..d637a89 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -9,7 +9,7 @@ SOURCES = \
 	diagramdocument.cpp \
 	diagramconnection.cpp \
 	diagramitem.cpp \
-	diagramitemregistry.cpp \
+	diagramitemfactory.cpp \
 	diagramobject.cpp \
 	commands.cpp
 HEADERS = \
@@ -18,7 +18,7 @@ HEADERS = \
 	diagramdocument.h \
 	diagramconnection.h \
 	diagramitem.h \
-	diagramitemregistry.h \
+	diagramitemfactory.h \
 	diagramobject.h \
 	range.h \
 	commands.h