diff options
| author | Hugo Lima <hugo.lima@openbossa.org> | 2010-02-25 18:25:01 -0300 |
|---|---|---|
| committer | Hugo Lima <hugo.lima@openbossa.org> | 2010-02-26 14:25:57 -0300 |
| commit | f1427d101d4d0d73070f250d598d7fdc64ff2b52 (patch) | |
| tree | 7c56921391b4d9597c563a1bf5509e957bf14428 /libshiboken | |
| parent | 3a184c23994189a24cb7f65dd413d32ea373929c (diff) | |
Rename init_shiboken to InitShiboken, to follow our naming convention.
Diffstat (limited to 'libshiboken')
| -rw-r--r-- | libshiboken/basewrapper.cpp | 9 | ||||
| -rw-r--r-- | libshiboken/basewrapper.h | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/libshiboken/basewrapper.cpp b/libshiboken/basewrapper.cpp index 6ec023465..fe9b73b1d 100644 --- a/libshiboken/basewrapper.cpp +++ b/libshiboken/basewrapper.cpp @@ -1,7 +1,7 @@ /* * This file is part of the Shiboken Python Bindings Generator project. * - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * * Contact: PySide team <contact@pyside.org> * @@ -306,9 +306,6 @@ static PyGetSetDef SbkBaseWrapper_getsetlist[] = { {0} // Sentinel }; -extern "C" -{ - SbkBaseWrapperType SbkBaseWrapper_Type = { { { PyObject_HEAD_INIT(&SbkBaseWrapperType_Type) /*ob_size*/ 0, @@ -363,7 +360,7 @@ SbkBaseWrapperType SbkBaseWrapper_Type = { { { /*type_name_func*/ 0 }; -PyAPI_FUNC(void) init_shiboken() +void initShiboken() { static bool shibokenAlreadInitialised = false; if (shibokenAlreadInitialised) @@ -384,8 +381,6 @@ PyAPI_FUNC(void) init_shiboken() shibokenAlreadInitialised = true; } -} // extern "C" - void setErrorAboutWrongArguments(PyObject* args, const char* funcName, const char** cppOverloads) { std::string msg; diff --git a/libshiboken/basewrapper.h b/libshiboken/basewrapper.h index d64dadfca..a235b361d 100644 --- a/libshiboken/basewrapper.h +++ b/libshiboken/basewrapper.h @@ -1,7 +1,7 @@ /* * This file is part of the Shiboken Python Bindings Generator project. * - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * * Contact: PySide team <contact@pyside.org> * @@ -114,11 +114,14 @@ struct LIBSHIBOKEN_API SbkBaseWrapper RefCountMap* referredObjects; }; -LIBSHIBOKEN_API PyAPI_FUNC(void) init_shiboken(); - } // extern "C" /** +* Init shiboken library. +*/ +LIBSHIBOKEN_API void initShiboken(); + +/** * Set the parent of \p child to \p parent. * When an object dies, all their children, granchildren, etc, are tagged as invalid. * \param parent the parent object, if null, the child will have no parents. |