Fix some small warnings.

Disable building SpecFilePreview until I have some more time to get it copying into the final bundle correctly..

Author: wcjohns

CMakeLists.txt

@@ -993,7 +993,7 @@ message( "Linking ${LINK_TO_OBJECT} to ${LIBRARIES_TO_LINK_TO}" )
 target_link_libraries( ${LINK_TO_OBJECT} PUBLIC ${LIBRARIES_TO_LINK_TO} )
 
 if( BUILD_AS_OSX_APP )
-    add_subdirectory( target/macOsQuickLook/SpecFilePreview/SpecFilePreview )
+#    add_subdirectory( target/macOsQuickLook/SpecFilePreview/SpecFilePreview )
 endif( BUILD_AS_OSX_APP )
 
 IF( BUILD_AS_UNIT_TEST_SUITE )

InterSpec/PeakSearchGuiUtils.h

@@ -40,9 +40,9 @@
 class PeakDef;
 class PeakModel;
 class InterSpec;
-class ColorTheme;
+struct ColorTheme;
 class Measurement;
-class ReferenceLineInfo;
+struct ReferenceLineInfo;
 class ReferencePhotopeakDisplay;
 
 namespace Wt{

src/ColorThemeWindow.cpp

@@ -482,7 +482,7 @@ void ColorThemeWindow::uploadThemeCallback()
     }
   }) );
 
-  upload->fileTooLarge().connect( std::bind( [this,window,upload](){
+  upload->fileTooLarge().connect( std::bind( [window,upload](){
     upload->hide();
     new WText( "Too Large of file.", window->contents() );
   }) );

src/InterSpec.cpp

@@ -3555,19 +3555,25 @@ void InterSpec::showWelcomeDialog( bool force )
     return;
   }
 
-  /*
-   For Android, showing this useInfoWindow at startup causes some exceptions
-   in the JavaScript whenever the loading indicator is shown.  I'm pretty 
-   confused by it.
-   I tried setting a new loading indicator in deleteWelcomeCountDialog(), but it didnt work
-   */
-  
-  std::function<void(bool)> dontShowAgainCallback = [this](bool value){
-    InterSpecUser::setPreferenceValue<bool>( m_user, "ShowSplashScreen", value, this );
-  };
-  m_useInfoWindow = new UseInfoWindow( dontShowAgainCallback , this );
+  WServer::instance()->post( wApp->sessionId(), std::bind( [this](){
+    /*
+     For Android, showing this useInfoWindow at startup causes some exceptions
+     in the JavaScript whenever the loading indicator is shown.  I'm pretty
+     confused by it.
+     I tried setting a new loading indicator in deleteWelcomeCountDialog(), but it didnt work
+     
+     Havent checked if creating this window via "posting" helps
+     */
+    if( m_useInfoWindow )
+      return;
+    
+    std::function<void(bool)> dontShowAgainCallback = [this](bool value){
+      InterSpecUser::setPreferenceValue<bool>( m_user, "ShowSplashScreen", value, this );
+    };
+    m_useInfoWindow = new UseInfoWindow( dontShowAgainCallback , this );
 
-  m_useInfoWindow->finished().connect( this, &InterSpec::deleteWelcomeCountDialog );
+    m_useInfoWindow->finished().connect( this, &InterSpec::deleteWelcomeCountDialog );
+  } ) );
 }//void showWelcomeDialog()
 
 

src/PeakDef.cpp

@@ -2200,13 +2200,17 @@ std::string PeakDef::gaus_peaks_to_json(const std::vector<std::shared_ptr<const
 		}//switch( p.type() )
 
 		answer << q << "skewType" << q << ":";
-		switch (p.type())
+		switch( p.skewType() )
 		{
-		case PeakDef::NoSkew:     answer << q << "NoSkew" << q << ","; break;
-		case PeakDef::LandauSkew: answer << q << "LandauSkew" << q << ",";     break;
+		  case PeakDef::NoSkew:
+        answer << q << "NoSkew" << q << ",";
+        break;
+        
+		  case PeakDef::LandauSkew:
+        answer << q << "LandauSkew" << q << ",";
+        break;
 		}//switch( p.type() )
 
-
 		for (PeakDef::CoefficientType t = PeakDef::CoefficientType(0);
 			t < PeakDef::NumCoefficientTypes; t = PeakDef::CoefficientType(t + 1))
 		{