author | llornkcor <llornkcor> | 2003-07-10 02:40:10 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-07-10 02:40:10 (UTC) |
commit | 155d68c1e7d7dc0fed2534ac43d6d77ce2781f55 (patch) (side-by-side diff) | |
tree | e6edaa5a7040fe6c224c3943d1094dcf02e4f74c /qmake/project.h | |
parent | 86703e8a5527ef114facd02c005b6b3a7e62e263 (diff) | |
download | opie-155d68c1e7d7dc0fed2534ac43d6d77ce2781f55.zip opie-155d68c1e7d7dc0fed2534ac43d6d77ce2781f55.tar.gz opie-155d68c1e7d7dc0fed2534ac43d6d77ce2781f55.tar.bz2 |
update qmake to 1.05a
-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 @@ -7,3 +7,3 @@ ** -** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** @@ -36,4 +36,4 @@ **********************************************************************/ -#ifndef __QMAKE_H__ -#define __QMAKE_H__ +#ifndef __PROJECT_H__ +#define __PROJECT_H__ @@ -50,5 +50,5 @@ class QMakeProject QMap<QString, QStringList> vars, base_vars, cache; - bool parse(QString text, QMap<QString, QStringList> &place); - bool doProjectTest(QString func, const QString ¶ms, QMap<QString, QStringList> &place); - bool doProjectTest(QString func, QStringList args, QMap<QString, QStringList> &place); + bool parse(const QString &text, QMap<QString, QStringList> &place); + bool doProjectTest(const QString &func, const QString ¶ms, QMap<QString, QStringList> &place); + bool doProjectTest(const QString &func, QStringList args, QMap<QString, QStringList> &place); bool doProjectCheckReqs(const QStringList &deps, QMap<QString, QStringList> &place); @@ -59,3 +59,3 @@ public: - bool read(QString project, QString pwd); + bool read(const QString &project, const QString &pwd, bool just_project=FALSE); QString projectFile(); @@ -67,3 +67,3 @@ public: QMap<QString, QStringList> &variables(); - bool isActiveConfig(const QString &x); + bool isActiveConfig(const QString &x, bool regex=FALSE); @@ -71,3 +71,3 @@ protected: friend class MakefileGenerator; - bool read(QString file, QMap<QString, QStringList> &place); + bool read(const QString &file, QMap<QString, QStringList> &place); @@ -113,2 +113,2 @@ inline QMap<QString, QStringList> &QMakeProject::variables() -#endif /* __QMAKE_H__ */ +#endif /* __PROJECT_H__ */ |