Changeset 838 for trunk/src/gui/util/qsystemtrayicon_pm.cpp

Timestamp:

Mar 18, 2011, 4:53:58 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

xsystray: Provide function pointer declarations to simplify importing API from the DLL at runtime.

File:

• trunk/src/gui/util/qsystemtrayicon_pm.cpp (modified) (3 diffs)

trunk/src/gui/util/qsystemtrayicon_pm.cpp

@@ -51 +51 @@
 #include "qt_os2.h"
 
-// for dynamic linking to xsystray DLL
-#define xstQuerySysTrayVersion (*_xstQuerySysTrayVersion)
-#define xstAddSysTrayIcon (*_xstAddSysTrayIcon)
-#define xstReplaceSysTrayIcon (*_xstReplaceSysTrayIcon)
-#define xstRemoveSysTrayIcon (*_xstRemoveSysTrayIcon)
-#define xstSetSysTrayIconToolTip (*_xstSetSysTrayIconToolTip)
-#define xstQuerySysTrayIconRect (*_xstQuerySysTrayIconRect)
-#define xstGetSysTrayCreatedMsgId (*_xstGetSysTrayCreatedMsgId)
-#define xstGetSysTrayMaxTextLen (*_xstGetSysTrayMaxTextLen)
-
+// declare function pointers for dynamic linking to xsystray DLL
+#define XSTAPI_FPTRS_STATIC
 #include "xsystray.h"
 
@@ -325 +317 @@
         QLibrary xsystray(QLatin1String("xsystray"));
 
-        #define R(f) if ((*((void **)&_##f) = xsystray.resolve(#f)) == NULL) return false
+        #define R(f) if ((*((void **)&f) = xsystray.resolve(#f)) == NULL) return false
 
         R(xstQuerySysTrayVersion);
@@ -333 +325 @@
         R(xstSetSysTrayIconToolTip);
         R(xstQuerySysTrayIconRect);
+
+
         R(xstGetSysTrayCreatedMsgId);
         R(xstGetSysTrayMaxTextLen);