[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdev-python/frameworks] parser: port astbuilder KUrl -> QUrl
From:       Sven Brauch <svenbrauch () googlemail ! com>
Date:       2014-12-25 23:57:25
Message-ID: E1Y4IHV-00057a-Bd () scm ! kde ! org
[Download RAW message or body]

Git commit 9e4e2a8de2227cc9cf5045c9112a58b795d4b232 by Sven Brauch.
Committed on 25/12/2014 at 22:50.
Pushed by brauch into branch 'frameworks'.

port astbuilder KUrl -> QUrl

M  +2    -3    parser/astbuilder.cpp
M  +3    -3    parser/astbuilder.h

http://commits.kde.org/kdev-python/9e4e2a8de2227cc9cf5045c9112a58b795d4b232

diff --git a/parser/astbuilder.cpp b/parser/astbuilder.cpp
index 9b4ae62..1f171c3 100644
--- a/parser/astbuilder.cpp
+++ b/parser/astbuilder.cpp
@@ -25,7 +25,6 @@
 #include <malloc.h>
 
 #include <QStringList>
-#include <KUrl>
 #include <QMutexLocker>
 #include <language/duchain/topducontext.h>
 #include <language/duchain/problem.h>
@@ -294,7 +293,7 @@ QString PyUnicodeObjectToQString(PyObject* obj) {
 #endif // windows
 }
 
-QPair<QString, int> fileHeaderHack(QString& contents, const KUrl& filename)
+QPair<QString, int> fileHeaderHack(QString& contents, const QUrl& filename)
 {
     IProject* proj = ICore::self()->projectController()->findProjectForUrl(filename);
     // the file is not in a project, don't apply hack
@@ -375,7 +374,7 @@ struct PythonInitializer : private QMutexLocker {
 };
 }
 
-CodeAst::Ptr AstBuilder::parse(KUrl filename, QString &contents)
+CodeAst::Ptr AstBuilder::parse(const QUrl& filename, QString &contents)
 {
     qDebug() << " ====> AST     ====>     building abstract syntax tree for " << filename.path();
     
diff --git a/parser/astbuilder.h b/parser/astbuilder.h
index 86a15d4..2430112 100644
--- a/parser/astbuilder.h
+++ b/parser/astbuilder.h
@@ -25,7 +25,7 @@
 #include "ast.h"
 #include "parserexport.h"
 
-#include <KUrl>
+#include <QUrl>
 #include "astdefaultvisitor.h"
 
 #include <language/duchain/topducontext.h>
@@ -46,14 +46,14 @@ class CodeAst;
 
 typedef QMap<QString, QString> stringDictionary;
 
-QPair<QString, int> fileHeaderHack(QString& contents, const KUrl& filename);
+QPair<QString, int> fileHeaderHack(QString& contents, const QUrl& filename);
 
 QString PyUnicodeObjectToQString(PyObject* obj);
 
 class KDEVPYTHONPARSER_EXPORT AstBuilder
 {
 public:
-    CodeAst::Ptr parse(KUrl filename, QString &contents);
+    CodeAst::Ptr parse(const QUrl& filename, QString &contents);
     QList<KDevelop::ProblemPointer> m_problems;
 private:
     static QMutex pyInitLock;

[prev in list] [next in list] [prev in thread] [next in thread]