Mercurial > ldforge / changeset

--- a/src/ldDocument.cpp	Thu Feb 09 22:46:37 2017 +0200
+++ b/src/ldDocument.cpp	Thu Feb 09 23:45:53 2017 +0200
@@ -298,7 +298,7 @@
 {
 	Model::insertObject(pos, obj);
 	history()->add(new AddHistoryEntry {pos, obj});
-	connect(obj, SIGNAL(codeChanged(int,QString,QString)), this, SLOT(objectChanged(int,QString,QString)));
+	connect(obj, SIGNAL(codeChanged(QString,QString)), this, SLOT(objectChanged(QString,QString)));
 
 #ifdef DEBUG
 	if (not isFrozen())
@@ -306,7 +306,7 @@
 #endif
 }
 
-void LDDocument::objectChanged(int position, QString before, QString after)
+void LDDocument::objectChanged(QString before, QString after)
 {
 	LDObject* object = static_cast<LDObject*>(sender());
 	addToHistory(new EditHistoryEntry {object->lineNumber(), before, after});
@@ -475,7 +475,7 @@
 //
 void LDDocument::clearSelection()
 {
-	for (LDObject* object : m_selection)
+	for (LDObject* object : m_selection.toList())
 		removeFromSelection(object);
 }
 

--- a/src/ldDocument.h	Thu Feb 09 22:46:37 2017 +0200
+++ b/src/ldDocument.h	Thu Feb 09 23:45:53 2017 +0200
@@ -88,7 +88,7 @@
 	static QString shortenName (QString a); // Turns a full path into a relative path
 
 public slots:
-	void objectChanged(int position, QString before, QString after);
+	void objectChanged(QString before, QString after);
 
 protected:
 	LDObject* withdrawAt(int position);