Build fixes.

diff --git a/localmylist/dynamicmodel/data.cpp b/localmylist/dynamicmodel/data.cpp
index 57f85dfb94df9a0311eb6ebe751bbb0627a49f70..3fa9e33804d3c1203b9111bfca2f47e06071a4cc 100644 (file)
--- a/localmylist/dynamicmodel/data.cpp
+++ b/localmylist/dynamicmodel/data.cpp
@@ -56,6 +56,7 @@ void Data::deref(Node *node)
        bool removed = references.removeOne(node);
 
        Q_ASSERT_X(removed, "deref", "Removing node that was not referenced");
+       Q_UNUSED(removed);
 
        if (references.isEmpty())
                type()->released(this);
@@ -63,6 +64,7 @@ void Data::deref(Node *node)
 
 void Data::updated(Data *oldData)
 {
+       Q_UNUSED(oldData);
        foreach (Node *node, references)
        {
                Q_ASSERT_X(node->parent(), "dynamicmodel", "Updating node without parent");

diff --git a/localmylist/dynamicmodel/datatype.cpp b/localmylist/dynamicmodel/datatype.cpp
index 2457f0fdf7647e6f4452afc28a7afb881857e35d..b3fac51d693687e194249d62ade89dc27df2d1a6 100644 (file)
--- a/localmylist/dynamicmodel/datatype.cpp
+++ b/localmylist/dynamicmodel/datatype.cpp
@@ -4,7 +4,6 @@
 #include <QSqlQuery>
 #include "../database.h"
 #include "../mylist.h"
-#include "data.h"
 
 namespace LocalMyList {
 namespace DynamicModel {

diff --git a/localmylist/dynamicmodel/datatype.h b/localmylist/dynamicmodel/datatype.h
index 76b338da35c61ac8fc09769060e4f218e6ddde72..3792df1f1738708a53d93c601f6a9a34fadbd481 100644 (file)
--- a/localmylist/dynamicmodel/datatype.h
+++ b/localmylist/dynamicmodel/datatype.h
@@ -2,9 +2,11 @@
 #define ABSTRACTDATATYPE_H
 
 #include "../localmylist_global.h"
-#include "datamodel.h"
 #include "../sqlasyncquery.h"
 
+#include "datamodel.h"
+#include "data.h"
+
 #include <QObject>
 #include <QString>
 #include <QStringList>
@@ -12,7 +14,6 @@
 namespace LocalMyList {
 namespace DynamicModel {
 
-class Data;
 class Node;
 class DataModel;
 

diff --git a/localmylist/dynamicmodel/node.cpp b/localmylist/dynamicmodel/node.cpp
index 552bc1a77e1c10fbdad7df960ef45984fe6fc13e..9baa6233c70df9b97afbf8bf299f12ca96910922 100644 (file)
--- a/localmylist/dynamicmodel/node.cpp
+++ b/localmylist/dynamicmodel/node.cpp
@@ -13,7 +13,7 @@ namespace LocalMyList {
 namespace DynamicModel {
 
 Node::Node(Model *model, Node *parent, int totalRowCount, Data *data)
-       : m_model(model), m_parent(parent), m_totalRowCount(totalRowCount),
+       : m_parent(parent), m_model(model), m_totalRowCount(totalRowCount),
          m_data(data), m_childType(0)
 {
        Q_ASSERT_X((parent && data) || (!parent && !data), "dynamic model", "Root node has no data and no parent. Other nodes must have both");

diff --git a/localmylist/dynamicmodel/node.h b/localmylist/dynamicmodel/node.h
index 1790d2bd717a686c3bd4987f874062e545777e1a..ea25af05f8484ca2fcf7f60769ae9c3fd149fa6c 100644 (file)
--- a/localmylist/dynamicmodel/node.h
+++ b/localmylist/dynamicmodel/node.h
@@ -57,9 +57,9 @@ private:
        NodeFactory childNodeFactory();
 
        Node *m_parent;
+       Model *m_model;
        NodeList m_children;
        int m_totalRowCount;
-       Model *m_model;
 
        Data *m_data;
        DataType *m_childType;