|  | @@ -1,4 +1,4 @@
 | 
	
		
			
				|  |  | -#ifndef FUNCTIONTRANSFER_H
 | 
	
		
			
				|  |  | +#ifndef FUNCTIONTRANSFER_H
 | 
	
		
			
				|  |  |  #define FUNCTIONTRANSFER_H
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  #include  <functional>
 | 
	
	
		
			
				|  | @@ -17,7 +17,7 @@ class FunctionTransfer : public QObject
 | 
	
		
			
				|  |  |      Q_OBJECT
 | 
	
		
			
				|  |  |  public:
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    ///@brief ¹¹Ô캯Êý
 | 
	
		
			
				|  |  | +    ///@brief 构造函数
 | 
	
		
			
				|  |  |      explicit FunctionTransfer(QObject *parent = 0);
 | 
	
		
			
				|  |  |      ~FunctionTransfer();
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -25,22 +25,22 @@ public:
 | 
	
		
			
				|  |  |      static bool isMainThread();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  public:
 | 
	
		
			
				|  |  | -    ///@brief ÖÆ¶¨º¯ÊýfÔÚmainÖÐÖ´ÐÐ
 | 
	
		
			
				|  |  | +    ///@brief 制定函数f在main䏿‰§è¡Œ
 | 
	
		
			
				|  |  |      static void runInMainThread(std::function<void()> f, bool isBlock = false);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  private:
 | 
	
		
			
				|  |  |      static Qt::HANDLE gMainThreadId;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    //ÔÚÈ«¾ÖÊý¾ÝÇøÊµÀý»¯Ò»¸öFunctionTransferµÄʵÀý£¬¸ÃʵÀýËùÔÚµÄÏ߳̾ÍÊÇÖ÷Ï̡߳£
 | 
	
		
			
				|  |  | +    //在全局数�区实例化一个FunctionTransfer的实例,该实例所在的线程就是主线程。
 | 
	
		
			
				|  |  |      static FunctionTransfer *main_thread_forward;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  Q_SIGNALS:
 | 
	
		
			
				|  |  | -    ///@brief ÔÚ±ðµÄÏß³ÌÓк¯Êý¶ÔÏó´«À´
 | 
	
		
			
				|  |  | +    ///@brief 在别的线程有函数对象传�
 | 
	
		
			
				|  |  |      void comming(std::function<void()> f);
 | 
	
		
			
				|  |  |      void comming_noBlock(std::function<void()> f);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  private Q_SLOTS:
 | 
	
		
			
				|  |  | -    ///@brief Ö´Ðк¯Êý¶ÔÏó
 | 
	
		
			
				|  |  | +    ///@brief 执行函数对象
 | 
	
		
			
				|  |  |      void slotExec(std::function<void()> f);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  };
 |