comparison cpp/qt_qtd/qtd_core.cpp @ 384:d2f48c4cb3e3

Same behavior of shared libs on linux and windows. Minor build script fixes.
author Max Samukha <maxter@spambox.com>
date Fri, 16 Jul 2010 20:04:29 +0300
parents 1f189d0ceab4
children 7dddafad5a20
comparison
equal deleted inserted replaced
383:bd7f485e3573 384:d2f48c4cb3e3
4 */ 4 */
5 5
6 #include "qtd_core.h" 6 #include "qtd_core.h"
7 #include <typeinfo> 7 #include <typeinfo>
8 8
9 QTD_EXPORT(CORE, toUtf8); 9 QTD_FUNC(CORE, toUtf8);
10 QTD_EXPORT(CORE, QtdObject_delete); 10 QTD_FUNC(CORE, QtdObject_delete);
11 11
12 QTD_EXTERN QTD_DLL_PUBLIC void qtdInitCore() 12 QTD_EXTERN QTD_EXPORT void qtdInitCore()
13 { 13 {
14 QObjectLink::userDataId = QObject::registerUserData(); 14 QObjectLink::userDataId = QObject::registerUserData();
15 } 15 }
16 16
17 QTD_EXTERN QTD_DLL_PUBLIC bool qtdTypeInfosEqual(void* info1, void* info2) 17 QTD_EXTERN QTD_EXPORT bool qtdTypeInfosEqual(void* info1, void* info2)
18 { 18 {
19 std::type_info* i1 = (std::type_info*)info1; 19 std::type_info* i1 = (std::type_info*)info1;
20 std::type_info* i2 = (std::type_info*)info2; 20 std::type_info* i2 = (std::type_info*)info2;
21 21
22 return i1 == i2 || strcmp(i1->name(), i2->name()) == 0; 22 return i1 == i2 || strcmp(i1->name(), i2->name()) == 0;
23 } 23 }
24 24
25 QTD_EXTERN QTD_DLL_PUBLIC QModelIndex qtd_to_QModelIndex(QModelIndexAccessor mia) 25 QTD_EXTERN QTD_EXPORT QModelIndex qtd_to_QModelIndex(QModelIndexAccessor mia)
26 { 26 {
27 return * (QModelIndex *) (&mia) ; 27 return * (QModelIndex *) (&mia) ;
28 } 28 }
29 29
30 QTD_EXTERN QTD_DLL_PUBLIC QModelIndexAccessor qtd_from_QModelIndex(const QModelIndex &index) 30 QTD_EXTERN QTD_EXPORT QModelIndexAccessor qtd_from_QModelIndex(const QModelIndex &index)
31 { 31 {
32 QModelIndexAccessor mia = { 32 QModelIndexAccessor mia = {
33 index.row(), 33 index.row(),
34 index.column(), 34 index.column(),
35 index.internalPointer(), 35 index.internalPointer(),
37 }; 37 };
38 38
39 return mia; 39 return mia;
40 } 40 }
41 41
42 QTD_EXTERN QTD_DLL_PUBLIC const char* qtd_qVersion() 42 QTD_EXTERN QTD_EXPORT const char* qtd_qVersion()
43 { 43 {
44 return qVersion(); 44 return qVersion();
45 } 45 }
46 46
47 QTD_EXTERN QTD_DLL_PUBLIC bool qtd_qSharedBuild() 47 QTD_EXTERN QTD_EXPORT bool qtd_qSharedBuild()
48 { 48 {
49 return qSharedBuild(); 49 return qSharedBuild();
50 } 50 }
51 51
52 extern bool qRegisterResourceData 52 extern bool qRegisterResourceData
53 (int, const unsigned char *, const unsigned char *, const unsigned char *); 53 (int, const unsigned char *, const unsigned char *, const unsigned char *);
54 54
55 extern bool qUnregisterResourceData 55 extern bool qUnregisterResourceData
56 (int, const unsigned char *, const unsigned char *, const unsigned char *); 56 (int, const unsigned char *, const unsigned char *, const unsigned char *);
57 57
58 QTD_EXTERN QTD_DLL_PUBLIC bool qtd_qRegisterResourceData(int version, const unsigned char *tree, 58 QTD_EXTERN QTD_EXPORT bool qtd_qRegisterResourceData(int version, const unsigned char *tree,
59 const unsigned char *name, const unsigned char *data) 59 const unsigned char *name, const unsigned char *data)
60 { 60 {
61 return qRegisterResourceData(version, tree, name, data); 61 return qRegisterResourceData(version, tree, name, data);
62 } 62 }
63 63
64 QTD_EXTERN QTD_DLL_PUBLIC bool qtd_qUnregisterResourceData(int version, const unsigned char *tree, 64 QTD_EXTERN QTD_EXPORT bool qtd_qUnregisterResourceData(int version, const unsigned char *tree,
65 const unsigned char *name, const unsigned char *data) 65 const unsigned char *name, const unsigned char *data)
66 { 66 {
67 return qUnregisterResourceData(version, tree, name, data); 67 return qUnregisterResourceData(version, tree, name, data);
68 } 68 }
69 69
70 QTD_EXTERN QTD_DLL_PUBLIC int qtd_qrand() 70 QTD_EXTERN QTD_EXPORT int qtd_qrand()
71 { 71 {
72 return qrand(); 72 return qrand();
73 } 73 }
74 74
75 QTD_EXTERN QTD_DLL_PUBLIC void qtd_qsrand(uint seed) 75 QTD_EXTERN QTD_EXPORT void qtd_qsrand(uint seed)
76 { 76 {
77 qsrand(seed); 77 qsrand(seed);
78 } 78 }
79 79
80 // 80 //