Mercurial > hg > bitcoin

changeset 3557:5a38aa74f791 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed compilation error with clang. Previously, trying to compile with clang would result in the error: assigning to 'objc_object *' from incompatible type 'DockIconClickEventHandler *'
author Virgil Dupras <hsoft@hardcoded.net>
date Thu, 27 Sep 2012 15:06:16 -0400
parents 1760679ce6b0
children 5d002dc16627
files src/qt/macdockiconhandler.h
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt/macdockiconhandler.h
+++ b/src/qt/macdockiconhandler.h
@@ -6,7 +6,12 @@
 class QMenu;
 class QIcon;
 class QWidget;
-class objc_object;
+
+#ifdef __OBJC__
+@class DockIconClickEventHandler;
+#else
+class DockIconClickEventHandler;
+#endif
 
 /** Macintosh-specific dock icon handler.
  */
@@ -31,7 +36,7 @@
 private:
     MacDockIconHandler();
 
-    objc_object *m_dockIconClickEventHandler;
+    DockIconClickEventHandler *m_dockIconClickEventHandler;
     QWidget *m_dummyWidget;
     QMenu *m_dockMenu;
 };