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

List:       kde-commits
Subject:    KDE/kdevelop/plugins
From:       David Nolden <david.nolden.kde () art-master ! de>
Date:       2009-02-01 0:24:24
Message-ID: 1233447864.866262.9520.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 919445 by zwabel:

- Unbreak the changes of r918782. KUrl::isRelativeUrl does not work with paths, and \
always returns true on them. So use KUrl(path).isRelative(), which works properly. \
This fixes the problem that tons of includes were not found, because the \
include-paths were put together wrongly.



 M  +1 -0      languages/cpp/cppparsejob.h  
 M  +6 -6      languages/cpp/includepathresolver.cpp  
 M  +1 -0      languages/cpp/preprocessjob.cpp  
 M  +1 -0      languages/cpp/preprocessjob.h  
 M  +1 -1      managers/cmake/cmakemanager.cpp  


--- trunk/KDE/kdevelop/plugins/languages/cpp/cppparsejob.h #919444:919445
@@ -3,6 +3,7 @@
 *
 * Copyright 2006 Adam Treat <treat@kde.org>
 * Copyright 2006-2007 Hamish Rodda <rodda@kde.org>
+* Copyright 2007-2009 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 Library General Public License as
--- trunk/KDE/kdevelop/plugins/languages/cpp/includepathresolver.cpp #919444:919445
@@ -286,7 +286,7 @@
   //Make the working-directory absolute
   QString workingDirectory = _workingDirectory;
   
-  if( KUrl::isRelativeUrl(workingDirectory) ) {
+  if( KUrl(workingDirectory).isRelative() ) {
     KUrl u( QDir::currentPath() );
     u.addPath( workingDirectory );
     workingDirectory = u.path();
@@ -337,7 +337,7 @@
   QFileInfo fi( file );
 
   QString absoluteFile = file;
-  if( KUrl::isRelativeUrl( file ) )
+  if( KUrl( file ).isRelative() )
     absoluteFile = workingDirectory + '/' + file;
   KUrl u( absoluteFile );
   u.cleanPath();
@@ -350,7 +350,7 @@
   targetName = file.left( dot );
 
   QString wd = dir.path();
-  if( KUrl::isRelativeUrl( wd ) ) {
+  if( KUrl( wd ).isRelative() ) {
     wd = QDir::currentPath() + '/' + wd;
     KUrl u( wd );
     u.cleanPath();
@@ -491,7 +491,7 @@
           int cdIndex = prefix.lastIndexOf( "cd ");
           if( cdIndex != -1 ) {
             newWorkingDirectory = prefix.right( prefix.length() - 3 - cdIndex \
                ).trimmed();
-            if( KUrl::isRelativeUrl( newWorkingDirectory ) )
+            if( KUrl( newWorkingDirectory ).isRelative() )
               newWorkingDirectory = workingDirectory + '/' + newWorkingDirectory;
             KUrl u( newWorkingDirectory );
             u.cleanPath();
@@ -506,7 +506,7 @@
             ///Looks like valid parameters
             ///Make the file-name absolute, so it can be referenced from any \
directory  QString absoluteFile = file;
-            if( KUrl::isRelativeUrl( absoluteFile ) )
+            if( KUrl( absoluteFile ).isRelative() )
               absoluteFile = workingDirectory +  '/' + file;
             KUrl u( absoluteFile );
             u.cleanPath();
@@ -564,7 +564,7 @@
         path = path.mid( 1, path.length() - 2 );
       }
     }
-    if( KUrl::isRelativeUrl( path ) )
+    if( KUrl( path ).isRelative() )
       path = workingDirectory + '/' + path;
 
     KUrl u( path );
--- trunk/KDE/kdevelop/plugins/languages/cpp/preprocessjob.cpp #919444:919445
@@ -2,6 +2,7 @@
 * This file is part of KDevelop
 *
 * Copyright 2006 Adam Treat <treat@kde.org>
+* Copyright 2007-2009 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 Library General Public License as
--- trunk/KDE/kdevelop/plugins/languages/cpp/preprocessjob.h #919444:919445
@@ -2,6 +2,7 @@
 * This file is part of KDevelop
 *
 * Copyright 2006 Adam Treat <treat@kde.org>
+* Copyright 2007-2009 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 Library General Public License as
--- trunk/KDE/kdevelop/plugins/managers/cmake/cmakemanager.cpp #919444:919445
@@ -549,7 +549,7 @@
             foreach(const QString& s, v.includeDirectories())
             {
                 QString dir(s);
-                if(KUrl::isRelativeUrl( s ) && !s.startsWith("#["))
+                if(KUrl( s ).isRelative() && !s.startsWith("#["))
                 {
                     KUrl path=folder->url();
                     path.addPath(s);


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