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

List:       kde-commits
Subject:    branches/kdevelop/3.4/src
From:       Jens Dagerbo <jens.dagerbo () swipnet ! se>
Date:       2007-01-16 20:36:49
Message-ID: 1168979809.268751.29150.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 624237 by dagerbo:

Fix partial url lookup. Thanks to Achim Spangler for the patch!

BUG: 140161

 M  +6 -4      partcontroller.cpp  


--- branches/kdevelop/3.4/src/partcontroller.cpp #624236:624237
@@ -285,17 +285,19 @@
 		if ( API::getInstance()->project() )
 		{
 			if (url.isRelativeURL(url.url())) {
-				KURL relURL(API::getInstance()->project()->projectDirectory(), url.url());
+				KURL relURL(API::getInstance()->project()->projectDirectory());
+				relURL.addPath( url.url() );
 
 				kdDebug() << k_funcinfo << "Looking for file in project dir: " << \
API::getInstance()->project()->projectDirectory() << " url " << url.url() << " \
                transformed to " << relURL.url() << ": " << done << endl;
-				if (relURL.isValid() && KIO::NetAccess::exists(url, false, 0)) {
+				if (relURL.isValid() && KIO::NetAccess::exists(relURL, false, 0)) {
 					url = relURL;
 					done = true;
 				}
 				else {
-					KURL relURL(API::getInstance()->project()->buildDirectory(), url.url());
+					KURL relURL(API::getInstance()->project()->buildDirectory());
+					relURL.addPath( url.url() );
 					kdDebug() << k_funcinfo << "Looking for file in build dir: " << \
API::getInstance()->project()->buildDirectory() << " url " << url.url() << " \
                transformed to " << relURL.url() << ": " << done << endl;
-					if (relURL.isValid() && KIO::NetAccess::exists(url, false, 0)) {
+					if (relURL.isValid() && KIO::NetAccess::exists(relURL, false, 0)) {
 						url = relURL;
 						done = true;
 					}


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