diff --git a/apps/opencs/model/world/columnbase.hpp b/apps/opencs/model/world/columnbase.hpp
index 53b55939b4..fe310d0aa4 100644
--- a/apps/opencs/model/world/columnbase.hpp
+++ b/apps/opencs/model/world/columnbase.hpp
@@ -27,7 +27,6 @@ namespace CSMWorld
enum Display
{
Display_None, //Do not use
- Display_Cell_Missing, //Do not used, actually. It is here to simplify dragging non-existed cells handling
Display_String,
Display_LongString,
diff --git a/apps/opencs/model/world/tablemimedata.cpp b/apps/opencs/model/world/tablemimedata.cpp
index e0a735e35b..6d65d0ff80 100644
--- a/apps/opencs/model/world/tablemimedata.cpp
+++ b/apps/opencs/model/world/tablemimedata.cpp
@@ -1,6 +1,9 @@
#include "tablemimedata.hpp"
+
#include <string>
+#include <QDebug>
+
#include "universalid.hpp"
#include "columnbase.hpp"
@@ -33,7 +36,8 @@ std::string CSMWorld::TableMimeData::getIcon() const
{
if (mUniversalId.empty())
{
- return "";
+ qDebug()<<"TableMimeData object does not hold any records!"; //because throwing in the event loop tends to be problematic
+ throw("TableMimeData object does not hold any records!");
}
std::string tmpIcon;
@@ -50,7 +54,7 @@ std::string CSMWorld::TableMimeData::getIcon() const
if (tmpIcon != mUniversalId[i].getIcon())
{
- return ":/multitype.png"; //icon stolen from gnome
+ return ":/multitype.png"; //icon stolen from gnome TODO: get new icon
}
tmpIcon = mUniversalId[i].getIcon();
@@ -360,8 +364,6 @@ CSMWorld::UniversalId::Type CSMWorld::TableMimeData::convertEnums (CSMWorld::Col
case CSMWorld::ColumnBase::Display_Script:
return CSMWorld::UniversalId::Type_Script;
- case CSMWorld::ColumnBase::Display_Cell_Missing:
- return CSMWorld::UniversalId::Type_Cell_Missing; //this one actually never happens, since there is no display_Cell_missing column anywhere.
default:
return CSMWorld::UniversalId::Type_None;
@@ -377,10 +379,6 @@ CSMWorld::ColumnBase::Display CSMWorld::TableMimeData::convertEnums (CSMWorld::U
return CSMWorld::ColumnBase::Display_Race;
- case CSMWorld::UniversalId::Type_Cell_Missing:
- return CSMWorld::ColumnBase::Display_Cell_Missing;
-
-
case CSMWorld::UniversalId::Type_Skill:
return CSMWorld::ColumnBase::Display_Skill;
@@ -537,4 +535,4 @@ CSMWorld::ColumnBase::Display CSMWorld::TableMimeData::convertEnums (CSMWorld::U
const CSMDoc::Document* CSMWorld::TableMimeData::getDocumentPtr() const
{
return &mDocument;
-}
\ No newline at end of file
+}
diff --git a/apps/opencs/model/world/tablemimedata.hpp b/apps/opencs/model/world/tablemimedata.hpp
index 9ca7128018..85c243944c 100644
--- a/apps/opencs/model/world/tablemimedata.hpp
+++ b/apps/opencs/model/world/tablemimedata.hpp
@@ -56,6 +56,7 @@ namespace CSMWorld
UniversalId returnMatching(CSMWorld::ColumnBase::Display type) const;
static CSMWorld::UniversalId::Type convertEnums(CSMWorld::ColumnBase::Display type);
+
static CSMWorld::ColumnBase::Display convertEnums(CSMWorld::UniversalId::Type type);
private:
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index d916e33e91..cdbd88278e 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -5,8 +5,6 @@
#include <qt4/QtGui/qevent.h>
-#include <boost/algorithm/string.hpp>
-
#include <apps/opencs/model/world/tablemimedata.hpp>
CSVRender::PagedWorldspaceWidget::PagedWorldspaceWidget (QWidget *parent, const CSMDoc::Document& document)
@@ -89,11 +87,14 @@ void CSVRender::PagedWorldspaceWidget::dropEvent (QDropEvent* event)
std::pair< int, int > CSVRender::PagedWorldspaceWidget::getCoordinatesFromId (const std::string& record) const
{
- QString id(QString::fromUtf8(record.c_str()));
- id.remove(0,1);
- QStringList splited(id.split(' ')); //Well, this is the simplest approach
- int x = splited.begin()->toInt();
- int y = (splited.begin()+1)->toInt();
+ std::istringstream stream (record.c_str());
+ char ignore;
+ stream >> ignore;
+ char ignore1; // : or ;
+ char ignore2; // #
+ int x, y;
+
+ stream >> ignore1 >> ignore2 >> x >> y;
return std::make_pair(x, y);
}
diff --git a/apps/opencs/view/world/dragrecordtable.cpp b/apps/opencs/view/world/dragrecordtable.cpp
index d9d891ff19..c33fa58ad6 100644
--- a/apps/opencs/view/world/dragrecordtable.cpp
+++ b/apps/opencs/view/world/dragrecordtable.cpp
@@ -5,7 +5,7 @@
void CSVWorld::DragRecordTable::startDrag (const CSVWorld::DragRecordTable& table)
{
- CSMWorld::TableMimeData* mime = new CSMWorld::TableMimeData (table.getDragedRecords(), mDocument);
+ CSMWorld::TableMimeData* mime = new CSMWorld::TableMimeData (table.getDraggedRecords(), mDocument);
if (mime)
{
diff --git a/apps/opencs/view/world/dragrecordtable.hpp b/apps/opencs/view/world/dragrecordtable.hpp
index 06ee3b9c60..8c5f1b8418 100644
--- a/apps/opencs/view/world/dragrecordtable.hpp
+++ b/apps/opencs/view/world/dragrecordtable.hpp
@@ -28,9 +28,9 @@ namespace CSVWorld
public:
DragRecordTable(CSMDoc::Document& document, QWidget* parent = NULL);
- virtual std::vector<CSMWorld::UniversalId> getDragedRecords() const = 0;
+ virtual std::vector<CSMWorld::UniversalId> getDraggedRecords() const = 0;
- virtual void setEditLock(bool locked);
+ void setEditLock(bool locked);
protected:
void startDrag(const DragRecordTable& table);
diff --git a/apps/opencs/view/world/regionmap.cpp b/apps/opencs/view/world/regionmap.cpp
index 260b3b8253..849a1988af 100644
--- a/apps/opencs/view/world/regionmap.cpp
+++ b/apps/opencs/view/world/regionmap.cpp
@@ -348,7 +348,7 @@ void CSVWorld::RegionMap::mouseMoveEvent (QMouseEvent* event)
startDrag(*this);
}
-std::vector< CSMWorld::UniversalId > CSVWorld::RegionMap::getDragedRecords() const
+std::vector< CSMWorld::UniversalId > CSVWorld::RegionMap::getDraggedRecords() const
{
QModelIndexList selected(getSelectedCells(true, false));
std::vector<CSMWorld::UniversalId> ids;
diff --git a/apps/opencs/view/world/regionmap.hpp b/apps/opencs/view/world/regionmap.hpp
index 08744a4a0f..0097a16dc2 100644
--- a/apps/opencs/view/world/regionmap.hpp
+++ b/apps/opencs/view/world/regionmap.hpp
@@ -63,7 +63,7 @@ namespace CSVWorld
RegionMap (const CSMWorld::UniversalId& universalId, CSMDoc::Document& document,
QWidget *parent = 0);
- virtual std::vector<CSMWorld::UniversalId> getDragedRecords() const;
+ virtual std::vector<CSMWorld::UniversalId> getDraggedRecords() const;
signals:
diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index e5cfbe3609..cc51a22135 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -561,7 +561,7 @@ std::vector<std::string> CSVWorld::Table::getColumnsWithDisplay(CSMWorld::Column
return titles;
}
-std::vector< CSMWorld::UniversalId > CSVWorld::Table::getDragedRecords() const
+std::vector< CSMWorld::UniversalId > CSVWorld::Table::getDraggedRecords() const
{
QModelIndexList selectedRows = selectionModel()->selectedRows();
diff --git a/apps/opencs/view/world/table.hpp b/apps/opencs/view/world/table.hpp
index cfab486e57..8e874ec564 100644
--- a/apps/opencs/view/world/table.hpp
+++ b/apps/opencs/view/world/table.hpp
@@ -76,7 +76,7 @@ namespace CSVWorld
std::vector<std::string> getColumnsWithDisplay(CSMWorld::ColumnBase::Display display) const;
- virtual std::vector<CSMWorld::UniversalId> getDragedRecords() const;
+ virtual std::vector<CSMWorld::UniversalId> getDraggedRecords() const;
signals: