Skycoder42
					
					7 years ago
					
				 
				
			 
		 
		
			
				
					
					No known key found for this signature in database
					
						
							GPG Key ID: 8E01AD9EF0578D2B
						
					
				
			
		
		
		
	
		
			
				 2 changed files with 
8 additions and 
14 deletions
			 
			
		 
		
			
				- 
					
					
					 
					src/imports/mvvmcore/qqmlmvvmbinding.cpp
				
 
			
				- 
					
					
					 
					src/imports/mvvmcore/qqmlmvvmbinding.h
				
 
			
		
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					| 
						
						
						
					 | 
				
				 | 
				
					@ -1,18 +1,10 @@ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					#include "qqmlmvvmbinding.h" | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					using namespace QtMvvm; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					#include <QtQml> | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					QQmlMvvmBinding::QQmlMvvmBinding(QObject *parent) : | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						QObject(parent), | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						QQmlParserStatus(), | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						_binding(), | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						_completed(false), | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						_viewModel(nullptr), | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						_viewModelProperty(), | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						_view(parent), | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						_viewProperty(), | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						_type(TwoWay), | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						_viewModelChangeSignal(), | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						_viewChangeSignal() | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						QQmlParserStatus() | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					{ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						connect(this, &QQmlMvvmBinding::viewModelChanged, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								this, &QQmlMvvmBinding::resetBinding); | 
				
			
			
		
	
	
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
				
				 | 
				
					@ -30,6 +22,8 @@ void QQmlMvvmBinding::classBegin() {} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					void QQmlMvvmBinding::componentComplete() | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					{ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						if(!_view) | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							_view = parent(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						_completed = true; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						resetBinding(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					} | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  | 
				
			
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -159,13 +159,13 @@ private Q_SLOTS: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					private: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						Binding _binding; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						bool _completed; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						bool _completed = false; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						QObject* _viewModel; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						QObject* _viewModel = nullptr; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						QString _viewModelProperty; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						QObject* _view; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						QObject* _view = nullptr; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						QString _viewProperty; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						BindingDirection _type; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						BindingDirection _type = TwoWay; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						QString _viewModelChangeSignal; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						QString _viewChangeSignal; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					}; | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |