[Uml-devel] branches/KDE/3.5/kdesdk/umbrello/umbrello

[Oliver Kellogg]

SVN commit 449040 by okellogg:

addIncludePath(): New.

 M  +12 -2     import_utils.cpp  
 M  +9 -1      import_utils.h  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/import_utils.cpp #449039:449040
@@ -52,6 +52,11 @@
  */
 bool bPutAtGlobalScope = false;
 
+/**
+ * The include path list (see addIncludePath() and includePathList())
+ */
+QStringList incPathList;
+
 void putAtGlobalScope(bool yesno) {
     bPutAtGlobalScope = yesno;
 }
@@ -317,13 +322,18 @@
 }
 
 QStringList includePathList() {
-    QStringList includePathList;
+    QStringList includePathList(incPathList);
     char *umbrello_incpath = getenv( "UMBRELLO_INCPATH" );
     if (umbrello_incpath) {
-        includePathList = QStringList::split( ':', umbrello_incpath );
+        includePathList += QStringList::split( ':', umbrello_incpath );
     }
     return includePathList;
 }
 
+void addIncludePath(QString path) {
+    if (! incPathList.contains(path))
+        incPathList.append(path);
+}
+
 }  // end namespace Import_Utils
 
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/import_utils.h #449039:449040
@@ -110,11 +110,19 @@
     QString formatComment(const QString &comment);
 
     /**
-     * Return the list of paths set by the environment variable UMBRELLO_INCPATH.
+     * Return the list of paths set by previous calls to addIncludePath()
+     * and the environment variable UMBRELLO_INCPATH.
+     * This list can be used for finding #included (or Ada with'ed or...)
+     * files.
      */
     QStringList includePathList();
 
     /**
+     * Add a path to the include path list.
+     */
+    void addIncludePath(QString path);
+
+    /**
      * Returns whether the last createUMLObject() actually created
      * a new object or just returned an existing one.
      */