diff system/Init.cpp @ 722:b0fde2a60188

Remove X11 stuff from svcore
author Chris Cannam
date Wed, 18 Jan 2012 18:13:08 +0000
parents 29efe322ab47
children 23d3a6eca5c3
line wrap: on
line diff
--- a/system/Init.cpp	Fri Jan 13 17:42:58 2012 +0000
+++ b/system/Init.cpp	Wed Jan 18 18:13:08 2012 +0000
@@ -17,26 +17,6 @@
 
 #include <qglobal.h>
 
-#ifdef Q_WS_X11
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/SM/SMlib.h>
-
-static int handle_x11_error(Display *dpy, XErrorEvent *err)
-{
-    char errstr[256];
-    XGetErrorText(dpy, err->error_code, errstr, 256);
-    if (err->error_code != BadWindow) {
-	std::cerr << "Sonic Visualiser: X Error: "
-		  << errstr << " " << int(err->error_code)
-		  << "\nin major opcode:  "
-		  << int(err->request_code) << std::endl;
-    }
-    return 0;
-}
-#endif
-
 #ifdef Q_WS_WIN32
 
 #include <fcntl.h>
@@ -77,10 +57,6 @@
 
 extern void svSystemSpecificInitialisation()
 {
-#ifdef Q_WS_X11
-    XSetErrorHandler(handle_x11_error);
-#endif
-
 #ifdef Q_WS_WIN32
     redirectStderr();