mirror of
				https://github.com/ciphervance/supercell-wx.git
				synced 2025-10-31 01:50:06 +00:00 
			
		
		
		
	emit keyword is incompatible with oneTBB
This commit is contained in:
		
							parent
							
								
									b9f55fbb4d
								
							
						
					
					
						commit
						ea6134acea
					
				
					 24 changed files with 81 additions and 72 deletions
				
			
		|  | @ -631,9 +631,10 @@ void RadarProductManagerImpl::RefreshData( | |||
| 
 | ||||
|             if (newObjects > 0) | ||||
|             { | ||||
|                emit providerManager->NewDataAvailable(providerManager->group_, | ||||
|                                                       providerManager->product_, | ||||
|                                                       latestTime); | ||||
|                Q_EMIT providerManager->NewDataAvailable( | ||||
|                   providerManager->group_, | ||||
|                   providerManager->product_, | ||||
|                   latestTime); | ||||
|             } | ||||
|          } | ||||
|          else if (providerManager->refreshEnabled_) | ||||
|  | @ -904,7 +905,7 @@ void RadarProductManager::LoadFile( | |||
|    else if (request != nullptr) | ||||
|    { | ||||
|       request->set_radar_product_record(existingRecord); | ||||
|       emit request->RequestComplete(request); | ||||
|       Q_EMIT request->RequestComplete(request); | ||||
|    } | ||||
| } | ||||
| 
 | ||||
|  | @ -940,7 +941,7 @@ void RadarProductManagerImpl::LoadNexradFile( | |||
|          if (request != nullptr) | ||||
|          { | ||||
|             request->set_radar_product_record(record); | ||||
|             emit request->RequestComplete(request); | ||||
|             Q_EMIT request->RequestComplete(request); | ||||
|          } | ||||
|       }); | ||||
| } | ||||
|  | @ -1044,7 +1045,7 @@ RadarProductManagerImpl::GetLevel2ProductRecord( | |||
|          { | ||||
|             if (request->radar_product_record() != nullptr) | ||||
|             { | ||||
|                emit self_->DataReloaded(request->radar_product_record()); | ||||
|                Q_EMIT self_->DataReloaded(request->radar_product_record()); | ||||
|             } | ||||
|          }); | ||||
| 
 | ||||
|  | @ -1109,7 +1110,7 @@ RadarProductManagerImpl::GetLevel3ProductRecord( | |||
|          { | ||||
|             if (request->radar_product_record() != nullptr) | ||||
|             { | ||||
|                emit self_->DataReloaded(request->radar_product_record()); | ||||
|                Q_EMIT self_->DataReloaded(request->radar_product_record()); | ||||
|             } | ||||
|          }); | ||||
| 
 | ||||
|  | @ -1345,7 +1346,7 @@ void RadarProductManager::UpdateAvailableProducts() | |||
|             } | ||||
|          } | ||||
| 
 | ||||
|          emit Level3ProductsChanged(); | ||||
|          Q_EMIT Level3ProductsChanged(); | ||||
|       }); | ||||
| } | ||||
| 
 | ||||
|  | @ -1378,7 +1379,7 @@ RadarProductManager::Instance(const std::string& radarSite) | |||
| 
 | ||||
|    if (instanceCreated) | ||||
|    { | ||||
|       emit RadarProductManagerNotifier::Instance().RadarProductManagerCreated( | ||||
|       Q_EMIT RadarProductManagerNotifier::Instance().RadarProductManagerCreated( | ||||
|          radarSite); | ||||
|    } | ||||
| 
 | ||||
|  |  | |||
|  | @ -184,7 +184,7 @@ void TextEventManager::Impl::HandleMessage( | |||
| 
 | ||||
|    if (updated) | ||||
|    { | ||||
|       emit self_->AlertUpdated(key, messageIndex); | ||||
|       Q_EMIT self_->AlertUpdated(key, messageIndex); | ||||
|    } | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -226,7 +226,7 @@ void TimelineManager::Impl::Pause() | |||
|    if (animationState_ != types::AnimationState::Pause) | ||||
|    { | ||||
|       animationState_ = types::AnimationState::Pause; | ||||
|       emit self_->AnimationStateUpdated(animationState_); | ||||
|       Q_EMIT self_->AnimationStateUpdated(animationState_); | ||||
|    } | ||||
| } | ||||
| 
 | ||||
|  | @ -276,7 +276,7 @@ void TimelineManager::Impl::Play() | |||
|    if (animationState_ != types::AnimationState::Play) | ||||
|    { | ||||
|       animationState_ = types::AnimationState::Play; | ||||
|       emit self_->AnimationStateUpdated(animationState_); | ||||
|       Q_EMIT self_->AnimationStateUpdated(animationState_); | ||||
|    } | ||||
| 
 | ||||
|    { | ||||
|  | @ -366,9 +366,9 @@ void TimelineManager::Impl::SelectTime( | |||
| 
 | ||||
|       logger_->debug("Time updated: Live"); | ||||
| 
 | ||||
|       emit self_->LiveStateUpdated(true); | ||||
|       emit self_->VolumeTimeUpdated(selectedTime); | ||||
|       emit self_->SelectedTimeUpdated(selectedTime); | ||||
|       Q_EMIT self_->LiveStateUpdated(true); | ||||
|       Q_EMIT self_->VolumeTimeUpdated(selectedTime); | ||||
|       Q_EMIT self_->SelectedTimeUpdated(selectedTime); | ||||
| 
 | ||||
|       return; | ||||
|    } | ||||
|  | @ -393,7 +393,7 @@ void TimelineManager::Impl::SelectTime( | |||
|             util::GetBoundedElementPointer(volumeTimes, selectedTime); | ||||
| 
 | ||||
|          // The timeline is no longer live
 | ||||
|          emit self_->LiveStateUpdated(false); | ||||
|          Q_EMIT self_->LiveStateUpdated(false); | ||||
| 
 | ||||
|          if (elementPtr != nullptr) | ||||
|          { | ||||
|  | @ -409,7 +409,7 @@ void TimelineManager::Impl::SelectTime( | |||
|                logger_->debug("Volume time updated: {}", | ||||
|                               scwx::util::TimeString(adjustedTime_)); | ||||
| 
 | ||||
|                emit self_->VolumeTimeUpdated(adjustedTime_); | ||||
|                Q_EMIT self_->VolumeTimeUpdated(adjustedTime_); | ||||
|             } | ||||
|          } | ||||
|          else | ||||
|  | @ -423,7 +423,7 @@ void TimelineManager::Impl::SelectTime( | |||
|                         scwx::util::TimeString(selectedTime)); | ||||
| 
 | ||||
|          selectedTime_ = selectedTime; | ||||
|          emit self_->SelectedTimeUpdated(selectedTime); | ||||
|          Q_EMIT self_->SelectedTimeUpdated(selectedTime); | ||||
| 
 | ||||
|          previousRadarSite_ = radarSite_; | ||||
|       }); | ||||
|  | @ -492,9 +492,9 @@ void TimelineManager::Impl::Step(Direction direction) | |||
|                logger_->debug("Volume time updated: {}", | ||||
|                               scwx::util::TimeString(adjustedTime_)); | ||||
| 
 | ||||
|                emit self_->LiveStateUpdated(false); | ||||
|                emit self_->VolumeTimeUpdated(adjustedTime_); | ||||
|                emit self_->SelectedTimeUpdated(adjustedTime_); | ||||
|                Q_EMIT self_->LiveStateUpdated(false); | ||||
|                Q_EMIT self_->VolumeTimeUpdated(adjustedTime_); | ||||
|                Q_EMIT self_->SelectedTimeUpdated(adjustedTime_); | ||||
|             } | ||||
|          } | ||||
|          else | ||||
|  | @ -509,9 +509,9 @@ void TimelineManager::Impl::Step(Direction direction) | |||
|                logger_->debug("Volume time updated: {}", | ||||
|                               scwx::util::TimeString(adjustedTime_)); | ||||
| 
 | ||||
|                emit self_->LiveStateUpdated(false); | ||||
|                emit self_->VolumeTimeUpdated(adjustedTime_); | ||||
|                emit self_->SelectedTimeUpdated(adjustedTime_); | ||||
|                Q_EMIT self_->LiveStateUpdated(false); | ||||
|                Q_EMIT self_->VolumeTimeUpdated(adjustedTime_); | ||||
|                Q_EMIT self_->SelectedTimeUpdated(adjustedTime_); | ||||
|             } | ||||
|          } | ||||
|       }); | ||||
|  |  | |||
|  | @ -121,7 +121,7 @@ bool UpdateManager::CheckForUpdates(const std::string& currentVersion) | |||
|          p->latestRelease_ = *latestRelease; | ||||
|          p->latestVersion_ = latestVersion; | ||||
|          newRelease        = true; | ||||
|          emit UpdateAvailable(latestVersion, *latestRelease); | ||||
|          Q_EMIT UpdateAvailable(latestVersion, *latestRelease); | ||||
|       } | ||||
|    } | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Dan Paulat
						Dan Paulat