qtbindings 4.8.6.3 → 4.8.6.4

data/ext/generator/parser/parsesession.cpp

@@ -1,106 +1,106 @@
-/* This file is part of KDevelop
-    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.
-*/
-
-#include "parsesession.h"
-
-#include "rpp/pp-location.h"
-#include "rpp/pp-environment.h"
-#include "lexer.h"
-#include "memorypool.h"
-#include "problem.h"
-#include "indexedstring.h"
-
-#include <cctype>
-
-ParseSession::ParseSession()
-  : mempool(new pool)
-  , token_stream(0)
-  , macros(0)
-  , m_locationTable(0)
-{
-}
-
-ParseSession::~ParseSession()
-{
-  delete mempool;
-  delete token_stream;
-  delete m_locationTable;
-  delete macros;
-}
-
-rpp::Anchor ParseSession::positionAt(std::size_t offset, bool collapseIfMacroExpansion) const
-{
-  Q_ASSERT(m_locationTable);
-
-  return m_locationTable->positionAt(offset, m_contents, collapseIfMacroExpansion).first;
-}
-
-QPair<rpp::Anchor, uint> ParseSession::positionAndSpaceAt(std::size_t offset, bool collapseIfMacroExpansion) const
-{
-  Q_ASSERT(m_locationTable);
-
-  return m_locationTable->positionAt(offset, m_contents, collapseIfMacroExpansion);
-}
-
-std::size_t ParseSession::size() const
-{
-  return m_contents.size() + 1;
-}
-
- uint* ParseSession::contents()
- {
-   return m_contents.data();
- }
-
-const uint* ParseSession::contents() const
- {
-   return m_contents.data();
- }
- 
-const PreprocessedContents& ParseSession::contentsVector() const
-{
-  return m_contents;
-}
-
-void ParseSession::setContents(const PreprocessedContents& contents, rpp::LocationTable* locationTable)
-{
-  m_contents = contents;
-  m_locationTable = locationTable;
-}
-
-void ParseSession::setContentsAndGenerateLocationTable(const PreprocessedContents& contents)
-{
-  m_contents = contents;
-  ///@todo We need this in the lexer, the problem is that we copy the vector when doing this
-  m_contents.append(0);
-  m_contents.append(0);
-  m_contents.append(0);
-  m_contents.append(0);
-  
-  m_locationTable = new rpp::LocationTable(m_contents);
-}
-
-void ParseSession::setUrl(const IndexedString& url)
-{
-  m_url = url;
-}
-
-const IndexedString& ParseSession::url() const
-{
-  return m_url;
-}
+/* This file is part of KDevelop
+    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.
+*/
+
+#include "parsesession.h"
+
+#include "rpp/pp-location.h"
+#include "rpp/pp-environment.h"
+#include "lexer.h"
+#include "memorypool.h"
+#include "problem.h"
+#include "indexedstring.h"
+
+#include <cctype>
+
+ParseSession::ParseSession()
+  : mempool(new pool)
+  , token_stream(0)
+  , macros(0)
+  , m_locationTable(0)
+{
+}
+
+ParseSession::~ParseSession()
+{
+  delete mempool;
+  delete token_stream;
+  delete m_locationTable;
+  delete macros;
+}
+
+rpp::Anchor ParseSession::positionAt(std::size_t offset, bool collapseIfMacroExpansion) const
+{
+  Q_ASSERT(m_locationTable);
+
+  return m_locationTable->positionAt(offset, m_contents, collapseIfMacroExpansion).first;
+}
+
+QPair<rpp::Anchor, uint> ParseSession::positionAndSpaceAt(std::size_t offset, bool collapseIfMacroExpansion) const
+{
+  Q_ASSERT(m_locationTable);
+
+  return m_locationTable->positionAt(offset, m_contents, collapseIfMacroExpansion);
+}
+
+std::size_t ParseSession::size() const
+{
+  return m_contents.size() + 1;
+}
+
+ uint* ParseSession::contents()
+ {
+   return m_contents.data();
+ }
+
+const uint* ParseSession::contents() const
+ {
+   return m_contents.data();
+ }
+ 
+const PreprocessedContents& ParseSession::contentsVector() const
+{
+  return m_contents;
+}
+
+void ParseSession::setContents(const PreprocessedContents& contents, rpp::LocationTable* locationTable)
+{
+  m_contents = contents;
+  m_locationTable = locationTable;
+}
+
+void ParseSession::setContentsAndGenerateLocationTable(const PreprocessedContents& contents)
+{
+  m_contents = contents;
+  ///@todo We need this in the lexer, the problem is that we copy the vector when doing this
+  m_contents.append(0);
+  m_contents.append(0);
+  m_contents.append(0);
+  m_contents.append(0);
+  
+  m_locationTable = new rpp::LocationTable(m_contents);
+}
+
+void ParseSession::setUrl(const IndexedString& url)
+{
+  m_url = url;
+}
+
+const IndexedString& ParseSession::url() const
+{
+  return m_url;
+}

data/ext/generator/parser/parsesession.h

@@ -1,87 +1,87 @@
-/* This file is part of KDevelop
-    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 PARSESESSION_H
-#define PARSESESSION_H
-
-#include <cstdlib>
-
-#include <QtCore/QString>
-#include <QtCore/QByteArray>
-#include <QtCore/QVector>
-#include <QtCore/QPair>
-
-#include "cppparser_export.h"
-#include "indexedstring.h"
-#include "rpp/anchor.h"
-
-namespace Cpp {
-  class EnvironmentFile;
-}
-
-class pool;
-class TokenStream;
-class Token;
-
-typedef QVector<unsigned int> PreprocessedContents;
-
-namespace rpp { class MacroBlock; class LocationTable; }
-
-/// Contains everything needed to keep an AST useful once the rest of the parser
-/// has gone away.
-class CPPPARSER_EXPORT ParseSession
-{
-public:
-  ParseSession();
-  ~ParseSession();
-
-  /**
-   * Return the position of the preprocessed source \a offset in the original source
-   * If the "collapsed" member of the returned anchor is true, the position is within a collapsed range.
-   @param collapseIfMacroExpansion @see LocationTable::positionForOffset
-   * \note the return line starts from 0, not 1.
-   */
-  rpp::Anchor positionAt(std::size_t offset, bool collapseIfMacroExpansion = false) const;
-  
-  QPair<rpp::Anchor, uint> positionAndSpaceAt(std::size_t offset, bool collapseIfMacroExpansion = false) const;
-
-  ///The contents must already be tokenized. Either by the preprocessor, or by tokenizeFromByteArray(..)
-  void setContents(const PreprocessedContents& contents, rpp::LocationTable* locationTable);
-
-  /// Unweildy name, but we want to be clear here, if there is already a location table, this would be the wrong setup function to call
-  void setContentsAndGenerateLocationTable(const PreprocessedContents& contents);
-
-  void setUrl(const IndexedString& url);
-  const IndexedString& url() const;
-
-  uint *contents();
-  const uint *contents() const;
-  const PreprocessedContents& contentsVector() const;
-  std::size_t size() const;
-  pool* mempool;
-  TokenStream* token_stream;
-
-  rpp::MacroBlock* macros;
-  IndexedString m_url; //Should contain the url from which the content was extracted, can also be empty.
-
-private:
-  PreprocessedContents m_contents;
-  rpp::LocationTable* m_locationTable;
-};
-
-#endif
+/* This file is part of KDevelop
+    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 PARSESESSION_H
+#define PARSESESSION_H
+
+#include <cstdlib>
+
+#include <QtCore/QString>
+#include <QtCore/QByteArray>
+#include <QtCore/QVector>
+#include <QtCore/QPair>
+
+#include "cppparser_export.h"
+#include "indexedstring.h"
+#include "rpp/anchor.h"
+
+namespace Cpp {
+  class EnvironmentFile;
+}
+
+class pool;
+class TokenStream;
+class Token;
+
+typedef QVector<unsigned int> PreprocessedContents;
+
+namespace rpp { class MacroBlock; class LocationTable; }
+
+/// Contains everything needed to keep an AST useful once the rest of the parser
+/// has gone away.
+class CPPPARSER_EXPORT ParseSession
+{
+public:
+  ParseSession();
+  ~ParseSession();
+
+  /**
+   * Return the position of the preprocessed source \a offset in the original source
+   * If the "collapsed" member of the returned anchor is true, the position is within a collapsed range.
+   @param collapseIfMacroExpansion @see LocationTable::positionForOffset
+   * \note the return line starts from 0, not 1.
+   */
+  rpp::Anchor positionAt(std::size_t offset, bool collapseIfMacroExpansion = false) const;
+  
+  QPair<rpp::Anchor, uint> positionAndSpaceAt(std::size_t offset, bool collapseIfMacroExpansion = false) const;
+
+  ///The contents must already be tokenized. Either by the preprocessor, or by tokenizeFromByteArray(..)
+  void setContents(const PreprocessedContents& contents, rpp::LocationTable* locationTable);
+
+  /// Unweildy name, but we want to be clear here, if there is already a location table, this would be the wrong setup function to call
+  void setContentsAndGenerateLocationTable(const PreprocessedContents& contents);
+
+  void setUrl(const IndexedString& url);
+  const IndexedString& url() const;
+
+  uint *contents();
+  const uint *contents() const;
+  const PreprocessedContents& contentsVector() const;
+  std::size_t size() const;
+  pool* mempool;
+  TokenStream* token_stream;
+
+  rpp::MacroBlock* macros;
+  IndexedString m_url; //Should contain the url from which the content was extracted, can also be empty.
+
+private:
+  PreprocessedContents m_contents;
+  rpp::LocationTable* m_locationTable;
+};
+
+#endif

data/ext/generator/parser/problem.h

@@ -1,21 +1,21 @@
-#ifndef PROBLEM_H
-#define PROBLEM_H
-
-#include "cppparser_export.h"
-#include "simplecursor.h"
-
-struct CPPPARSER_EXPORT Problem {
-    enum Source {
-        Source_Preprocessor,
-        Source_Lexer,
-        Source_Parser
-    };
-    
-    Source source;
-    QString description;
-    QString explanation;
-    QString file;
-    SimpleCursor position;
-};
-
-#endif
+#ifndef PROBLEM_H
+#define PROBLEM_H
+
+#include "cppparser_export.h"
+#include "simplecursor.h"
+
+struct CPPPARSER_EXPORT Problem {
+    enum Source {
+        Source_Preprocessor,
+        Source_Lexer,
+        Source_Parser
+    };
+    
+    Source source;
+    QString description;
+    QString explanation;
+    QString file;
+    SimpleCursor position;
+};
+
+#endif

data/ext/generator/parser/rpp/CMakeLists.txt

@@ -1,45 +1,45 @@
-
-add_subdirectory( tests )
-
-########### next target ###############
-
-set(kdevcpprpp_LIB_SRCS
-    pp-stream.cpp
-    pp-macro-expander.cpp
-    pp-scanner.cpp
-    pp-macro.cpp
-    pp-engine.cpp
-    pp-internal.cpp
-    pp-environment.cpp
-    pp-location.cpp
-    preprocessor.cpp
-    chartools.cpp
-    macrorepository.cpp
-)
-
-# Note: This library doesn't follow API/ABI/BC rules and shouldn't have a SOVERSION
-#       Its only purpose is to support the plugin without needing to add all source files
-#       to the plugin target
-kde4_add_library(kdev4cpprpp SHARED ${kdevcpprpp_LIB_SRCS})
-target_link_libraries(kdev4cpprpp ${KDE4_KDECORE_LIBS} ${KDEVPLATFORM_LANGUAGE_LIBRARY} ${KDE4_KTEXTEDITOR_LIBS} )
-
-if (WIN32)
-	# Realign the stack, for compatibility with an older ABI.
-	set_target_properties (kdev4cpprpp PROPERTIES COMPILE_FLAGS -mstackrealign)
-endif (WIN32)
-
-install(TARGETS kdev4cpprpp ${INSTALL_TARGETS_DEFAULT_ARGS} )
-
-########### install files ###############
-
-# install(FILES
-#     pp-engine.h
-#     pp-internal.h
-#     pp-macro-expander.h
-#     pp-macro.h
-#     pp-scanner.h
-#     pp-stream.h
-#     pp-environment.h
-#     preprocessor.h
-#     DESTINATION ${INCLUDE_INSTALL_DIR}/kdevelop/rpp
-# )
+
+add_subdirectory( tests )
+
+########### next target ###############
+
+set(kdevcpprpp_LIB_SRCS
+    pp-stream.cpp
+    pp-macro-expander.cpp
+    pp-scanner.cpp
+    pp-macro.cpp
+    pp-engine.cpp
+    pp-internal.cpp
+    pp-environment.cpp
+    pp-location.cpp
+    preprocessor.cpp
+    chartools.cpp
+    macrorepository.cpp
+)
+
+# Note: This library doesn't follow API/ABI/BC rules and shouldn't have a SOVERSION
+#       Its only purpose is to support the plugin without needing to add all source files
+#       to the plugin target
+kde4_add_library(kdev4cpprpp SHARED ${kdevcpprpp_LIB_SRCS})
+target_link_libraries(kdev4cpprpp ${KDE4_KDECORE_LIBS} ${KDEVPLATFORM_LANGUAGE_LIBRARY} ${KDE4_KTEXTEDITOR_LIBS} )
+
+if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (kdev4cpprpp PROPERTIES COMPILE_FLAGS -mstackrealign)
+endif (WIN32)
+
+install(TARGETS kdev4cpprpp ${INSTALL_TARGETS_DEFAULT_ARGS} )
+
+########### install files ###############
+
+# install(FILES
+#     pp-engine.h
+#     pp-internal.h
+#     pp-macro-expander.h
+#     pp-macro.h
+#     pp-scanner.h
+#     pp-stream.h
+#     pp-environment.h
+#     preprocessor.h
+#     DESTINATION ${INCLUDE_INSTALL_DIR}/kdevelop/rpp
+# )