Commits

iorodeo  committed 990f4a6

Added explicit cast to setMapper calls in the videoMode, frameRate, property populate methods.

  • Participants
  • Parent commits aa75315

Comments (0)

Files changed (1)

File src/gui/camera_window.cpp

                     videoModeSignalMapperPtr_, 
                     SLOT(map())
                    );
-            videoModeSignalMapperPtr_ -> setMapping(modeActionPtr, mode);
+            videoModeSignalMapperPtr_ -> setMapping(modeActionPtr, int(mode));
 
             if (mode == currentVideoMode)
             {
             // --------------------------------------------------------------------
             // TO DO ... temporary, currently don't allow video mode to be changed
             // ---------------------------------------------------------------------
-            //modeActionPtr -> setEnabled(false);
+            modeActionPtr -> setEnabled(false);
         }
     }
 
                     frameRateSignalMapperPtr_, 
                     SLOT(map())
                    );
-            frameRateSignalMapperPtr_ -> setMapping(rateActionPtr, rate);
+            frameRateSignalMapperPtr_ -> setMapping(rateActionPtr, int(rate));
 
             if (rate == currentFrameRate)
             {
             // --------------------------------------------------------------------
             // TO DO ... temporary, currently don't allow frame rate to be changed
             // ---------------------------------------------------------------------
-            //rateActionPtr -> setEnabled(false);
+            rateActionPtr -> setEnabled(false);
         }
     }
 
                         propertiesSignalMapperPtr_, 
                         SLOT(map())
                         );
-                propertiesSignalMapperPtr_ -> setMapping(propActionPtr, prop.type);
+                propertiesSignalMapperPtr_ -> setMapping(propActionPtr, int(prop.type));
 
                 // --------------------------------------------------------------
                 // TO DO ... temporary