Merge branch 'master' into feature/bug_code_lang

1 files changed, 5 insertions, 5 deletions

diff --git a/src/condparser.h b/src/condparser.h
index 1ad13b1..a2f806e 100644
--- a/src/condparser.h
+++ b/src/condparser.h
@@ -5,8 +5,8 @@
  * Copyright (C) 1997-2015 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
- * documentation under the terms of the GNU General Public License is hereby 
- * granted. No representations are made about the suitability of this software 
+ * documentation under the terms of the GNU General Public License is hereby
+ * granted. No representations are made about the suitability of this software
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
@@ -22,14 +22,14 @@
  *         !     NOT operator
  */
 
-#include <qcstring.h>
+#include "qcstring.h"
 
 class CondParser
 {
   // public functions
   public:
     CondParser() : m_e(0), m_tokenType(NOTHING) {}
-    bool parse(const char *fileName,int lineNr,const char *expr);
+    bool parse(const QCString &fileName,int lineNr,const QCString &expr);
 
     // enumerations
   private:
@@ -68,7 +68,7 @@ class CondParser
     bool parseVar();
 
     bool evalOperator(const int opId, bool lhs, bool rhs);
-    bool evalVariable(const char *varName);
+    bool evalVariable(const QCString &varName);
     int getOperatorId(const QCString &opName);
 };