[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegraphics/kpovmodeler
From:       Marijn Kruisselbrink <m.kruisselbrink () student ! tue ! nl>
Date:       2007-03-15 8:21:36
Message-ID: 1173946896.440099.23707.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 642712 by mkruisselbrink:

make it compile on OSX


 M  +1 -1      CMakeLists.txt  
 M  +3 -0      pmdockwidget.cpp  
 M  +4 -0      pmface.h  
 M  +4 -0      pmline.h  
 M  +4 -0      pmmatrix.h  
 M  +4 -4      pmpart.cpp  
 M  +5 -1      pmpoint.h  
 M  +7 -1      pmrendermanager.cpp  
 M  +4 -0      pmrendermanager.h  


--- trunk/KDE/kdegraphics/kpovmodeler/CMakeLists.txt #642711:642712
@@ -270,7 +270,7 @@
 kde4_add_library(lkpovmodeler SHARED ${lkpovmodeler_LIB_SRCS})
 
 target_link_libraries(lkpovmodeler ${FREETYPE_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
-    ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} QtOpenGL Xmu Xi )
+    ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${QT_QTOPENGL_LIBRARY} )
 
 set_target_properties(lkpovmodeler PROPERTIES VERSION 0.0.0 SOVERSION 0 )
 install(TARGETS lkpovmodeler  DESTINATION ${LIB_INSTALL_DIR} )
--- trunk/KDE/kdegraphics/kpovmodeler/pmdockwidget.cpp #642711:642712
@@ -39,7 +39,9 @@
 #include <QMouseEvent>
 
 #include <QMessageBox>
+#ifdef Q_WS_X11
 #include <QX11Info>
+#endif
 
 #include <kconfig.h>
 #include <kglobal.h>
@@ -48,6 +50,7 @@
 #include <kwin.h>
 #include <kdebug.h>
 #ifdef Q_WS_X11
+#include <QX11Info>
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #endif
--- trunk/KDE/kdegraphics/kpovmodeler/pmface.h #642711:642712
@@ -19,7 +19,11 @@
 #define PMFACE_H
 
 #include <q3valuevector.h>
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#else
 #include <GL/gl.h>
+#endif
 #include "pmdebug.h"
 #include "pmvector.h"
 
--- trunk/KDE/kdegraphics/kpovmodeler/pmline.h #642711:642712
@@ -22,7 +22,11 @@
 
 #include <QList>
 #include <QVector>
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#else
 #include <GL/gl.h>
+#endif
 #include "pmdebug.h"
 
 /**
--- trunk/KDE/kdegraphics/kpovmodeler/pmmatrix.h #642711:642712
@@ -29,7 +29,11 @@
 
 #include <qstring.h>
 
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#else
 #include <GL/gl.h>
+#endif
 
 class PMVector;
 
--- trunk/KDE/kdegraphics/kpovmodeler/pmpart.cpp #642711:642712
@@ -1022,7 +1022,7 @@
 
 bool PMPart::openFile( )
 {
-   QIODevice* dev = KFilterDev::deviceForFile( m_file, "application/x-gzip" );
+   QIODevice* dev = KFilterDev::deviceForFile( localFilePath(), "application/x-gzip" );
    bool success = true;
    PMObjectList list;
 
@@ -1061,7 +1061,7 @@
 
    if( !success )
    {
-      m_url = KUrl( );
+      setUrl( KUrl( ) );
       newDocument( );
    }
 
@@ -1085,7 +1085,7 @@
 {
    bool success = false;
 
-   QIODevice* dev = KFilterDev::deviceForFile( m_file, "application/x-gzip" );
+   QIODevice* dev = KFilterDev::deviceForFile( localFilePath(), "application/x-gzip" );
    if( dev && dev->open( QIODevice::WriteOnly ) )
    {
       QDomDocument doc( "KPOVMODELER" );
@@ -2778,7 +2778,7 @@
 
 void PMPart::closeDocument( )
 {
-   m_url = KUrl( );
+   setUrl( KUrl( ) );
 }
 
 void PMPart::deleteContents( )
--- trunk/KDE/kdegraphics/kpovmodeler/pmpoint.h #642711:642712
@@ -20,8 +20,12 @@
 #ifndef PMPOINT_H
 #define PMPOINT_H
 
-#include "GL/gl.h"
 #include <QVector>
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#else
+#include <GL/gl.h>
+#endif
 
 class PMVector;
 class PMMatrix;
--- trunk/KDE/kdegraphics/kpovmodeler/pmrendermanager.cpp #642711:642712
@@ -43,10 +43,16 @@
 #include <stdio.h>
 #include <math.h>
 
+
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
 #include <GL/gl.h>
 #include <GL/glu.h> // Only needed for gluPerspective
+#include <QX11Info>
+#endif
 #include <QAbstractEventDispatcher>
-#include <QX11Info>
 
 #include "pmglview.h"
 
--- trunk/KDE/kdegraphics/kpovmodeler/pmrendermanager.h #642711:642712
@@ -36,7 +36,11 @@
 #include <QGLWidget>
 
 #include <kstaticdeleter.h>
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#else
 #include <GL/gl.h>
+#endif
 #include <libkpovmodeler_export.h>
 
 class PMGLView;
[prev in list] [next in list] [prev in thread] [next in thread]