diff cpp/qt_core/QString_shell.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 9784459f0750
children
line wrap: on
line diff
--- a/cpp/qt_core/QString_shell.cpp	Mon Jul 12 22:50:58 2010 +0300
+++ b/cpp/qt_core/QString_shell.cpp	Fri Jul 16 20:04:29 2010 +0300
@@ -1,21 +1,21 @@
 #include <QString>
 #include "qtd_core.h"
 
-QTD_EXTERN QTD_DLL_PUBLIC const ushort* qtd_QString_utf16
+QTD_EXTERN QTD_EXPORT const ushort* qtd_QString_utf16
 (void* __this_nativeId)
 {
     QString *__qt_this = (QString *) __this_nativeId;
     return __qt_this->utf16();
 }
 
-QTD_EXTERN QTD_DLL_PUBLIC int qtd_QString_size
+QTD_EXTERN QTD_EXPORT int qtd_QString_size
 (void* __this_nativeId)
 {
     QString *__qt_this = (QString *) __this_nativeId;
     return __qt_this->size();
 }
 
-QTD_EXTERN QTD_DLL_PUBLIC void qtd_QString_operatorAssign
+QTD_EXTERN QTD_EXPORT void qtd_QString_operatorAssign
 (void* __this_nativeId,
  DArray text)
 {
@@ -23,18 +23,18 @@
     *__qt_this = QString::fromUtf8((const char *)text.ptr, text.length);
 }
 
-QTD_EXTERN QTD_DLL_PUBLIC void qtd_QString_destructor(void *ptr)
+QTD_EXTERN QTD_EXPORT void qtd_QString_destructor(void *ptr)
 {
     delete (QString *)ptr;
 }
 
-QTD_EXTERN QTD_DLL_PUBLIC void qtd_QString_call_destructor(QString *ptr)
+QTD_EXTERN QTD_EXPORT void qtd_QString_call_destructor(QString *ptr)
 {
     ptr->~QString();
 }
 
 
-QTD_EXTERN QTD_DLL_PUBLIC void* qtd_QString_QString_QString
+QTD_EXTERN QTD_EXPORT void* qtd_QString_QString_QString
 (void* string0)
 {
     const QString&  __qt_string0 = (const QString& ) *(QString *)string0;
@@ -42,7 +42,7 @@
     return (void *) __qt_this;
 }
 
-QTD_EXTERN QTD_DLL_PUBLIC void* qtd_QString_new_fromUtf8_at
+QTD_EXTERN QTD_EXPORT void* qtd_QString_new_fromUtf8_at
 (void* place, DArray text)
 {
     QString *__qt_this = new(place) QString;
@@ -50,17 +50,17 @@
     return __qt_this;
 }
 
-QTD_EXTERN QTD_DLL_PUBLIC void* qtd_QString_placed_copy(void* string0, void* place) {
+QTD_EXTERN QTD_EXPORT void* qtd_QString_placed_copy(void* string0, void* place) {
     const QString&  __qt_string0 = (const QString& ) *(QString *)string0;
     QString *result = new (place)QString((const QString& )__qt_string0);
     return (void *) result;
 }
 
-QTD_EXTERN QTD_DLL_PUBLIC void qtd_QString_placed_ctor(void* place) {
+QTD_EXTERN QTD_EXPORT void qtd_QString_placed_ctor(void* place) {
     new (place) QString();
 }
 
-QTD_EXTERN QTD_DLL_PUBLIC void qtd_QString_assign_fromUtf8
+QTD_EXTERN QTD_EXPORT void qtd_QString_assign_fromUtf8
 (QString *__qt_this, DArray text)
 {
     *__qt_this = QString::fromUtf8((const char *)text.ptr, text.length);