Major config.h cleanup, moved much stuff to config-X11.h and to config-fish.h

svn path=/trunk/KDE/kdebase/workspace/; revision=661060

effects/boxswitch.cpp

@@ -8,7 +8,7 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
-#include <config.h>
+#include <config-X11.h>
 
 #include "boxswitch.h"
 

effects/magnifier.cpp

@@ -8,7 +8,7 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
-#include <config.h>
+#include <config-X11.h> // HAVE_OPENGL
 
 #include "magnifier.h"
 
@@ -62,6 +62,7 @@ void MagnifierEffect::paintScreen( int mask, QRegion region, ScreenPaintData& da
     effects->paintScreen( mask, region, data ); // paint normal screen
     if( zoom != 1.0 )
         { // paint magnifier
+// ## TODO this should be inside HAVE_OPENGL
         glPushAttrib( GL_ENABLE_BIT );
         QRect area = magnifierArea();
         glEnable( GL_SCISSOR_TEST );

effects/mousemark.cpp

@@ -8,7 +8,7 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
-#include <config.h>
+#include <config-X11.h>
 
 #include "mousemark.h"
 

effects/showfps.cpp

@@ -8,7 +8,7 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
-#include <config.h>
+#include <config-X11.h>
 
 #include "showfps.h"
 

effects/trackmouse.cpp

@@ -8,7 +8,7 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
-#include <config.h>
+#include <config-X11.h>
 
 #include "trackmouse.h"
 

lib/kwinglutils.cpp

@@ -95,9 +95,13 @@ bool hasGLExtension(const QString& extension)
 
 void checkGLError( const char* txt )
     {
+#ifdef HAVE_OPENGL
     GLenum err = glGetError();
     if( err != GL_NO_ERROR )
         kWarning() << "GL error (" << txt << "): 0x" << QString::number( err, 16 ) << endl;
+#else
+    Q_UNUSED( txt );
+#endif
     }
 
 int nearestPowerOfTwo( int x )

lib/kwinglutils.h

@@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #ifndef KWIN_GLUTILS_H
 #define KWIN_GLUTILS_H
 
-#include <config.h>
+#include <config-X11.h> // HAVE_OPENGL
 
 #ifdef HAVE_OPENGL
 #include <GL/gl.h>

lib/kwinglutils_funcs.h

@@ -15,6 +15,8 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #define KWIN_EXPORT KDE_EXPORT
 
+#include <config-X11.h> // HAVE_OPENGL
+
 #ifdef HAVE_OPENGL
 
 namespace KWin