Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2012-02-19 14:50:24 +0000
committerStijn Buys <ingar@osirion.org>2012-02-19 14:50:24 +0000
commit7a9c504720e494ee07d16a6234b77c500af4da93 (patch)
treef7e66125b2c4c39f2007823c27dcc9b13d2b927b /src/editorwindow.cc
parent46f48143ed59eddafa86f2711f518792f362a46c (diff)
Renamed class MapEntity to EntityWidget, added entity dragging.
Diffstat (limited to 'src/editorwindow.cc')
-rw-r--r--src/editorwindow.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/editorwindow.cc b/src/editorwindow.cc
index 3f1dce7..ec7ebe2 100644
--- a/src/editorwindow.cc
+++ b/src/editorwindow.cc
@@ -6,9 +6,9 @@
*/
#include "editorwindow.h"
+#include "entitywidget.h"
#include "inistream.h"
#include "mapwidget.h"
-#include "mapentity.h"
#include "sidebar.h"
#include <QtGui>
@@ -24,7 +24,7 @@ EditorWindow::EditorWindow(QWidget *parent) : QWidget(parent)
editorwindow_mapwidget = new MapWidget(this);
editorwindow_sidebar = new SideBar(this);
- connect(editorwindow_mapwidget, SIGNAL(selected(MapEntity *)), editorwindow_sidebar, SLOT(setEntity(MapEntity *)));
+ connect(editorwindow_mapwidget, SIGNAL(selected(EntityWidget *)), editorwindow_sidebar, SLOT(setEntity(EntityWidget *)));
connect(editorwindow_sidebar, SIGNAL(entityChanged()), editorwindow_mapwidget, SLOT(resizeChildren()));
}
@@ -53,7 +53,7 @@ bool EditorWindow::loadFile(const QString &filename)
IniStream ini;
- MapEntity *entity = 0;
+ EntityWidget *entity = 0;
bool in_entity = false;
float x, y, z;
float f;