[Jahshaka-cvs] SF.net SVN: editopia:[189] cinesuite/cineplay-cinecode/trunk/src

[<tim...@us...>]

Revision: 189
          http://editopia.svn.sourceforge.net/editopia/?rev=189&view=rev
Author:   timdewhirst
Date:     2008-09-16 11:28:20 +0000 (Tue, 16 Sep 2008)

Log Message:
-----------
cinesuite
- linux build fixes

Modified Paths:
--------------
    cinesuite/cineplay-cinecode/trunk/src/Geometry.cpp
    cinesuite/cineplay-cinecode/trunk/src/Geometry.hpp
    cinesuite/cineplay-cinecode/trunk/src/widgets/sdl_store.cpp
    cinesuite/cineplay-cinecode/trunk/src/widgets/valueFormatters.cpp

Modified: cinesuite/cineplay-cinecode/trunk/src/Geometry.cpp
===================================================================
--- cinesuite/cineplay-cinecode/trunk/src/Geometry.cpp	2008-09-15 16:09:10 UTC (rev 188)
+++ cinesuite/cineplay-cinecode/trunk/src/Geometry.cpp	2008-09-16 11:28:20 UTC (rev 189)
@@ -56,7 +56,7 @@
     return result;
 }
 
-static std::ostream& operator<<( std::ostream& os, const point3& p )
+std::ostream& operator<<( std::ostream& os, const point3& p )
 {
     os << "(" << p.x << ", " << p.y << ", " << p.z << ")";
     return os;
@@ -80,7 +80,7 @@
     return *this;
 }
 
-static std::ostream& operator<<( std::ostream& os, const vector3& p )
+std::ostream& operator<<( std::ostream& os, const vector3& p )
 {
     os << "(" << p.x << ", " << p.y << ", " << p.z << ")";
     return os;
@@ -93,7 +93,7 @@
     return *this;
 }
 
-static std::ostream& operator<<( std::ostream& os, const quad3& q )
+std::ostream& operator<<( std::ostream& os, const quad3& q )
 {
     os << "[" << q.a << ", " << q.b << ", " << q.c << ", " << q.d << "]";
     return os;

Modified: cinesuite/cineplay-cinecode/trunk/src/Geometry.hpp
===================================================================
--- cinesuite/cineplay-cinecode/trunk/src/Geometry.hpp	2008-09-15 16:09:10 UTC (rev 188)
+++ cinesuite/cineplay-cinecode/trunk/src/Geometry.hpp	2008-09-16 11:28:20 UTC (rev 189)
@@ -39,7 +39,7 @@
 	double x, y, z;
 };
 
-static std::ostream& operator<<( std::ostream& os, const point3& p );
+std::ostream& operator<<( std::ostream& os, const point3& p );
 
 /// Basic 3D vector class
 struct vector3
@@ -53,7 +53,7 @@
 	double x, y, z;
 };
 
-static std::ostream& operator<<( std::ostream& os, const vector3& p );
+std::ostream& operator<<( std::ostream& os, const vector3& p );
 
 point3 operator+( const point3& p, const vector3& v );
 
@@ -72,6 +72,6 @@
 	quad3& operator=( const quad3& );
 };
 
-static std::ostream& operator<<( std::ostream& os, const quad3& q );
+std::ostream& operator<<( std::ostream& os, const quad3& q );
 
 typedef std::list< quad3 > quad3_list;

Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/sdl_store.cpp
===================================================================
--- cinesuite/cineplay-cinecode/trunk/src/widgets/sdl_store.cpp	2008-09-15 16:09:10 UTC (rev 188)
+++ cinesuite/cineplay-cinecode/trunk/src/widgets/sdl_store.cpp	2008-09-16 11:28:20 UTC (rev 189)
@@ -12,6 +12,7 @@
 #include <QLayout>
 #include <QKeyEvent>
 #include <QCoreApplication>
+#include <QDebug>
 
 // oml
 #include <openmedialib/ml/input.hpp>
@@ -176,7 +177,7 @@
 	if ( !store_ )
 		return false;
 
-	qDebug( "sdl_store::init: store: %x", store_ );
+	qDebug() << "sdl_store::init: store:" << (void *)store_.get();
 
 	pcos::property_container props = store_->properties();
 	pcos::property wid = props.get_property_with_string( "winid" );

Modified: cinesuite/cineplay-cinecode/trunk/src/widgets/valueFormatters.cpp
===================================================================
--- cinesuite/cineplay-cinecode/trunk/src/widgets/valueFormatters.cpp	2008-09-15 16:09:10 UTC (rev 188)
+++ cinesuite/cineplay-cinecode/trunk/src/widgets/valueFormatters.cpp	2008-09-16 11:28:20 UTC (rev 189)
@@ -10,10 +10,10 @@
 #include "valueFormatters.h"
 
 // qt
-#include <qstring.h>
+#include <QString>
 
 // std
-#include <cmath>
+#include <cstdlib>
 
 namespace jahwidgets { namespace qt3 {
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.