-rw-r--r-- | qmake/project.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/qmake/project.h b/qmake/project.h index 201e63c..ec19f0c 100644 --- a/qmake/project.h +++ b/qmake/project.h | |||
@@ -5,7 +5,7 @@ | |||
5 | ** | 5 | ** |
6 | ** Created : 970521 | 6 | ** Created : 970521 |
7 | ** | 7 | ** |
8 | ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. | 8 | ** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. |
9 | ** | 9 | ** |
10 | ** This file is part of the network module of the Qt GUI Toolkit. | 10 | ** This file is part of the network module of the Qt GUI Toolkit. |
11 | ** | 11 | ** |
@@ -34,8 +34,8 @@ | |||
34 | ** not clear to you. | 34 | ** not clear to you. |
35 | ** | 35 | ** |
36 | **********************************************************************/ | 36 | **********************************************************************/ |
37 | #ifndef __QMAKE_H__ | 37 | #ifndef __PROJECT_H__ |
38 | #define __QMAKE_H__ | 38 | #define __PROJECT_H__ |
39 | 39 | ||
40 | #include <qstringlist.h> | 40 | #include <qstringlist.h> |
41 | #include <qstring.h> | 41 | #include <qstring.h> |
@@ -48,16 +48,16 @@ class QMakeProject | |||
48 | 48 | ||
49 | QString pfile, cfile; | 49 | QString pfile, cfile; |
50 | QMap<QString, QStringList> vars, base_vars, cache; | 50 | QMap<QString, QStringList> vars, base_vars, cache; |
51 | bool parse(QString text, QMap<QString, QStringList> &place); | 51 | bool parse(const QString &text, QMap<QString, QStringList> &place); |
52 | bool doProjectTest(QString func, const QString ¶ms, QMap<QString, QStringList> &place); | 52 | bool doProjectTest(const QString &func, const QString ¶ms, QMap<QString, QStringList> &place); |
53 | bool doProjectTest(QString func, QStringList args, QMap<QString, QStringList> &place); | 53 | bool doProjectTest(const QString &func, QStringList args, QMap<QString, QStringList> &place); |
54 | bool doProjectCheckReqs(const QStringList &deps, QMap<QString, QStringList> &place); | 54 | bool doProjectCheckReqs(const QStringList &deps, QMap<QString, QStringList> &place); |
55 | QString doVariableReplace(QString &str, const QMap<QString, QStringList> &place); | 55 | QString doVariableReplace(QString &str, const QMap<QString, QStringList> &place); |
56 | 56 | ||
57 | public: | 57 | public: |
58 | QMakeProject(); | 58 | QMakeProject(); |
59 | 59 | ||
60 | bool read(QString project, QString pwd); | 60 | bool read(const QString &project, const QString &pwd, bool just_project=FALSE); |
61 | QString projectFile(); | 61 | QString projectFile(); |
62 | QString configFile(); | 62 | QString configFile(); |
63 | 63 | ||
@@ -65,11 +65,11 @@ public: | |||
65 | QStringList &values(const QString &v); | 65 | QStringList &values(const QString &v); |
66 | QString first(const QString &v); | 66 | QString first(const QString &v); |
67 | QMap<QString, QStringList> &variables(); | 67 | QMap<QString, QStringList> &variables(); |
68 | bool isActiveConfig(const QString &x); | 68 | bool isActiveConfig(const QString &x, bool regex=FALSE); |
69 | 69 | ||
70 | protected: | 70 | protected: |
71 | friend class MakefileGenerator; | 71 | friend class MakefileGenerator; |
72 | bool read(QString file, QMap<QString, QStringList> &place); | 72 | bool read(const QString &file, QMap<QString, QStringList> &place); |
73 | 73 | ||
74 | }; | 74 | }; |
75 | 75 | ||
@@ -111,4 +111,4 @@ inline QString QMakeProject::first(const QString &v) | |||
111 | inline QMap<QString, QStringList> &QMakeProject::variables() | 111 | inline QMap<QString, QStringList> &QMakeProject::variables() |
112 | { return vars; } | 112 | { return vars; } |
113 | 113 | ||
114 | #endif /* __QMAKE_H__ */ | 114 | #endif /* __PROJECT_H__ */ |