fixed include

application/campvis.cpp

@@ -46,6 +46,10 @@
 #include "modules/columbia/pipelines/columbia1.h"
 #endif
 
+#ifdef Q_WS_X11
+#include <X11/Xlib.h>
+#endif
+  
 using namespace campvis;
 
 /**
@@ -56,13 +60,18 @@ using namespace campvis;
  * \return  0 if program exited successfully
  **/
 int main(int argc, char** argv) {
+    #ifdef Q_WS_X11
+  std::cout << "XInitThreads()\n";
+        XInitThreads();
+    #endif
+  
     CampVisApplication app(argc, argv);
     //app.addVisualizationPipeline("Advanced Ultrasound Visualization", new AdvancedUsVis());
     //app.addVisualizationPipeline("Confidence Map Generation", new CmBatchGeneration());
 //    app.addVisualizationPipeline("IXPV", new IxpvDemo());
     //app.addVisualizationPipeline("SliceVis", new SliceVis());
     //app.addVisualizationPipeline("DVRVis", new DVRVis());
-    //app.addVisualizationPipeline("VolumeRendererDemo", new VolumeRendererDemo());
+    app.addVisualizationPipeline("VolumeRendererDemo", new VolumeRendererDemo());
 #ifdef HAS_KISSCL
     //app.addVisualizationPipeline("DVR with OpenCL", new OpenCLPipeline());
 #endif
@@ -72,7 +81,7 @@ int main(int argc, char** argv) {
 #endif
 
 #ifdef CAMPVIS_HAS_MODULE_COLUMBIA
-    app.addVisualizationPipeline("Columbia", new Columbia1());
+    //app.addVisualizationPipeline("Columbia", new Columbia1());
 #endif
 
 

application/campvisapplication.h

@@ -60,7 +60,7 @@ namespace campvis {
      *  5. call deinit()
      *  6. You can now safely destroy your CampVisApplication
      */
-    class CampVisApplication : QApplication {
+    class CampVisApplication : public QApplication {
     friend class MainWindow;
 
     public:

core/properties/numericproperty.h

@@ -243,32 +243,32 @@ namespace campvis {
 
     template<typename T>
     void campvis::NumericProperty<T>::setMinValue(const T& value) {
-        _minValue = value;
+        this->_minValue = value;
         this->setValue(validateValue(this->_value));
 
-        for (std::set<AbstractProperty*>::iterator it = _sharedProperties.begin(); it != _sharedProperties.end(); ++it) {
+        for (std::set<AbstractProperty*>::iterator it = this->_sharedProperties.begin(); it != this->_sharedProperties.end(); ++it) {
             // We ensure all shared properties to be of type NumericProperty<T> in the addSharedProperty overload.
             // Hence, static_cast ist safe.
             NumericProperty<T>* child = static_cast< NumericProperty<T>* >(*it);
             child->setMinValue(value);
         }
 
-        s_minMaxChanged(this);
+        this->s_minMaxChanged(this);
     }
 
     template<typename T>
     void campvis::NumericProperty<T>::setMaxValue(const T& value) {
-        _maxValue = value;
+        this->_maxValue = value;
         this->setValue(validateValue(this->_value));
 
-        for (std::set<AbstractProperty*>::iterator it = _sharedProperties.begin(); it != _sharedProperties.end(); ++it) {
+        for (std::set<AbstractProperty*>::iterator it = this->_sharedProperties.begin(); it != this->_sharedProperties.end(); ++it) {
             // We ensure all shared properties to be of type NumericProperty<T> in the addSharedProperty overload.
             // Hence, static_cast ist safe.
             NumericProperty<T>* child = static_cast< NumericProperty<T>* >(*it);
             child->setMaxValue(value);
         }
 
-        s_minMaxChanged(this);
+        this->s_minMaxChanged(this);
     }
 
     template<typename T>

ext/sigslot/sigslot.h

@@ -92,7 +92,7 @@
 
 #include <set>
 #include <list>
-#include "tbb/include/tbb/spin_mutex.h"
+#include "tbb/spin_mutex.h"
 
 #define _SIGSLOT_HAS_TBB
 /*

ext/tgt/texturemanager.cpp

@@ -176,7 +176,7 @@ Texture* TextureManager::loadFromMemory(Texture* t, Texture::Filter filter, bool
             break;
         default:
             LERROR(static_cast<int>(t->bpp_) << " bits per pixel...error!");
-            return false;
+            return 0;
     }
 
     if (createOGLTex) {