Make Quassel compile on amd64. Thanks aseigo for finding this issue and providing

the patch!

diff --git a/src/client/buffertreemodel.cpp b/src/client/buffertreemodel.cpp
index 2a7f3e1..e433519 100644 (file)
--- a/src/client/buffertreemodel.cpp
+++ b/src/client/buffertreemodel.cpp
@@ -43,7 +43,7 @@ BufferTreeItem::BufferTreeItem(Buffer *buffer, TreeItem *parent)
   setFlags(flags);
 }
 
-uint BufferTreeItem::id() const {
+quint64 BufferTreeItem::id() const {
   return buf->bufferInfo().uid();
 }
 
@@ -122,7 +122,7 @@ QVariant NetworkTreeItem::data(int column, int role) const {
   }
 }
 
-uint NetworkTreeItem::id() const {
+quint64 NetworkTreeItem::id() const {
   return _networkId;
 }
 

diff --git a/src/client/buffertreemodel.h b/src/client/buffertreemodel.h
index f0b01a0..17330a4 100644 (file)
--- a/src/client/buffertreemodel.h
+++ b/src/client/buffertreemodel.h
@@ -46,7 +46,7 @@ class BufferTreeItem : public TreeItem {
 public:
   BufferTreeItem(Buffer *, TreeItem *parent = 0);
 
-  virtual uint id() const;
+  virtual quint64 id() const;
   QVariant data(int column, int role) const;
 
   Buffer *buffer() const { return buf; }
@@ -70,7 +70,7 @@ public:
   NetworkTreeItem(const uint &netid, const QString &, TreeItem *parent = 0);
 
   virtual QVariant data(int column, int row) const;
-  virtual uint id() const;
+  virtual quint64 id() const;
 
 private:
   uint _networkId;

diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp
index fda1df4..c113b28 100644 (file)
--- a/src/client/treemodel.cpp
+++ b/src/client/treemodel.cpp
@@ -43,8 +43,8 @@ TreeItem::~TreeItem() {
   qDeleteAll(_childItems);
 }
 
-uint TreeItem::id() const {
-  return (uint)this;
+quint64 TreeItem::id() const {
+  return (quint64)this;
 }
 
 void TreeItem::appendChild(TreeItem *item) {

diff --git a/src/client/treemodel.h b/src/client/treemodel.h
index d4f2725..dc7e70d 100644 (file)
--- a/src/client/treemodel.h
+++ b/src/client/treemodel.h
@@ -41,7 +41,7 @@ public:
   void appendChild(TreeItem *child);
   void removeChild(int row);
 
-  virtual uint id() const;
+  virtual quint64 id() const;
 
   TreeItem *child(int row) const;
   TreeItem *childById(const uint &) const;
@@ -67,7 +67,7 @@ protected:
 
 private:
   QList<TreeItem *> _childItems;
-  QHash<uint, TreeItem *> _childHash; // uint to be compatible to qHash functions
+  QHash<quint64, TreeItem *> _childHash; // uint to be compatible to qHash functions
   TreeItem *_parentItem;
   Qt::ItemFlags _flags;
 };