feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Introduced GLSL::DiagnosticMessage.

Browse Source
This commit is contained in:
Roberto Raggi
2010-11-19 14:42:55 +01:00
parent e443ab8814
commit 769a31fd1a
2 changed files with 167 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/libs/glsl/glslengine.h
View File

@@ -1,3 +1,32 @@
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** Commercial Usage
**
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial License Agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Nokia.
**
** GNU Lesser General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://qt.nokia.com/contact.
**
**************************************************************************/
#ifndef GLSLENGINE_H
#define GLSLENGINE_H
@@ -8,6 +37,39 @@
namespace GLSL {
class GLSL_EXPORT DiagnosticMessage
{
public:
enum Kind {
Warning,
Error
};
DiagnosticMessage();
Kind kind() const;
void setKind(Kind kind);
bool isError() const;
bool isWarning() const;
QString fileName() const;
void setFileName(const QString &fileName);
int line() const;
void setLine(int line);
QString message() const;
void setMessage(const QString &message);
private:
QString _fileName;
QString _message;
Kind _kind;
int _line;
};
class GLSL_EXPORT Engine
{
public:
@@ -16,12 +78,18 @@ public:
const QString *identifier(const QString &s);
const QString *identifier(const char *s, int n);
QSet<QString> identifiers() const;
MemoryPool *pool();
QList<DiagnosticMessage> diagnosticMessages() const;
void clearDiagnosticMessages();
void addDiagnosticMessage(const DiagnosticMessage &m);
private:
QSet<QString> _identifiers;
MemoryPool _pool;
QList<DiagnosticMessage> _diagnosticMessages;
};
} // namespace GLSL