Resolved compile issues, but not fully working.

apps/opencs/model/world/idtable.cpp

@@ -31,7 +31,7 @@ int CSMWorld::IdTable::columnCount (const QModelIndex & parent) const
     {
         return dynamic_cast<NestedCollection*>(mIdCollection)->getNestedColumnsCount(parent.row(), parent.column());
     }
-    
+
     return mIdCollection->getColumns();
 }
 
@@ -72,7 +72,7 @@ QVariant CSMWorld::IdTable::headerData (int section,
     {
         return mIdCollection->getColumn (section).mDisplayType;
     }
-    
+
     return QVariant();
 }
 
@@ -104,7 +104,7 @@ bool CSMWorld::IdTable::setData (const QModelIndex &index, const QVariant &value
             const std::pair<int, int>& parentAdress(unfoldIndexAdress(index.internalId()));
 
             dynamic_cast<NestedCollection*>(mIdCollection)->setNestedData(parentAdress.first, parentAdress.second, value, index.row(), index.column());
-           
+
             emit dataChanged (CSMWorld::IdTable::index (parentAdress.first, 0),
                               CSMWorld::IdTable::index (parentAdress.second, mIdCollection->getColumns()-1));
 
@@ -114,17 +114,17 @@ bool CSMWorld::IdTable::setData (const QModelIndex &index, const QVariant &value
             return false;
         }
     }
-    
+
     if (mIdCollection->getColumn (index.column()).isEditable() && role==Qt::EditRole)
     {
         mIdCollection->setData (index.row(), index.column(), value);
-        
+
         emit dataChanged (CSMWorld::IdTable::index (index.row(), 0),
                           CSMWorld::IdTable::index (index.row(), mIdCollection->getColumns()-1));
-        
+
         return true;
-    } 
+    }
-    
+
     return false;
 }
 
@@ -177,7 +177,7 @@ void CSMWorld::IdTable::addNestedRow(const QModelIndex& parent, int position)
     dynamic_cast<NestedCollection*>(mIdCollection)->addNestedRow(row, parent.column(), position);
 
     endInsertRows();
-   
+
     emit dataChanged (CSMWorld::IdTable::index (row, 0),
                       CSMWorld::IdTable::index (row, mIdCollection->getColumns()-1));
 }
@@ -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
@@ -370,14 +370,14 @@ void CSMWorld::IdTable::setNestedTable(const QModelIndex& index, const CSMWorld:
     {
         throw std::logic_error("Tried to set nested table, but index has no children");
     }
-    
+
     bool removeRowsMode = false;
     if (nestedTable.size() != this->nestedTable(index)->size())
     {
         emit resetStart(this->index(index.row(), 0).data().toString());
         removeRowsMode = true;
     }
-    
+
     dynamic_cast<NestedCollection*>(mIdCollection)->setNestedTable(index.row(), index.column(), nestedTable);
 
     emit dataChanged (CSMWorld::IdTable::index (index.row(), 0),
@@ -395,6 +395,6 @@ CSMWorld::NestedTableWrapperBase* CSMWorld::IdTable::nestedTable(const QModelInd
     {
         throw std::logic_error("Tried to retrive nested table, but index has no children");
     }
-    
+
     return dynamic_cast<NestedCollection*>(mIdCollection)->nestedTable(index.row(), index.column());
 }

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) :
+CSVWorld::EditWidget::EditWidget(QWidget *parent, int row, CSMWorld::IdTable* table, CSMDoc::Document& document, bool createAndDelete) :
-mDispatcher(this, table, undoStack),
+mDispatcher(this, table, document),
 QScrollArea(parent),
 mWidgetMapper(NULL),
 mMainWidget(NULL),
@@ -338,7 +338,7 @@ mTable(table)
 {
     remake (row);
 
-    connect(&mDispatcher, SIGNAL(tableMimeDataDropped(QWidget*, const QModelIndex&, const CSMWorld::UniversalId&, const CSMDoc::Document*)), 
+    connect(&mDispatcher, SIGNAL(tableMimeDataDropped(QWidget*, const QModelIndex&, const CSMWorld::UniversalId&, const CSMDoc::Document*)),
             this, SIGNAL(tableMimeDataDropped(QWidget*, const QModelIndex&, const CSMWorld::UniversalId&, const CSMDoc::Document*)));
 }
 
@@ -349,7 +349,7 @@ void CSVWorld::EditWidget::remake(int row)
         delete mNestedModels[i];
     }
     mNestedModels.clear();
-    
+
     if (mMainWidget)
     {
         delete mMainWidget;
@@ -401,8 +401,8 @@ void CSVWorld::EditWidget::remake(int row)
             if (mTable->hasChildren(mTable->index(row, i)))
             {
                 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*)));
 
@@ -570,7 +570,7 @@ void CSVWorld::DialogueSubView::prevId ()
                 setUniversalId(CSMWorld::UniversalId (static_cast<CSMWorld::UniversalId::Type> (mTable->data (mTable->index (newRow, 2)).toInt()),
                                         mTable->data (mTable->index (newRow, 0)).toString().toUtf8().constData()));
 
-		changeCurrentId(std::string(mTable->data (mTable->index (newRow, 0)).toString().toUtf8().constData()));
+                changeCurrentId(std::string(mTable->data (mTable->index (newRow, 0)).toString().toUtf8().constData()));
 
                 mEditWidget->setDisabled(mLocked);
 
@@ -604,9 +604,9 @@ void CSVWorld::DialogueSubView::nextId ()
                 mEditWidget->remake(newRow);
 
                 setUniversalId(CSMWorld::UniversalId (static_cast<CSMWorld::UniversalId::Type> (mTable->data (mTable->index (newRow, 2)).toInt()),
-						      mTable->data (mTable->index (newRow, 0)).toString().toUtf8().constData()));
+                                                      mTable->data (mTable->index (newRow, 0)).toString().toUtf8().constData()));
 
-		changeCurrentId(std::string(mTable->data (mTable->index (newRow, 0)).toString().toUtf8().constData()));
+                changeCurrentId(std::string(mTable->data (mTable->index (newRow, 0)).toString().toUtf8().constData()));
 
                 mEditWidget->setDisabled(mLocked);
 
@@ -623,11 +623,11 @@ void CSVWorld::DialogueSubView::setEditLock (bool locked)
 
     if (currentIndex.isValid())
     {
-	CSMWorld::RecordBase::State state = static_cast<CSMWorld::RecordBase::State>(mTable->data (mTable->index (currentIndex.row(), 1)).toInt());
+        CSMWorld::RecordBase::State state = static_cast<CSMWorld::RecordBase::State>(mTable->data (mTable->index (currentIndex.row(), 1)).toInt());
 
-	mEditWidget->setDisabled (state==CSMWorld::RecordBase::State_Deleted || locked);
+        mEditWidget->setDisabled (state==CSMWorld::RecordBase::State_Deleted || locked);
 
-	mCommandDispatcher.setEditLock (locked);
+        mCommandDispatcher.setEditLock (locked);
     }
 
 }
@@ -640,14 +640,14 @@ void CSVWorld::DialogueSubView::dataChanged (const QModelIndex & index)
     {
         CSMWorld::RecordBase::State state = static_cast<CSMWorld::RecordBase::State>(mTable->data (mTable->index (currentIndex.row(), 1)).toInt());
 
-	mEditWidget->setDisabled (state==CSMWorld::RecordBase::State_Deleted || mLocked);
+        mEditWidget->setDisabled (state==CSMWorld::RecordBase::State_Deleted || mLocked);
     }
 }
 
 void CSVWorld::DialogueSubView::tableMimeDataDropped (QWidget* editor,
-						      const QModelIndex& index,
+                                                      const QModelIndex& index,
-						      const CSMWorld::UniversalId& id,
+                                                      const CSMWorld::UniversalId& id,
-						      const CSMDoc::Document* document)
+                                                      const CSMDoc::Document* document)
 {
     if (document == &mDocument)
     {
@@ -672,10 +672,10 @@ void CSVWorld::DialogueSubView::showPreview ()
     QModelIndex currentIndex(mTable->getModelIndex(mCurrentId, 0));
 
     if (currentIndex.isValid() &&
-	mTable->getFeatures() & CSMWorld::IdTable::Feature_Preview &&
+        mTable->getFeatures() & CSMWorld::IdTable::Feature_Preview &&
-	currentIndex.row() < mTable->rowCount())
+        currentIndex.row() < mTable->rowCount())
     {
-	emit focusId(CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Preview, mCurrentId), "");
+        emit focusId(CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Preview, mCurrentId), "");
     }
 }
 
@@ -684,7 +684,7 @@ void CSVWorld::DialogueSubView::viewRecord ()
     QModelIndex currentIndex(mTable->getModelIndex (mCurrentId, 0));
 
     if (currentIndex.isValid() &&
-	currentIndex.row() < mTable->rowCount())
+        currentIndex.row() < mTable->rowCount())
     {
         std::pair<CSMWorld::UniversalId, std::string> params = mTable->view (currentIndex.row());
 

apps/opencs/view/world/dialoguesubview.hpp

@@ -118,12 +118,12 @@ namespace CSVWorld
         NotEditableSubDelegate mNotEditableDelegate;
 
         std::vector<DialogueDelegateDispatcherProxy*> mProxys;
-//once we move to the C++11 we should use unique_ptr
+        //once we move to the C++11 we should use unique_ptr
 
     public:
         DialogueDelegateDispatcher(QObject* parent,
                                    CSMWorld::IdTable* table,
-                                   QUndoStack& undoStack);
+                                   CSMDoc::Document& document);
 
         ~DialogueDelegateDispatcher();
 
@@ -175,10 +175,10 @@ namespace CSVWorld
         public:
 
             EditWidget (QWidget *parent, int row, CSMWorld::IdTable* table,
-                        QUndoStack& undoStack, bool createAndDelete = false);
+                        CSMDoc::Document& document, bool createAndDelete = false);
 
             virtual ~EditWidget();
-        
+
             void remake(int row);
 
         signals:

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,9 +31,9 @@ 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

@@ -29,23 +29,23 @@ namespace CSVWorld
         QAction *mRemoveRowAction;
         QUndoStack& mUndoStack;
         CSMWorld::NestedTableModel* mModel;
-        
+
     public:
-        NestedTable(QUndoStack& undoStack,
+        NestedTable(CSMDoc::Document& document,
                     CSMWorld::NestedTableModel* model,
                     QWidget* parent = NULL);
-        
+
     protected:
         void dragEnterEvent(QDragEnterEvent *event);
-        
+
         void dragMoveEvent(QDragMoveEvent *event);
-        
+
     private:
         void contextMenuEvent (QContextMenuEvent *event);
-        
+
     private slots:
         void removeRowActionTriggered();
-        
+
         void addNewRowActionTriggered();
     };
 }