From 38099ef7e5d1c2e968e30c8520fa0d0ea06553fa Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Fri, 4 May 2007 13:51:35 +0000
Subject: [PATCH] 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   | 2 +-
 effects/magnifier.cpp   | 3 ++-
 effects/mousemark.cpp   | 2 +-
 effects/showfps.cpp     | 2 +-
 effects/trackmouse.cpp  | 2 +-
 lib/kwinglutils.cpp     | 4 ++++
 lib/kwinglutils.h       | 2 +-
 lib/kwinglutils_funcs.h | 2 ++
 8 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/effects/boxswitch.cpp b/effects/boxswitch.cpp
index 36d33416f9..6a66aaeee5 100644
--- a/effects/boxswitch.cpp
+++ b/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"
 
diff --git a/effects/magnifier.cpp b/effects/magnifier.cpp
index 5cb60ade8e..aea5493063 100644
--- a/effects/magnifier.cpp
+++ b/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 );
diff --git a/effects/mousemark.cpp b/effects/mousemark.cpp
index 7e844d7903..da1a9355de 100644
--- a/effects/mousemark.cpp
+++ b/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"
 
diff --git a/effects/showfps.cpp b/effects/showfps.cpp
index c4ba53ee3c..c4a3cef159 100644
--- a/effects/showfps.cpp
+++ b/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"
 
diff --git a/effects/trackmouse.cpp b/effects/trackmouse.cpp
index c2cf2250b2..9ca9473a4a 100644
--- a/effects/trackmouse.cpp
+++ b/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"
 
diff --git a/lib/kwinglutils.cpp b/lib/kwinglutils.cpp
index 8e4cef6061..45c801faa9 100644
--- a/lib/kwinglutils.cpp
+++ b/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 )
diff --git a/lib/kwinglutils.h b/lib/kwinglutils.h
index 8cef044c16..e929569916 100644
--- a/lib/kwinglutils.h
+++ b/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>
diff --git a/lib/kwinglutils_funcs.h b/lib/kwinglutils_funcs.h
index 2db8df6080..c81c4c6fc1 100644
--- a/lib/kwinglutils_funcs.h
+++ b/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