Rename DiagramConnection to Line

14 files changed, 40 insertions, 43 deletions

diff --git a/src/boxsidehub.cpp b/src/boxsidehub.cpp
index 28728f8..1cba872 100644
--- a/src/boxsidehub.cpp
+++ b/src/boxsidehub.cpp
@@ -19,7 +19,7 @@
 #include <QPair>
 #include "connector.h"
 #include "diagramobject.h"
-#include "diagramconnection.h"
+#include "line.h"
 #include "boxsidehub.h"
 
 BoxSideHub::BoxSideHub(DiagramObject *owner)
@@ -72,7 +72,7 @@ BoxSideHub::update()
 	QRectF rect = item->boundingRect().translated(item->pos());
 	qDebug() << this;
 	foreach (Connector *connector, connectors()) {
-		DiagramConnection *connection = connector->owner();
+		Line *connection = connector->owner();
 		Connector *connector1 = connection->connector(0);
 		Connector *connector2 = connection->connector(1);
 		DiagramObject *item1, *item2;
diff --git a/src/commands.cpp b/src/commands.cpp
index 4d6a5bb..70f0f94 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -16,7 +16,7 @@
 
 #include <QDebug>
 #include "commands.h"
-#include "diagramconnection.h"
+#include "line.h"
 #include "diagramdocument.h"
 #include "diagramitem.h"
 #include "diagramobject.h"
@@ -145,7 +145,7 @@ RemoveObjectCommand::~RemoveObjectCommand()
 void
 RemoveObjectCommand::redo()
 {
-	foreach (DiagramConnection *connection, m_connections)
+	foreach (Line *connection, m_connections)
 		m_document->removeItem(connection);
 	m_document->removeItem(m_object);
 	m_owner = true;
@@ -155,7 +155,7 @@ void
 RemoveObjectCommand::undo()
 {
 	m_document->addItem(m_object);
-	foreach (DiagramConnection *connection, m_connections) {
+	foreach (Line *connection, m_connections) {
 		m_document->addItem(connection);
         }
 	m_owner = false;
diff --git a/src/commands.h b/src/commands.h
index a763236..76dbbf5 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -23,7 +23,7 @@
 #include <QPointF>
 #include <QLatin1String>
 
-class DiagramConnection;
+class Line;
 class DiagramDocument;
 class DiagramItem;
 class DiagramObject;
@@ -95,7 +95,7 @@ public:
 protected:
 	DiagramDocument *m_document;
 	DiagramObject *m_object;
-	QList<DiagramConnection *> m_connections;
+	QList<Line *> m_connections;
 	bool m_owner;
 };
 
diff --git a/src/connector.cpp b/src/connector.cpp
index 62159a6..123971d 100644
--- a/src/connector.cpp
+++ b/src/connector.cpp
@@ -16,14 +16,14 @@
 
 #include "connector.h"
 #include "hub.h"
-#include "diagramconnection.h"
+#include "line.h"
 
-Connector::Connector(DiagramConnection *owner)
+Connector::Connector(Line *owner)
 	: m_owner(owner), m_hub(NULL)
 {
 }
 
-DiagramConnection *
+Line *
 Connector::owner() const
 {
 	return m_owner;
@@ -91,7 +91,7 @@ Connector::connectedObject() const
 Connector *
 Connector::otherEnd() const
 {
-	DiagramConnection *conn = owner();
+	Line *conn = owner();
 	if (conn->connector(0) == this) {
 		return conn->connector(1);
 	}
diff --git a/src/connector.h b/src/connector.h
index f1b6b74..0d2ede2 100644
--- a/src/connector.h
+++ b/src/connector.h
@@ -18,15 +18,15 @@
 #define CONNECTOR_H
 
 #include <QPointF>
-class DiagramConnection;
+class Line;
 class DiagramObject;
 class Hub;
 
 class Connector
 {
 public:
-	Connector(DiagramConnection *owner);
-	DiagramConnection *owner() const;
+	Connector(Line *owner);
+	Line *owner() const;
 
 	QPointF pos() const;
 	void setPos(const QPointF &pos);
@@ -45,7 +45,7 @@ public:
 private:
 	QPointF m_pos;
 	qreal m_angle;
-	DiagramConnection *m_owner;
+	Line *m_owner;
 	Hub *m_hub;
 };
 
diff --git a/src/diagramdocument.cpp b/src/diagramdocument.cpp
index ea73abe..4074f00 100644
--- a/src/diagramdocument.cpp
+++ b/src/diagramdocument.cpp
@@ -18,7 +18,7 @@
 #include "hub.h"
 #include "diagramdocument.h"
 #include "diagramobject.h"
-#include "diagramconnection.h"
+#include "line.h"
 #include "items/database/databasetable.h"
 #include "items/database/databaserelationship.h"
 #include "items/database/column.h"
@@ -142,7 +142,7 @@ void
 DiagramDocument::updatePositions(DiagramObject *object)
 {
     Connector *connector;
-	foreach (DiagramConnection *connection, findConnections(object)) {
+	foreach (Line *connection, findConnections(object)) {
         connector = connection->connector(0);
         if (connector->isConnected())
             connector->hub()->update();
@@ -294,11 +294,11 @@ DiagramDocument::deleteSelectedItems()
 	}
 }
 
-QList<DiagramConnection *>
+QList<Line *>
 DiagramDocument::findConnections(DiagramObject *object)
 {
-	QList<DiagramConnection *> result;
-	foreach (DiagramConnection *connection, itemsByType<DiagramConnection>())
+	QList<Line *> result;
+	foreach (Line *connection, itemsByType<Line>())
 		if (connection->connector(0)->connectedObject() == object || connection->connector(1)->connectedObject() == object)
 			result.append(connection);
 	return result;
@@ -329,7 +329,7 @@ DiagramDocument::save(const QString &fileName)
 		item->saveToXml(doc, element);
 	}
 
-	foreach (DiagramConnection *item, itemsByType<DiagramConnection>()) {
+	foreach (Line *item, itemsByType<Line>()) {
 		QDomElement element = doc.createElement("item");
 		itemList.appendChild(element);
 		item->saveToXml(doc, element);
diff --git a/src/diagramdocument.h b/src/diagramdocument.h
index 47d1294..c0a63c0 100644
--- a/src/diagramdocument.h
+++ b/src/diagramdocument.h
@@ -27,7 +27,7 @@
 
 class DatabaseTable;
 class DatabaseRelationship;
-class DiagramConnection;
+class Line;
 class DiagramItem;
 class DiagramObject;
 
@@ -81,7 +81,7 @@ public:
 	void itemMoved(DiagramItem *table);
 	void itemHasMoved(DiagramItem *table);
 
-	QList<DiagramConnection *> findConnections(DiagramObject *object);
+	QList<Line *> findConnections(DiagramObject *object);
 	template <class T> QList<T *> itemsByType();
 
 	int gridSize() const;
diff --git a/src/diagramobject.h b/src/diagramobject.h
index 96b027c..5ef107b 100644
--- a/src/diagramobject.h
+++ b/src/diagramobject.h
@@ -19,7 +19,7 @@
 
 #include "diagramitem.h"
 class Hub;
-class DiagramConnection;
+class Line;
 
 class DiagramObject : public DiagramItem
 {
diff --git a/src/items/database/databasecommands.cpp b/src/items/database/databasecommands.cpp
index eae59db..1d9a63e 100644
--- a/src/items/database/databasecommands.cpp
+++ b/src/items/database/databasecommands.cpp
@@ -17,7 +17,7 @@
 #include <QDebug>
 #include "databasecommands.h"
 #include "diagramdocument.h"
-#include "diagramconnection.h"
+#include "line.h"
 #include "diagramitem.h"
 #include "databasetable.h"
 #include "column.h"
diff --git a/src/items/database/databaserelationship.cpp b/src/items/database/databaserelationship.cpp
index a95ac6e..39c9d25 100644
--- a/src/items/database/databaserelationship.cpp
+++ b/src/items/database/databaserelationship.cpp
@@ -107,7 +107,7 @@ bool DatabaseRelationship::PrivateData::pathsInitialized = false;
 QPainterPath DatabaseRelationship::PrivateData::paths[5];
 
 DatabaseRelationship::DatabaseRelationship(DiagramItem *parent)
-	: DiagramConnection(parent), d(new PrivateData)
+	: Line(parent), d(new PrivateData)
 {
 	setFlag(ItemIsSelectable);
 	connect(this, SIGNAL(endPointChanged()), this, SLOT(updateLayout()));
@@ -421,7 +421,7 @@ DatabaseRelationship::updateLayout()
 void
 DatabaseRelationship::loadFromXml(QDomElement element, DiagramDocument *document)
 {
-	DiagramConnection::loadFromXml(element, document);
+	Line::loadFromXml(element, document);
 	QDomElement relationshipeElement = element.firstChildElement("relationship");
 	if (!relationshipeElement.isNull()) {
 		setCardinality(readEnumElement(relationshipeElement, "cardinality", OneToMany, this, "Cardinality"));
@@ -436,7 +436,7 @@ DatabaseRelationship::loadFromXml(QDomElement element, DiagramDocument *document
 void
 DatabaseRelationship::saveToXml(QDomDocument doc, QDomElement element)
 {
-	DiagramConnection::saveToXml(doc, element);
+	Line::saveToXml(doc, element);
 	QDomElement relationshipeElement = doc.createElement("relationship");
 	element.appendChild(relationshipeElement);
 	appendEnumElement(doc, relationshipeElement, "cardinality", d->cardinality, this, "Cardinality");
diff --git a/src/items/database/databaserelationship.h b/src/items/database/databaserelationship.h
index f8f381e..5d90053 100644
--- a/src/items/database/databaserelationship.h
+++ b/src/items/database/databaserelationship.h
@@ -20,11 +20,11 @@
 #include <QPair>
 #include <QGraphicsItem>
 #include <QPainter>
-#include "diagramconnection.h"
+#include "line.h"
 #include "databasetable.h"
 #include "connector.h"
 
-class DatabaseRelationship : public DiagramConnection
+class DatabaseRelationship : public Line
 {
 	Q_OBJECT
 	Q_ENUMS(Cardinality Action)
diff --git a/src/diagramconnection.cpp b/src/line.cpp
index 1c8d73b..1ca27af 100644
--- a/src/diagramconnection.cpp
+++ b/src/line.cpp
@@ -14,12 +14,12 @@
 // with this program; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-#include "diagramconnection.h"
+#include "line.h"
 #include "diagramdocument.h"
 #include "diagramobject.h"
 #include "connector.h"
 
-DiagramConnection::DiagramConnection(DiagramItem *parent)
+Line::Line(DiagramItem *parent)
 	: DiagramItem(parent)
 {
 	m_connectors[0] = new Connector(this);
@@ -28,21 +28,21 @@ DiagramConnection::DiagramConnection(DiagramItem *parent)
 }
 
 Connector *
-DiagramConnection::connector(int index) const
+Line::connector(int index) const
 {
 	Q_ASSERT(index == 0 || index == 1);
 	return m_connectors[index];
 }
 
 void
-DiagramConnection::updatePositions()
+Line::updatePositions()
 {
 }
 
 #include "domutils.h"
 
 void
-DiagramConnection::loadFromXml(QDomElement element, DiagramDocument *document)
+Line::loadFromXml(QDomElement element, DiagramDocument *document)
 {
 	DiagramItem::loadFromXml(element, document);
 	QDomElement connectionElement = element.firstChildElement("connection");
@@ -57,7 +57,7 @@ DiagramConnection::loadFromXml(QDomElement element, DiagramDocument *document)
 }
 
 void
-DiagramConnection::saveToXml(QDomDocument doc, QDomElement element)
+Line::saveToXml(QDomDocument doc, QDomElement element)
 {
 	DiagramItem::saveToXml(doc, element);
 	QDomElement connectionElement = doc.createElement("connection");
diff --git a/src/diagramconnection.h b/src/line.h
index 66ad706..ff71d82 100644
--- a/src/diagramconnection.h
+++ b/src/line.h
@@ -21,12 +21,12 @@
 class Connector;
 class DiagramObject;
 
-class DiagramConnection : public DiagramItem
+class Line : public DiagramItem
 {
 	Q_OBJECT
 
 public:
-	DiagramConnection(DiagramItem *parent = 0);
+	Line(DiagramItem *parent = 0);
 
 	enum LineLayout
 	{
@@ -41,9 +41,6 @@ public:
 	virtual void loadFromXml(QDomElement element, DiagramDocument *document = 0);
 	void saveToXml(QDomDocument doc, QDomElement element);
 
-signals:
-	void endPointChanged();
-
 private:
 	Connector *m_connectors[2];
 };
diff --git a/src/src.pri b/src/src.pri
index 5a96c1f..fee3021 100644
--- a/src/src.pri
+++ b/src/src.pri
@@ -10,7 +10,7 @@ SOURCES = \
 	mainwindow.cpp \
 	diagramview.cpp \
 	diagramdocument.cpp \
-	diagramconnection.cpp \
+	line.cpp \
 	diagramitem.cpp \
 	diagramitemfactory.cpp \
 	diagramitemproperties.cpp \
@@ -25,7 +25,7 @@ HEADERS = \
 	mainwindow.h \
 	diagramview.h \
 	diagramdocument.h \
-	diagramconnection.h \
+	line.h \
 	diagramitem.h \
 	diagramitemfactory.h \
 	diagramitemproperties.h \