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

List:       kde-commits
Subject:    [kdev-python/frameworks] /: port KUrl -> QUrl: debugger, codegen (this is a bit untested)
From:       Sven Brauch <svenbrauch () googlemail ! com>
Date:       2014-12-25 23:57:27
Message-ID: E1Y4IHX-00057a-5Z () scm ! kde ! org
[Download RAW message or body]

Git commit 20ded32ab100d9af4d5ddb33af2da2f43f84ce04 by Sven Brauch.
Committed on 25/12/2014 at 23:35.
Pushed by brauch into branch 'frameworks'.

port KUrl -> QUrl: debugger, codegen (this is a bit untested)

M  +1    -2    codegen/correctionfilegenerator.cpp
M  +1    -1    debugger/debugjob.cpp
M  +2    -3    debugger/debugjob.h

http://commits.kde.org/kdev-python/20ded32ab100d9af4d5ddb33af2da2f43f84ce04

diff --git a/codegen/correctionfilegenerator.cpp \
b/codegen/correctionfilegenerator.cpp index d61c49b..981846d 100644
--- a/codegen/correctionfilegenerator.cpp
+++ b/codegen/correctionfilegenerator.cpp
@@ -33,7 +33,6 @@
 #include <parser/parsesession.h>
 
 #include <KTextEditor/Document>
-#include <KUrl>
 
 #include "duchain/helpers.h"
 #include "parser/codehelpers.h"
@@ -154,7 +153,7 @@ void TypeCorrection::accepted()
         return;
     }
 
-    KUrl correctionFile = \
Helper::getLocalCorrectionFile(decl.data()->topContext()->url().toUrl()); +    auto \
correctionFile = Helper::getLocalCorrectionFile(decl.data()->topContext()->url().toUrl());
  if ( correctionFile.isEmpty() ) {
         KMessageBox::error(0, i18n("Sorry, cannot create hints for files which are \
not part of a project."));  return;
diff --git a/debugger/debugjob.cpp b/debugger/debugjob.cpp
index cc86589..aa2bba2 100644
--- a/debugger/debugjob.cpp
+++ b/debugger/debugjob.cpp
@@ -38,7 +38,7 @@ void DebugJob::start()
 {
     QStringList program;
     QString debuggerUrl = \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
                "kdevpythonsupport/debugger", QStandardPaths::LocateDirectory) + \
                "/kdevpdb.py";
-    program << m_interpreter << "-u" << debuggerUrl << \
m_scriptUrl.path(KUrl::RemoveTrailingSlash) << m_args; +    program << m_interpreter \
<< "-u" << debuggerUrl << m_scriptUrl.url(QUrl::StripTrailingSlash) << m_args;  \
m_session = new DebugSession(program, m_workingDirectory);  
     setStandardToolView(KDevelop::IOutputView::DebugView);
diff --git a/debugger/debugjob.h b/debugger/debugjob.h
index 1cf4e20..e73339b 100644
--- a/debugger/debugjob.h
+++ b/debugger/debugjob.h
@@ -23,7 +23,6 @@
 #include <outputview/outputjob.h>
 #include <outputview/outputmodel.h>
 #include "debugsession.h"
-#include <KUrl>
 
 namespace Python {
 
@@ -42,10 +41,10 @@ public:
     virtual void start();
     virtual bool doKill();
     
-    KUrl m_scriptUrl;
+    QUrl m_scriptUrl;
     QString m_interpreter;
     QStringList m_args;
-    KUrl m_workingDirectory;
+    QUrl m_workingDirectory;
 
 private slots:
     void standardOutputReceived(QStringList lines);


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