Mercurial > projects > qtd

diff cpp/qt_core/QMetaObject_shell.cpp @ 357:9784459f0750

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables Q_CLASSINFO implementation Now Qtd can be built on Windows
author Max Samukha <maxter@spambox.com>
date Wed, 02 Jun 2010 19:38:05 +0300
parents 463563fc9e17
children d2f48c4cb3e3
line wrap: on
line diff
--- a/cpp/qt_core/QMetaObject_shell.cpp	Tue May 25 20:14:04 2010 +0300
+++ b/cpp/qt_core/QMetaObject_shell.cpp	Wed Jun 02 19:38:05 2010 +0300
@@ -4,61 +4,61 @@
 
 #include <QList>
 
-extern "C" DLL_PUBLIC void* qtd_QMetaObject_superClass(void *nativeId)
+QTD_EXTERN QTD_DLL_PUBLIC void* qtd_QMetaObject_superClass(void *nativeId)
 {
     return (void*)((QMetaObject*)nativeId)->superClass();
 }
 
-extern "C" DLL_PUBLIC void qtd_QMetaObject_activate(QObject *sender, int signal_index, void **argv)
+QTD_EXTERN QTD_DLL_PUBLIC void qtd_QMetaObject_activate(QObject *sender, int signal_index, void **argv)
 {
     QMetaObject::activate(sender, signal_index, argv);
 }
 
-extern "C" DLL_PUBLIC void qtd_QMetaObject_activate_3(QObject *sender, const QMetaObject *m, int local_signal_index, void **argv)
+QTD_EXTERN QTD_DLL_PUBLIC void qtd_QMetaObject_activate_3(QObject *sender, const QMetaObject *m, int local_signal_index, void **argv)
 {
     QMetaObject::activate(sender, m, local_signal_index, argv);
 }
 
-extern "C" DLL_PUBLIC void qtd_QMetaObject_activate_4(QObject *sender, const QMetaObject *m, int from_local_signal_index, int to_local_signal_index, void **argv)
+QTD_EXTERN QTD_DLL_PUBLIC void qtd_QMetaObject_activate_4(QObject *sender, const QMetaObject *m, int from_local_signal_index, int to_local_signal_index, void **argv)
 {
     QMetaObject::activate(sender, m, from_local_signal_index, to_local_signal_index, argv);
 }
 
-extern "C" DLL_PUBLIC bool qtd_QMetaObject_connect(const QObject *sender, int signal_index,
+QTD_EXTERN QTD_DLL_PUBLIC bool qtd_QMetaObject_connect(const QObject *sender, int signal_index,
                                                    const QObject *receiver, int method_index,
                                                    int type, int *types)
 {
     return QMetaObject::connect(sender, signal_index, receiver, method_index, type, types);
 }
 
-extern "C" DLL_PUBLIC int qtd_QMetaObject_indexOfMethod(void *nativeId, const char *method)
+QTD_EXTERN QTD_DLL_PUBLIC int qtd_QMetaObject_indexOfMethod(void *nativeId, const char *method)
 {
     return ((QMetaObject*)nativeId)->indexOfMethod(method);
 }
 
-extern "C" DLL_PUBLIC int qtd_QMetaObject_methodCount(void *nativeId)
+QTD_EXTERN QTD_DLL_PUBLIC int qtd_QMetaObject_methodCount(void *nativeId)
 {
     return ((QMetaObject*)nativeId)->methodCount();
 }
 
-extern "C" DLL_PUBLIC void qtd_create_QList(void *nativeId)
+QTD_EXTERN QTD_DLL_PUBLIC void qtd_create_QList(void *nativeId)
 {
     QList<int> & list = (*(QList<int> *)nativeId);
     list.append(54);
     list.append(45);
 }
 
-extern "C" DLL_PUBLIC void qtd_create_QList_double(void *nativeId)
+QTD_EXTERN QTD_DLL_PUBLIC void qtd_create_QList_double(void *nativeId)
 {
     QList<double> & list = (*(QList<double> *)nativeId);
     list.append(54.44);
     list.append(45.55);
 }
 
-extern "C" DLL_PUBLIC void qtd_create_QList_QObject(void *nativeId)
+QTD_EXTERN QTD_DLL_PUBLIC void qtd_create_QList_QObject(void *nativeId)
 {
     QList<QObject*> & list2 = (*(QList<QObject*> *)nativeId);
-    
+
     QList<QObject*> list;
     QObject* a1 = new QObject();
     a1->setObjectName("a1");