Fix 2 warnings

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglwidget.h; revision=597023

diff --git a/kalzium/kalziumglwidget.cpp b/kalzium/kalziumglwidget.cpp
index a99538e8caab2c017c5c4ab705b55a5920c24581..3345d273ccda980675e43f5d46c91059bbb5daa4 100644 (file)
--- a/kalzium/kalziumglwidget.cpp
+++ b/kalzium/kalziumglwidget.cpp
@@ -124,7 +124,7 @@ void KalziumGLWidget::renderScene( GLenum renderMode,
                        const QPoint *mousePosition,
                        GLsizei selectionBufferSize,
                        GLuint *selectionBuffer,
-                       GLint *numberOfHits )
+                       GLuint *numberOfHits )
 {
        // if renderMode is not GL_RENDER, check that it is GL_SELECT and that
        // the required arguments have been passed
@@ -591,8 +591,14 @@ void KalziumGLWidget::computeClickedAtom(
        if( ! m_molecule ) return;
 
        const GLsizei selectionBufferSize = 1024;
-       GLuint selectionBuffer[selectionBufferSize];
-       GLint numberOfHits;
+
+       GLuint i, names,
+              minZ = 0xffffffff,
+              *ptrNames = 0,
+              numberOfNames = 0,
+              numberOfHits,
+              selectionBuffer[selectionBufferSize],
+              *ptr = selectionBuffer;
 
        renderScene( GL_SELECT,
                &mousePosition,
@@ -600,11 +606,7 @@ void KalziumGLWidget::computeClickedAtom(
                selectionBuffer,
                &numberOfHits );
 
-       unsigned int i, j;
-       GLuint names, *ptr = selectionBuffer,
-               minZ = 0xffffffff,
-               *ptrNames,
-               numberOfNames = 0;
+
        for( i = 0; i < numberOfHits; i++ )
        {
                names = *ptr;
@@ -618,7 +620,7 @@ void KalziumGLWidget::computeClickedAtom(
                ptr += names+2;
        }
 
-       for( j = 0, ptr = ptrNames; j < numberOfNames; j++, ptr++ )
+       for( i = 0, ptr = ptrNames; i < numberOfNames; i++, ptr++ )
                if( *ptr )
                {
                        m_clickedAtom = m_molecule->GetAtom( *ptr );

diff --git a/kalzium/kalziumglwidget.h b/kalzium/kalziumglwidget.h
index ae1a8c4c96ff50f4ed21056ea73d14eef4b52d10..cc19aee8f0a5184049cd015aa6101b172454365c 100644 (file)
--- a/kalzium/kalziumglwidget.h
+++ b/kalzium/kalziumglwidget.h
@@ -227,7 +227,7 @@ class KalziumGLWidget : public QGLWidget
                        const QPoint * mousePosition = 0,
                        GLsizei selectionBufferSize = 0,
                        GLuint * selectionBuffer = 0,
-                       GLint * numberOfHits = 0 );
+                       GLuint * numberOfHits = 0 );
 
                /**
                 * recomputes the geometry of the geometric objects ( sphere,