Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix build warnings
  • Loading branch information
m-kuhn committed Apr 2, 2017
1 parent a9b5599 commit 5da0318
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 17 deletions.
6 changes: 5 additions & 1 deletion cmake_templates/Doxyfile.in
Expand Up @@ -1359,7 +1359,11 @@ EXPAND_AS_DEFINED = "SIP_TRANSFER" \
"SIP_PYNAME" \
"SIP_SKIP" \
"SIP_PYDEFAULTVALUE" \
"SIP_PYTYPE"
"SIP_PYTYPE" \
"SIP_CONVERT_TO_SUBCLASS_CODE" \
"SIP_FEATURE" \
"SIP_IF_FEATURE" \
"SIP_END"

# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
# doxygen's preprocessor will remove all function-like macros that are alone
Expand Down
32 changes: 16 additions & 16 deletions src/core/qgis.h
Expand Up @@ -388,87 +388,87 @@ typedef unsigned long long qgssize;
#define FALLTHROUGH
#endif

/**
/*
* http://pyqt.sourceforge.net/Docs/sip4/annotations.html?highlight=keepreference#function-annotation-Transfer
*
* Example QgsVectorLayer::setDiagramRenderer
*/
#define SIP_TRANSFER

/**
/*
* http://pyqt.sourceforge.net/Docs/sip4/annotations.html?highlight=keepreference#function-annotation-TransferBack
*/
#define SIP_TRANSFERBACK

/**
/*
* http://pyqt.sourceforge.net/Docs/sip4/annotations.html?highlight=keepreference#function-annotation-TransferThis
*/
#define SIP_TRANSFERTHIS

/**
/*
* http://pyqt.sourceforge.net/Docs/sip4/annotations.html?highlight=keepreference#argument-annotation-Out
*/
#define SIP_OUT

/**
/*
* Combination of
* http://pyqt.sourceforge.net/Docs/sip4/annotations.html?highlight=keepreference#argument-annotation-In
* and
* http://pyqt.sourceforge.net/Docs/sip4/annotations.html?highlight=keepreference#argument-annotation-Out
*/
#define SIP_INOUT

/**
/*
* http://pyqt.sourceforge.net/Docs/sip4/annotations.html?highlight=keepreference#function-annotation-Factory
*/
#define SIP_FACTORY

/**
/*
* http://pyqt.sourceforge.net/Docs/sip4/annotations.html?highlight=keepreference#function-annotation-PyName
*/
#define SIP_PYNAME(name)

/**
/*
* http://pyqt.sourceforge.net/Docs/sip4/annotations.html?highlight=keepreference#argument-annotation-KeepReference
*/
#define SIP_KEEPREFERENCE

/**
/*
* discard line
*/
#define SIP_SKIP

/**
/*
* specify an alternative type for SIP methods
*/
#define SIP_PYTYPE(type)

/**
/*
* specify an alternative default value for SIP methods
*/
#define SIP_PYDEFAULTVALUE(value)

/**
/*
* http://pyqt.sourceforge.net/Docs/sip4/annotations.html?highlight=keepreference#function-annotation-ReleaseGIL
*/
#define SIP_RELEASEGIL

/**
/*
* Will insert a `%Feature feature` directive in sip files
*/
#define SIP_FEATURE(feature)

/**
/*
* Will insert a `%If feature` directive in sip files
*/
#define SIP_IF_FEATURE(feature)

/**
/*
* Convert to subclass code
*/
#define SIP_CONVERT_TO_SUBCLASS_CODE(code)

/**
/*
* Will insert a `%End` directive in sip files
*/
#define SIP_END

0 comments on commit 5da0318

Please sign in to comment.