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

List:       kde-commits
Subject:    kdevelop/parts/doctreeview
From:       Roberto Raggi <roberto () kdevelop ! org>
Date:       2003-09-24 23:30:08
[Download RAW message or body]

CVS commit by raggi: 

don't store project directory absolute path in .kdevelop file


  M +13 -4     doctreeprojectconfigwidget.cpp   1.7


--- kdevelop/parts/doctreeview/doctreeprojectconfigwidget.cpp  #1.6:1.7
@@ -173,10 +173,10 @@ void DocTreeProjectConfigWidget::readCon
     QString userdocDir = DomUtil::readEntry(d ,
         "/kdevdoctreeview/projectdoc/userdocDir", m_project->projectDirectory() + \
                "/html/" );
-    userdocdirEdit->setURL( userdocDir );
+    userdocdirEdit->setURL( userdocDir[0] != QChar('/') ? \
m_project->projectDirectory() + QString("/") + userdocDir : userdocDir );  \
userdocdirEdit->fileDialog()->setMode( KFile::Directory );  
     QString apidocDir = DomUtil::readEntry(d,
         "/kdevdoctreeview/projectdoc/apidocDir", m_project->projectDirectory() + \
                "/html/" );
-    apidocdirEdit->setURL( apidocDir );
+    apidocdirEdit->setURL( apidocDir[0] != QChar('/') ? \
m_project->projectDirectory() + QString("/") + apidocDir : apidocDir );  \
apidocdirEdit->fileDialog()->setMode( KFile::Directory );  
@@ -268,8 +268,17 @@ void DocTreeProjectConfigWidget::storeCo
         d = *m_project->projectDom();
 
+    QString userdocUrl = userdocdirEdit->url();
+    QString apidocUrl = apidocdirEdit->url();
+
+    if( userdocUrl.startsWith(m_project->projectDirectory()) )
+        userdocUrl = userdocUrl.mid( m_project->projectDirectory().length() + 1 );
+
+    if( apidocUrl.startsWith(m_project->projectDirectory()) )
+        apidocUrl = apidocUrl.mid( m_project->projectDirectory().length() + 1 );
+
     DomUtil::writeEntry(d,
-        "/kdevdoctreeview/projectdoc/userdocDir", userdocdirEdit->url());
+        "/kdevdoctreeview/projectdoc/userdocDir", userdocUrl );
     DomUtil::writeEntry(d,
-        "/kdevdoctreeview/projectdoc/apidocDir", apidocdirEdit->url());
+        "/kdevdoctreeview/projectdoc/apidocDir", apidocUrl );
 
     DomUtil::writeListEntry(d,


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