qtbindings 4.8.6.2 → 4.8.6.3

data/ext/generator/parser/dumptree.h

@@ -1,50 +1,50 @@
-/* This file is part of KDevelop
-    Copyright 2002-2005 Roberto Raggi <roberto@kdevelop.org>
-    Copyright 2006 Hamish Rodda <rodda@kde.org>
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License version 2 as published by the Free Software Foundation.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; see the file COPYING.LIB.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef DUMPTREE_H
-#define DUMPTREE_H
-
-#include <QtCore/Qt>
-
-#include "cppparser_export.h"
-#include "default_visitor.h"
-
-class TokenStream;
-
-//Contains the name for each AST kind enumerator
-CPPPARSER_EXPORT extern char const * const names[];
-
-class CPPPARSER_EXPORT DumpTree: protected DefaultVisitor
-{
-public:
-  DumpTree();
-  virtual ~DumpTree();
-
-  void dump(AST *node, TokenStream* tokenStream = 0);
-
-protected:
-  virtual void visit(AST *node);
-
-private:
-  TokenStream* m_tokenStream;
-  int indent;
-};
-
-#endif // DUMPTREE_H
-
+/* This file is part of KDevelop
+    Copyright 2002-2005 Roberto Raggi <roberto@kdevelop.org>
+    Copyright 2006 Hamish Rodda <rodda@kde.org>
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License version 2 as published by the Free Software Foundation.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef DUMPTREE_H
+#define DUMPTREE_H
+
+#include <QtCore/Qt>
+
+#include "cppparser_export.h"
+#include "default_visitor.h"
+
+class TokenStream;
+
+//Contains the name for each AST kind enumerator
+CPPPARSER_EXPORT extern char const * const names[];
+
+class CPPPARSER_EXPORT DumpTree: protected DefaultVisitor
+{
+public:
+  DumpTree();
+  virtual ~DumpTree();
+
+  void dump(AST *node, TokenStream* tokenStream = 0);
+
+protected:
+  virtual void visit(AST *node);
+
+private:
+  TokenStream* m_tokenStream;
+  int indent;
+};
+
+#endif // DUMPTREE_H
+

data/ext/generator/parser/indexedstring.cpp

@@ -1,213 +1,213 @@
-/***************************************************************************
-   Copyright 2008 David Nolden <david.nolden.kdevelop@art-master.de>
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include <QtCore/QStringList>
-#include <QtCore/QUrl>
-#include <QtDebug>
-
-#include "indexedstring.h"
-// #include "repositories/stringrepository.h"
-
-// #include "referencecounting.h"
-
-Q_GLOBAL_STATIC(QStringList, strings);
-
-int getIndex(const QString& str) {
-    int idx = strings()->indexOf(str);
-    if (idx > -1) return idx;
-    strings()->append(str);
-    return strings()->count() - 1;
-}
-
-IndexedString::IndexedString() : m_index(0) {
-}
-
-///@param str must be a utf8 encoded string, does not need to be 0-terminated.
-///@param length must be its length in bytes.
-IndexedString::IndexedString( const char* str, unsigned short length, unsigned int hash ) {
-  if(!length)
-    m_index = 0;
-  else if(length == 1)
-    m_index = 0xffff0000 | str[0];
-  else {
-    m_index = getIndex(QString::fromUtf8(str, length));
-    /*QMutexLocker lock(globalIndexedStringRepository->mutex());
-    
-    m_index = globalIndexedStringRepository->index(IndexedStringRepositoryItemRequest(str, hash ? hash : hashString(str, length), length));
-    
-    if(shouldDoDUChainReferenceCounting(this))
-      increase(globalIndexedStringRepository->dynamicItemFromIndexSimple(m_index)->refCount);*/
-  }
-}
-
-IndexedString::IndexedString( char c ) {
-  m_index = 0xffff0000 | c;
-}
-
-IndexedString::IndexedString( const QUrl& url ) {
-  QByteArray array(url.path().toUtf8());
-
-  const char* str = array.constData();
-
-  int size = array.size();
-
-  if(!size)
-    m_index = 0;
-  else if(size == 1)
-    m_index = 0xffff0000 | str[0];
-  else {
-    m_index = getIndex(QString::fromUtf8(str));
-    /*QMutexLocker lock(globalIndexedStringRepository->mutex());
-    m_index = globalIndexedStringRepository->index(IndexedStringRepositoryItemRequest(str, hashString(str, size), size));
-    
-    if(shouldDoDUChainReferenceCounting(this))
-      increase(globalIndexedStringRepository->dynamicItemFromIndexSimple(m_index)->refCount);*/
-  }
-}
-
-IndexedString::IndexedString( const QString& string ) {
-  QByteArray array(string.toUtf8());
-
-  const char* str = array.constData();
-
-  int size = array.size();
-
-  if(!size)
-    m_index = 0;
-  else if(size == 1)
-    m_index = 0xffff0000 | str[0];
-  else {
-    m_index = getIndex(string);
-    /*QMutexLocker lock(globalIndexedStringRepository->mutex());
-    m_index = globalIndexedStringRepository->index(IndexedStringRepositoryItemRequest(str, hashString(str, size), size));
-
-    if(shouldDoDUChainReferenceCounting(this))
-      increase(globalIndexedStringRepository->dynamicItemFromIndexSimple(m_index)->refCount);*/
-  }
-}
-
-IndexedString::IndexedString( const char* str) {
-  unsigned int length = strlen(str);
-  if(!length)
-    m_index = 0;
-  else if(length == 1)
-    m_index = 0xffff0000 | str[0];
-  else {
-    m_index = getIndex(QString::fromUtf8(str));
-    /*QMutexLocker lock(globalIndexedStringRepository->mutex());
-    m_index = globalIndexedStringRepository->index(IndexedStringRepositoryItemRequest(str, hashString(str, length), length));
-    
-    if(shouldDoDUChainReferenceCounting(this))
-      increase(globalIndexedStringRepository->dynamicItemFromIndexSimple(m_index)->refCount);*/
-  }
-}
-
-IndexedString::IndexedString( const QByteArray& str) {
-  unsigned int length = str.length();
-  if(!length)
-    m_index = 0;
-  else if(length == 1)
-    m_index = 0xffff0000 | str[0];
-  else {
-    m_index = getIndex(QString::fromUtf8(str));
-    /*QMutexLocker lock(globalIndexedStringRepository->mutex());
-    m_index = globalIndexedStringRepository->index(IndexedStringRepositoryItemRequest(str, hashString(str, length), length));
-    
-    if(shouldDoDUChainReferenceCounting(this))
-      increase(globalIndexedStringRepository->dynamicItemFromIndexSimple(m_index)->refCount);*/
-  }
-}
-
-IndexedString::~IndexedString() {
-  /*if(m_index && (m_index & 0xffff0000) != 0xffff0000) {
-    if(shouldDoDUChainReferenceCounting(this)) {
-      QMutexLocker lock(globalIndexedStringRepository->mutex());
-    
-      decrease(globalIndexedStringRepository->dynamicItemFromIndexSimple(m_index)->refCount);
-    }
-  }*/
-}
-
-IndexedString::IndexedString( const IndexedString& rhs ) : m_index(rhs.m_index) {
-  /*if(m_index && (m_index & 0xffff0000) != 0xffff0000) {
-    if(shouldDoDUChainReferenceCounting(this)) {
-      QMutexLocker lock(globalIndexedStringRepository->mutex());
-      increase(globalIndexedStringRepository->dynamicItemFromIndexSimple(m_index)->refCount);
-    }
-  }*/
-}
-
-IndexedString& IndexedString::operator=(const IndexedString& rhs) {
-  if(m_index == rhs.m_index)
-    return *this;
-  /*if(m_index && (m_index & 0xffff0000) != 0xffff0000) {
-    
-    if(shouldDoDUChainReferenceCounting(this)) {
-      QMutexLocker lock(globalIndexedStringRepository->mutex());
-      decrease(globalIndexedStringRepository->dynamicItemFromIndexSimple(m_index)->refCount);
-    }
-  }*/
-  
-  m_index = rhs.m_index;
-  
-  /*if(m_index && (m_index & 0xffff0000) != 0xffff0000) {
-    if(shouldDoDUChainReferenceCounting(this)) {
-      QMutexLocker lock(globalIndexedStringRepository->mutex());
-      increase(globalIndexedStringRepository->dynamicItemFromIndexSimple(m_index)->refCount);
-    }
-  }*/
-  
-  return *this;
-}
-
-
-QUrl IndexedString::toUrl() const {
-  QUrl url( str() );
-  return url;
-}
-
-QString IndexedString::str() const {
-  if(!m_index)
-    return QString();
-  else if((m_index & 0xffff0000) == 0xffff0000)
-    return QString(QChar((char)m_index & 0xff));
-  else
-    return strings()->at(m_index); /*stringFromItem(globalIndexedStringRepository->itemFromIndex(m_index));*/
-}
-
-int IndexedString::length() const {
-  if(!m_index)
-    return 0;
-  else if((m_index & 0xffff0000) == 0xffff0000)
-    return 1;
-  else
-    return strings()->at(m_index).length(); /*globalIndexedStringRepository->itemFromIndex(m_index)->length;*/
-}
-
-QByteArray IndexedString::byteArray() const {
-  if(!m_index)
-    return QByteArray();
-  else if((m_index & 0xffff0000) == 0xffff0000)
-    return QString(QChar((char)m_index & 0xff)).toUtf8();
-  else
-    return strings()->at(m_index).toUtf8(); /*arrayFromItem(globalIndexedStringRepository->itemFromIndex(m_index));*/
-}
-
-unsigned int IndexedString::hashString(const char* str, unsigned short length) {
-  RunningHash running;
-  for(int a = length-1; a >= 0; --a) {
-    running.append(*str);
-    ++str;
-  }
-  return running.hash;
-}
+/***************************************************************************
+   Copyright 2008 David Nolden <david.nolden.kdevelop@art-master.de>
+***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include <QtCore/QStringList>
+#include <QtCore/QUrl>
+#include <QtDebug>
+
+#include "indexedstring.h"
+// #include "repositories/stringrepository.h"
+
+// #include "referencecounting.h"
+
+Q_GLOBAL_STATIC(QStringList, strings);
+
+int getIndex(const QString& str) {
+    int idx = strings()->indexOf(str);
+    if (idx > -1) return idx;
+    strings()->append(str);
+    return strings()->count() - 1;
+}
+
+IndexedString::IndexedString() : m_index(0) {
+}
+
+///@param str must be a utf8 encoded string, does not need to be 0-terminated.
+///@param length must be its length in bytes.
+IndexedString::IndexedString( const char* str, unsigned short length, unsigned int hash ) {
+  if(!length)
+    m_index = 0;
+  else if(length == 1)
+    m_index = 0xffff0000 | str[0];
+  else {
+    m_index = getIndex(QString::fromUtf8(str, length));
+    /*QMutexLocker lock(globalIndexedStringRepository->mutex());
+    
+    m_index = globalIndexedStringRepository->index(IndexedStringRepositoryItemRequest(str, hash ? hash : hashString(str, length), length));
+    
+    if(shouldDoDUChainReferenceCounting(this))
+      increase(globalIndexedStringRepository->dynamicItemFromIndexSimple(m_index)->refCount);*/
+  }
+}
+
+IndexedString::IndexedString( char c ) {
+  m_index = 0xffff0000 | c;
+}
+
+IndexedString::IndexedString( const QUrl& url ) {
+  QByteArray array(url.path().toUtf8());
+
+  const char* str = array.constData();
+
+  int size = array.size();
+
+  if(!size)
+    m_index = 0;
+  else if(size == 1)
+    m_index = 0xffff0000 | str[0];
+  else {
+    m_index = getIndex(QString::fromUtf8(str));
+    /*QMutexLocker lock(globalIndexedStringRepository->mutex());
+    m_index = globalIndexedStringRepository->index(IndexedStringRepositoryItemRequest(str, hashString(str, size), size));
+    
+    if(shouldDoDUChainReferenceCounting(this))
+      increase(globalIndexedStringRepository->dynamicItemFromIndexSimple(m_index)->refCount);*/
+  }
+}
+
+IndexedString::IndexedString( const QString& string ) {
+  QByteArray array(string.toUtf8());
+
+  const char* str = array.constData();
+
+  int size = array.size();
+
+  if(!size)
+    m_index = 0;
+  else if(size == 1)
+    m_index = 0xffff0000 | str[0];
+  else {
+    m_index = getIndex(string);
+    /*QMutexLocker lock(globalIndexedStringRepository->mutex());
+    m_index = globalIndexedStringRepository->index(IndexedStringRepositoryItemRequest(str, hashString(str, size), size));
+
+    if(shouldDoDUChainReferenceCounting(this))
+      increase(globalIndexedStringRepository->dynamicItemFromIndexSimple(m_index)->refCount);*/
+  }
+}
+
+IndexedString::IndexedString( const char* str) {
+  unsigned int length = strlen(str);
+  if(!length)
+    m_index = 0;
+  else if(length == 1)
+    m_index = 0xffff0000 | str[0];
+  else {
+    m_index = getIndex(QString::fromUtf8(str));
+    /*QMutexLocker lock(globalIndexedStringRepository->mutex());
+    m_index = globalIndexedStringRepository->index(IndexedStringRepositoryItemRequest(str, hashString(str, length), length));
+    
+    if(shouldDoDUChainReferenceCounting(this))
+      increase(globalIndexedStringRepository->dynamicItemFromIndexSimple(m_index)->refCount);*/
+  }
+}
+
+IndexedString::IndexedString( const QByteArray& str) {
+  unsigned int length = str.length();
+  if(!length)
+    m_index = 0;
+  else if(length == 1)
+    m_index = 0xffff0000 | str[0];
+  else {
+    m_index = getIndex(QString::fromUtf8(str));
+    /*QMutexLocker lock(globalIndexedStringRepository->mutex());
+    m_index = globalIndexedStringRepository->index(IndexedStringRepositoryItemRequest(str, hashString(str, length), length));
+    
+    if(shouldDoDUChainReferenceCounting(this))
+      increase(globalIndexedStringRepository->dynamicItemFromIndexSimple(m_index)->refCount);*/
+  }
+}
+
+IndexedString::~IndexedString() {
+  /*if(m_index && (m_index & 0xffff0000) != 0xffff0000) {
+    if(shouldDoDUChainReferenceCounting(this)) {
+      QMutexLocker lock(globalIndexedStringRepository->mutex());
+    
+      decrease(globalIndexedStringRepository->dynamicItemFromIndexSimple(m_index)->refCount);
+    }
+  }*/
+}
+
+IndexedString::IndexedString( const IndexedString& rhs ) : m_index(rhs.m_index) {
+  /*if(m_index && (m_index & 0xffff0000) != 0xffff0000) {
+    if(shouldDoDUChainReferenceCounting(this)) {
+      QMutexLocker lock(globalIndexedStringRepository->mutex());
+      increase(globalIndexedStringRepository->dynamicItemFromIndexSimple(m_index)->refCount);
+    }
+  }*/
+}
+
+IndexedString& IndexedString::operator=(const IndexedString& rhs) {
+  if(m_index == rhs.m_index)
+    return *this;
+  /*if(m_index && (m_index & 0xffff0000) != 0xffff0000) {
+    
+    if(shouldDoDUChainReferenceCounting(this)) {
+      QMutexLocker lock(globalIndexedStringRepository->mutex());
+      decrease(globalIndexedStringRepository->dynamicItemFromIndexSimple(m_index)->refCount);
+    }
+  }*/
+  
+  m_index = rhs.m_index;
+  
+  /*if(m_index && (m_index & 0xffff0000) != 0xffff0000) {
+    if(shouldDoDUChainReferenceCounting(this)) {
+      QMutexLocker lock(globalIndexedStringRepository->mutex());
+      increase(globalIndexedStringRepository->dynamicItemFromIndexSimple(m_index)->refCount);
+    }
+  }*/
+  
+  return *this;
+}
+
+
+QUrl IndexedString::toUrl() const {
+  QUrl url( str() );
+  return url;
+}
+
+QString IndexedString::str() const {
+  if(!m_index)
+    return QString();
+  else if((m_index & 0xffff0000) == 0xffff0000)
+    return QString(QChar((char)m_index & 0xff));
+  else
+    return strings()->at(m_index); /*stringFromItem(globalIndexedStringRepository->itemFromIndex(m_index));*/
+}
+
+int IndexedString::length() const {
+  if(!m_index)
+    return 0;
+  else if((m_index & 0xffff0000) == 0xffff0000)
+    return 1;
+  else
+    return strings()->at(m_index).length(); /*globalIndexedStringRepository->itemFromIndex(m_index)->length;*/
+}
+
+QByteArray IndexedString::byteArray() const {
+  if(!m_index)
+    return QByteArray();
+  else if((m_index & 0xffff0000) == 0xffff0000)
+    return QString(QChar((char)m_index & 0xff)).toUtf8();
+  else
+    return strings()->at(m_index).toUtf8(); /*arrayFromItem(globalIndexedStringRepository->itemFromIndex(m_index));*/
+}
+
+unsigned int IndexedString::hashString(const char* str, unsigned short length) {
+  RunningHash running;
+  for(int a = length-1; a >= 0; --a) {
+    running.append(*str);
+    ++str;
+  }
+  return running.hash;
+}