commit a524a26421519945a24a336bbba168805e0d9b81
author Yingdi Yu <yuyingdi@gmail.com> Tue Feb 11 22:54:11 2014 -0800
committer Yingdi Yu <yuyingdi@gmail.com> Tue Feb 11 22:54:11 2014 -0800
tree fa6f586f91019ef6f304b5764b85d1ffe87409aa
parent a1a688f19fef005d66fb4903202fa4eab703965d

chatdialog: Fix issue of creating QObjects in different thread.

Change-Id: I2f0dc2006cc330cd9d4fc5973eb475d841103b59

src/chatdialog.h

diff --git a/src/chatdialog.h b/src/chatdialog.h
index 742b4ee..5b7eea2 100644
--- a/src/chatdialog.h
+++ b/src/chatdialog.h
@@ -16,7 +16,6 @@
 #include <QDialog>
 #include <QTextTable>
 #include <QStringListModel>
-#include <QTimer>
 #include <QSystemTrayIcon>
 #include <QMenu>
 
@@ -233,6 +232,24 @@
   void
   inivationRejection(const QString& msg);
 
+  void
+  triggerHello();
+             
+  void
+  triggerJoin();
+  
+  void
+  triggerLeave();
+
+  void
+  triggerReplot();
+
+  void
+  triggerEnableTreeDisplay();
+
+  void
+  triggerReap();
+
 public slots:
   void 
   processTreeUpdate(const std::vector<Sync::MissingDataInfo>&);
@@ -253,18 +270,30 @@
   void
   settingUpdated(QString, QString, QString);
 
+  void
+  sendJoinWrapper();
+
   void 
   sendJoin();
 
   void
+  sendHelloWrapper();
+  
+  void
   sendHello();
 
   void
   sendLeave();
 
+  void
+  sendLeaveWrapper();
+
   void 
   replot();
 
+  void
+  replotWrapper();
+
   void 
   updateRosterList(QStringList);
 
@@ -272,6 +301,9 @@
   enableTreeDisplay();
 
   void
+  enableTreeDisplayWrapper();
+
+  void
   updateLocalPrefix();
 
   void 
@@ -280,6 +312,9 @@
   void
   reap();
 
+  void
+  reapWrapper();
+
   void 
   iconActivated(QSystemTrayIcon::ActivationReason reason);