Fixed cppcheck-opensource#1698 (Add define support to GUI)

IOBYTE · Daniel Marjam&auml;ki · commit 1207531c217a · 2010-05-20T07:22:19.000+02:00
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -332,6 +332,15 @@ Settings MainWindow::GetCppcheckSettings()
                     incdir += "/";
                 result._includePaths.push_back(incdir.toStdString());
             }
+
+            QStringList defines = pfile.GetDefines();
+            QString define;
+            foreach(define, defines)
+            {
+                if (!result.userDefines.empty())
+                    result.userDefines += ";";
+                result.userDefines += define.toStdString();
+            }
         }
     }
 
diff --git a/gui/projectfile.cpp b/gui/projectfile.cpp
@@ -29,6 +29,9 @@ static const char ClassNameAttrib[] = "name";
 static const char IncludDirElementName[] = "includedir";
 static const char DirElementName[] = "dir";
 static const char DirNameAttrib[] = "name";
+static const char DefinesElementName[] = "defines";
+static const char DefineName[] = "define";
+static const char DefineNameAttrib[] = "name";
 
 ProjectFile::ProjectFile(QObject *parent) :
     QObject(parent)
@@ -66,6 +69,10 @@ bool ProjectFile::Read(const QString &filename)
 
             if (insideProject && xmlReader.name() == IncludDirElementName)
                 ReadIncludeDirs(xmlReader);
+
+            if (insideProject && xmlReader.name() == DefinesElementName)
+                ReadDefines(xmlReader);
+
             break;
 
         case QXmlStreamReader::EndElement:
@@ -101,6 +108,11 @@ QStringList ProjectFile::GetIncludeDirs() const
     return mIncludeDirs;
 }
 
+QStringList ProjectFile::GetDefines() const
+{
+    return mDefines;
+}
+
 void ProjectFile::ReadAutoAllocClasses(QXmlStreamReader &reader)
 {
     QXmlStreamReader::TokenType type;
@@ -184,3 +196,44 @@ void ProjectFile::ReadIncludeDirs(QXmlStreamReader &reader)
     }
     while (!allRead);
 }
+
+void ProjectFile::ReadDefines(QXmlStreamReader &reader)
+{
+    QXmlStreamReader::TokenType type;
+    bool allRead = false;
+    do
+    {
+        type = reader.readNext();
+        switch (type)
+        {
+        case QXmlStreamReader::StartElement:
+            // Read define-elements
+            if (reader.name().toString() == DefineName)
+            {
+                QXmlStreamAttributes attribs = reader.attributes();
+                QString name = attribs.value("", DefineNameAttrib).toString();
+                if (!name.isEmpty())
+                    mDefines << name;
+            }
+            break;
+
+        case QXmlStreamReader::EndElement:
+            if (reader.name().toString() == DefinesElementName)
+                allRead = true;
+            break;
+
+            // Not handled
+        case QXmlStreamReader::NoToken:
+        case QXmlStreamReader::Invalid:
+        case QXmlStreamReader::StartDocument:
+        case QXmlStreamReader::EndDocument:
+        case QXmlStreamReader::Characters:
+        case QXmlStreamReader::Comment:
+        case QXmlStreamReader::DTD:
+        case QXmlStreamReader::EntityReference:
+        case QXmlStreamReader::ProcessingInstruction:
+            break;
+        }
+    }
+    while (!allRead);
+}
diff --git a/gui/projectfile.h b/gui/projectfile.h
@@ -59,6 +59,12 @@ class ProjectFile : public QObject
     */
     QStringList GetIncludeDirs() const;
 
+    /**
+    * @brief Get list of defines.
+    * @return list of defines.
+    */
+    QStringList GetDefines() const;
+
 protected:
     /**
     * @brief Read list of automatically deallocated classes from XML.
@@ -72,6 +78,12 @@ class ProjectFile : public QObject
     */
     void ReadIncludeDirs(QXmlStreamReader &reader);
 
+    /**
+    * @brief Read list of defines from XML.
+    * @param reader XML stream reader.
+    */
+    void ReadDefines(QXmlStreamReader &reader);
+
 private:
 
     /**
@@ -88,6 +100,11 @@ class ProjectFile : public QObject
     * @brief List of include directories used to search include files.
     */
     QStringList mIncludeDirs;
+
+    /**
+    * @brief List of defines.
+    */
+    QStringList mDefines;
 };
 /// @}
 #endif  // PROJECT_FILE_H
diff --git a/gui/projectfile.txt b/gui/projectfile.txt
@@ -22,6 +22,11 @@ program. The format is:
         <dir name="c:/projects/framework/" />
         <dir name="c:/Program Files/Visual Studio 8/VC/include/" />
     </includedir>
+    <defines>
+        <define name="__cplusplus" />
+        <define name="_MSC_VER=1400" />
+        <define name="_WIN32" />
+    </defines>
 </project>
 
 See also gui.cppcheck file in gui-directory of cppcheck sources.

Original file line number	Diff line number	Diff line change
`@@ -332,6 +332,15 @@ Settings MainWindow::GetCppcheckSettings()`
`332`	`332`	`incdir += "/";`
`333`	`333`	`result._includePaths.push_back(incdir.toStdString());`
`334`	`334`	`}`
	`335`	`+`
	`336`	`+ QStringList defines = pfile.GetDefines();`
	`337`	`+ QString define;`
	`338`	`+ foreach(define, defines)`
	`339`	`+ {`
	`340`	`+ if (!result.userDefines.empty())`
	`341`	`+ result.userDefines += ";";`
	`342`	`+ result.userDefines += define.toStdString();`
	`343`	`+ }`
`335`	`344`	`}`
`336`	`345`	`}`
`337`	`346`