Some code cleanup

3 files changed, 78 insertions, 78 deletions

diff --git a/src/glfunctions.h b/src/glfunctions.h
index 5c8d8a6..03b88d1 100755
--- a/src/glfunctions.h
+++ b/src/glfunctions.h
@@ -1,75 +1,75 @@
-/****************************************************************************

-**

-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).

-** All rights reserved.

-** Contact: Nokia Corporation (qt-info@nokia.com)

-**

-** This file is part of the QML Shaders plugin of the Qt Toolkit.

-**

-** $QT_BEGIN_LICENSE:LGPL$

-** No Commercial Usage

-** This file contains pre-release code and may not be distributed.

-** You may use this file in accordance with the terms and conditions

-** contained in the Technology Preview License Agreement accompanying

-** this package.

-**

-** 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.

-**

-** In addition, as a special exception, Nokia gives you certain additional

-** rights.  These rights are described in the Nokia Qt LGPL Exception

-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.

-**

-** If you have questions regarding the use of this file, please contact

-** Nokia at qt-info@nokia.com.

-**

-**

-**

-**

-**

-**

-**

-**

-** $QT_END_LICENSE$

-**

-****************************************************************************/

-

-#ifndef GLFUNCTIONS_H

-#define GLFUNCTIONS_H

-

-#ifndef QT_OPENGL_ES

-

-#ifndef Q_WS_MAC

-# ifndef QGLF_APIENTRYP

-#   ifdef QGLF_APIENTRY

-#     define QGLF_APIENTRYP QGLF_APIENTRY *

-#   else

-#     define QGLF_APIENTRY

-#     define QGLF_APIENTRYP *

-#   endif

-# endif

-#else

-# define QGLF_APIENTRY

-# define QGLF_APIENTRYP *

-#endif

-

-#define GL_TEXTURE0 0x84C0

-#define GL_CLAMP_TO_EDGE 0x812F

-#define GL_BGRA 0x80E1

-

-typedef void (QGLF_APIENTRYP type_glActiveTexture)(GLenum texture);

-typedef void (QGLF_APIENTRYP type_glGenerateMipmap)(GLenum target);

-typedef void (QGLF_APIENTRYP type_glVertexAttribPointer)(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);

-

-#define glActiveTexture ((type_glActiveTexture)QGLContext::currentContext()->getProcAddress(QLatin1String("glActiveTexture")))

-#define glGenerateMipmap ((type_glGenerateMipmap)QGLContext::currentContext()->getProcAddress(QLatin1String("glGenerateMipmap")))

-#define glVertexAttribPointer ((type_glVertexAttribPointer)QGLContext::currentContext()->getProcAddress(QLatin1String("glVertexAttribPointer")))

-

-#endif

-

-#endif // GLFUNCTIONS_H

+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QML Shaders plugin of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GLFUNCTIONS_H
+#define GLFUNCTIONS_H
+
+#ifndef QT_OPENGL_ES
+
+#ifndef Q_WS_MAC
+# ifndef QGLF_APIENTRYP
+#   ifdef QGLF_APIENTRY
+#     define QGLF_APIENTRYP QGLF_APIENTRY *
+#   else
+#     define QGLF_APIENTRY
+#     define QGLF_APIENTRYP *
+#   endif
+# endif
+#else
+# define QGLF_APIENTRY
+# define QGLF_APIENTRYP *
+#endif
+
+#define GL_TEXTURE0 0x84C0
+#define GL_CLAMP_TO_EDGE 0x812F
+#define GL_BGRA 0x80E1
+
+typedef void (QGLF_APIENTRYP type_glActiveTexture)(GLenum texture);
+typedef void (QGLF_APIENTRYP type_glGenerateMipmap)(GLenum target);
+typedef void (QGLF_APIENTRYP type_glVertexAttribPointer)(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
+
+#define glActiveTexture ((type_glActiveTexture)QGLContext::currentContext()->getProcAddress(QLatin1String("glActiveTexture")))
+#define glGenerateMipmap ((type_glGenerateMipmap)QGLContext::currentContext()->getProcAddress(QLatin1String("glGenerateMipmap")))
+#define glVertexAttribPointer ((type_glVertexAttribPointer)QGLContext::currentContext()->getProcAddress(QLatin1String("glVertexAttribPointer")))
+
+#endif
+
+#endif // GLFUNCTIONS_H
diff --git a/src/shadereffect.cpp b/src/shadereffect.cpp
index a76c1c6..bbea43c 100644
--- a/src/shadereffect.cpp
+++ b/src/shadereffect.cpp
@@ -50,7 +50,7 @@
 static QTransform savedWorldTransform;
 
 ShaderEffect::ShaderEffect(QObject *parent)
-    : QGraphicsEffect(parent)    
+    : QGraphicsEffect(parent)
     , m_changed(true)
 {
 }
@@ -74,7 +74,7 @@ void ShaderEffect::prepareBufferedDraw(QPainter *painter)
 
 void ShaderEffect::draw (QPainter *painter)
 {
-    const QGLContext *context = QGLContext::currentContext();    
+    const QGLContext *context = QGLContext::currentContext();
 
     prepareBufferedDraw(painter);
 
diff --git a/src/shadereffectsource.cpp b/src/shadereffectsource.cpp
index 41e8011..0a133bd 100644
--- a/src/shadereffectsource.cpp
+++ b/src/shadereffectsource.cpp
@@ -336,7 +336,7 @@ void ShaderEffectSource::bind() const
 }
 
 void ShaderEffectSource::refFromEffectItem()
-{        
+{
     if (m_refs++ == 0) {
         attachSourceItem();
         emit activeChanged();