aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVirgil Dupras <hsoft@hardcoded.net>2012-09-27 15:06:16 -0400
committerVirgil Dupras <hsoft@hardcoded.net>2012-09-27 15:06:16 -0400
commitfee10d800e2599962f2960ddf27963c2f3768bd0 (patch)
tree0c63102d48acb2d5d653977bba0c4deb7fd645f5
parent14ac0adcc7c0224a467e38bbd4ebf39d824ada8d (diff)
Fixed compilation error with clang.
Previously, trying to compile with clang would result in the error: assigning to 'objc_object *' from incompatible type 'DockIconClickEventHandler *'
-rw-r--r--src/qt/macdockiconhandler.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/qt/macdockiconhandler.h b/src/qt/macdockiconhandler.h
index d02c148f91..2092fb26b3 100644
--- 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 @@ public slots:
private:
MacDockIconHandler();
- objc_object *m_dockIconClickEventHandler;
+ DockIconClickEventHandler *m_dockIconClickEventHandler;
QWidget *m_dummyWidget;
QMenu *m_dockMenu;
};