mirror of
				https://github.com/saitohirga/WSJT-X.git
				synced 2025-11-03 21:40:52 -05:00 
			
		
		
		
	Ensure enum types used a signal arguments are registered with Qt fully qualified
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6586 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
		
							parent
							
								
									55f5581993
								
							
						
					
					
						commit
						85c13ead2e
					
				@ -23,6 +23,10 @@ QItemEditorFactory * item_editor_factory ()
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void register_types ()
 | 
					void register_types ()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					  // we still have to register the fully qualified names of enum types
 | 
				
			||||||
 | 
					  // used as signal/slot connection arguments since the new Qt 5.5
 | 
				
			||||||
 | 
					  // Q_ENUM macro only seems to register the unqualified name
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
  // Radio namespace
 | 
					  // Radio namespace
 | 
				
			||||||
  auto frequency_type_id = qRegisterMetaType<Radio::Frequency> ("Frequency");
 | 
					  auto frequency_type_id = qRegisterMetaType<Radio::Frequency> ("Frequency");
 | 
				
			||||||
  qRegisterMetaType<Radio::Frequencies> ("Frequencies");
 | 
					  qRegisterMetaType<Radio::Frequencies> ("Frequencies");
 | 
				
			||||||
@ -61,9 +65,7 @@ void register_types ()
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  // Transceiver
 | 
					  // Transceiver
 | 
				
			||||||
  qRegisterMetaType<Transceiver::TransceiverState> ("Transceiver::TransceiverState");
 | 
					  qRegisterMetaType<Transceiver::TransceiverState> ("Transceiver::TransceiverState");
 | 
				
			||||||
#if QT_VERSION < 0x050500
 | 
					 | 
				
			||||||
  qRegisterMetaType<Transceiver::MODE> ("Transceiver::MODE");
 | 
					  qRegisterMetaType<Transceiver::MODE> ("Transceiver::MODE");
 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  // Transceiver factory
 | 
					  // Transceiver factory
 | 
				
			||||||
#if QT_VERSION < 0x050500
 | 
					#if QT_VERSION < 0x050500
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user