Resolved compile issues, but not fully working.

apps/opencs/model/world/idtable.cpp

@@ -353,7 +353,7 @@ std::pair< int, int > CSMWorld::IdTable::unfoldIndexAdress (unsigned int id) con
     --id;
     int row = id / this->columnCount();
     int column = id - row * this->columnCount();
-    return std::make_pair<int, int>(row, column);
+    return std::make_pair (row, column);
 }
 
 bool CSMWorld::IdTable::hasChildren(const QModelIndex& index) const

apps/opencs/view/world/dialoguesubview.cpp

@@ -281,7 +281,7 @@ QWidget* CSVWorld::DialogueDelegateDispatcher::makeEditor(CSMWorld::ColumnBase::
             connect(proxy, SIGNAL(tableMimeDataDropped(QWidget*, const QModelIndex&, const CSMWorld::UniversalId&, const CSMDoc::Document*)),
                     this, SIGNAL(tableMimeDataDropped(QWidget*, const QModelIndex&, const CSMWorld::UniversalId&, const CSMDoc::Document*)));
 
-            skip = true;
+            //skip = true;
         }
         else if (qobject_cast<QCheckBox*>(editor))
         {
@@ -298,7 +298,7 @@ QWidget* CSVWorld::DialogueDelegateDispatcher::makeEditor(CSMWorld::ColumnBase::
         else if (qobject_cast<QAbstractSpinBox*>(editor))
         {
             connect(editor, SIGNAL(editingFinished()), proxy, SLOT(editorDataCommited()));
-        } //lisp cond pairs would be nice in the C++
+        }
 
         connect(proxy, SIGNAL(editorDataCommited(QWidget*, const QModelIndex&, CSMWorld::ColumnBase::Display)),
                 this, SLOT(editorDataCommited(QWidget*, const QModelIndex&, CSMWorld::ColumnBase::Display)));
@@ -328,8 +328,8 @@ CSVWorld::EditWidget::~EditWidget()
     }
 }
 
-CSVWorld::EditWidget::EditWidget(QWidget *parent, int row, CSMWorld::IdTable* table, QUndoStack& undoStack, bool createAndDelete) :
-mDispatcher(this, table, undoStack),
+CSVWorld::EditWidget::EditWidget(QWidget *parent, int row, CSMWorld::IdTable* table, CSMDoc::Document& document, bool createAndDelete) :
+mDispatcher(this, table, document),
 QScrollArea(parent),
 mWidgetMapper(NULL),
 mMainWidget(NULL),
@@ -402,7 +402,7 @@ void CSVWorld::EditWidget::remake(int row)
             {
                 mNestedModels.push_back(new CSMWorld::NestedTableModel (mTable->index(row, i), display, mTable));
 
-                NestedTable* table = new NestedTable(mUndoStack, *(mNestedModels.rbegin()), this);
+                NestedTable* table = new NestedTable(mDocument, *(mNestedModels.rbegin()), this);
 
                 tablesLayout->addWidget(table);
             } else
@@ -517,7 +517,7 @@ CSVWorld::DialogueSubView::DialogueSubView (const CSMWorld::UniversalId& id, CSM
 
     mMainLayout = new QVBoxLayout(mainWidget);
 
-    mEditWidget = new EditWidget(mainWidget, mTable->getModelIndex(mCurrentId, 0).row(), mTable, mUndoStack, false);
+    mEditWidget = new EditWidget(mainWidget, mTable->getModelIndex(mCurrentId, 0).row(), mTable, document, false);
     connect(mEditWidget, SIGNAL(tableMimeDataDropped(QWidget*, const QModelIndex&, const CSMWorld::UniversalId&, const CSMDoc::Document*)),
             this, SLOT(tableMimeDataDropped(QWidget*, const QModelIndex&, const CSMWorld::UniversalId&, const CSMDoc::Document*)));
 

apps/opencs/view/world/dialoguesubview.hpp

@@ -123,7 +123,7 @@ namespace CSVWorld
     public:
         DialogueDelegateDispatcher(QObject* parent,
                                    CSMWorld::IdTable* table,
-                                   QUndoStack& undoStack);
+                                   CSMDoc::Document& document);
 
         ~DialogueDelegateDispatcher();
 
@@ -175,7 +175,7 @@ namespace CSVWorld
         public:
 
             EditWidget (QWidget *parent, int row, CSMWorld::IdTable* table,
-                        QUndoStack& undoStack, bool createAndDelete = false);
+                        CSMDoc::Document& document, bool createAndDelete = false);
 
             virtual ~EditWidget();
 

apps/opencs/view/world/nestedtable.cpp

@@ -9,11 +9,11 @@
 #include <QMenu>
 #include <QDebug>
 
-CSVWorld::NestedTable::NestedTable(QUndoStack& undoStack,
+CSVWorld::NestedTable::NestedTable(CSMDoc::Document& document,
                                    CSMWorld::NestedTableModel* model,
                                    QWidget* parent)
     : QTableView(parent),
-      mUndoStack(undoStack),
+      mUndoStack(document.getUndoStack()),
       mModel(model)
 {
 
@@ -31,7 +31,7 @@ CSVWorld::NestedTable::NestedTable(QUndoStack& undoStack,
             model->headerData (i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt());
 
         CommandDelegate *delegate = CommandDelegateFactoryCollection::get().makeDelegate(display,
-                                                                                         undoStack,
+                                                                                         document,
                                                                                          this);
 
         setItemDelegateForColumn(i, delegate);

apps/opencs/view/world/nestedtable.hpp

@@ -31,7 +31,7 @@ namespace CSVWorld
         CSMWorld::NestedTableModel* mModel;
 
     public:
-        NestedTable(QUndoStack& undoStack,
+        NestedTable(CSMDoc::Document& document,
                     CSMWorld::NestedTableModel* model,
                     QWidget* parent = NULL);