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

List:       kde-commits
Subject:    [kdev-python/frameworks] /: port away from deprecated kdevplatform API
From:       Sven Brauch <svenbrauch () googlemail ! com>
Date:       2014-12-26 0:14:18
Message-ID: E1Y4IXq-0007BG-RQ () scm ! kde ! org
[Download RAW message or body]

Git commit dfcb9bbcd458abd6b1474fcb38c7fa5f9d33fece by Sven Brauch.
Committed on 26/12/2014 at 00:14.
Pushed by brauch into branch 'frameworks'.

port away from deprecated kdevplatform API

M  +2    -1    duchain/helpers.cpp
M  +1    -0    parser/CMakeLists.txt
M  +2    -3    parser/astbuilder.cpp

http://commits.kde.org/kdev-python/dfcb9bbcd458abd6b1474fcb38c7fa5f9d33fece

diff --git a/duchain/helpers.cpp b/duchain/helpers.cpp
index 6f32c6a..0df5b85 100644
--- a/duchain/helpers.cpp
+++ b/duchain/helpers.cpp
@@ -41,6 +41,7 @@
 #include <interfaces/ilanguagecontroller.h>
 #include <interfaces/idocumentcontroller.h>
 #include <interfaces/ipartcontroller.h>
+#include <util/path.h>
 
 #include <shell/partcontroller.h>
 
@@ -400,7 +401,7 @@ QList<QUrl> Helper::getSearchPaths(const QUrl& workingOnDocument)
     QList<QUrl> searchPaths;
     // search in the projects, as they're packages and likely to be installed or \
                added to PYTHONPATH later
     foreach  (IProject* project, ICore::self()->projectController()->projects() ) {
-        searchPaths.append(project->folder());
+        searchPaths.append(project->path().path());
     }
     
     foreach ( const QString& path, getDataDirs() ) {
diff --git a/parser/CMakeLists.txt b/parser/CMakeLists.txt
index 774718e..945c1f5 100644
--- a/parser/CMakeLists.txt
+++ b/parser/CMakeLists.txt
@@ -29,6 +29,7 @@ generate_export_header(kdev4pythonparser EXPORT_MACRO_NAME \
KDEVPYTHONPARSER_EXPO  target_link_libraries(kdev4pythonparser LINK_PRIVATE
     KF5::KDELibs4Support
     KDev::Language
+    KDev::Util
     Qt5::Core
     ${PYTHON_LIBRARY}
 )
diff --git a/parser/astbuilder.cpp b/parser/astbuilder.cpp
index 1f171c3..db08fcf 100644
--- a/parser/astbuilder.cpp
+++ b/parser/astbuilder.cpp
@@ -22,8 +22,6 @@
 #include "astbuilder.h"
 #include "ast.h"
 
-#include <malloc.h>
-
 #include <QStringList>
 #include <QMutexLocker>
 #include <language/duchain/topducontext.h>
@@ -37,6 +35,7 @@
 #include <interfaces/icore.h>
 #include <interfaces/iprojectcontroller.h>
 #include <interfaces/iproject.h>
+#include <util/path.h>
 
 #include <QDebug>
 #include "parserdebug.h"
@@ -300,7 +299,7 @@ QPair<QString, int> fileHeaderHack(QString& contents, const QUrl& \
filename)  if ( ! proj ) {
         return QPair<QString, int>(contents, 0);
     }
-    const QUrl headerFileUrl = proj->folder().path() + "/.kdev_python_header";
+    const QUrl headerFileUrl = proj->path().path() + "/.kdev_python_header";
     QFile headerFile(headerFileUrl.path());
     QString headerFileContents;
     if ( headerFile.exists() ) {


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