sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Once again fix QgsFeatureRequest::OrderBy on windows (followup b0bb873, 1d5d92e, 8f29f28 and 3c843a8)

Browse Source
This commit is contained in:
Juergen E. Fischer 2017-05-19 21:56:31 +02:00
parent 59d97be354
commit 258c872c45
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/sipify.pl
View File

@ -55,6 +55,7 @@ close $handle;
my $SIP_RUN = 0;
my $HEADER_CODE = 0;
my @ACCESS = (PUBLIC);
my @EXPORTED = (0);
my $MULTILINE_DEFINITION = 0;
my $comment = '';
@ -390,6 +391,11 @@ while ($line_idx < $line_count){
if ($#ACCESS > 0){
pop(@global_bracket_nesting_index);
pop(@ACCESS);
die "Class $classname in $headerfile should be exported with appropriate [LIB]_EXPORT macro. If this should not be available in python, wrap it in a `#ifndef SIP_RUN` block."
if $EXPORTED[-1] == 0;
pop @EXPORTED;
}
if ($#ACCESS == 0){
dbg_info("reached top level");
@ -455,6 +461,7 @@ while ($line_idx < $line_count){
if ( $line =~ m/^\s*struct(\s+\w+_EXPORT)?\s+\w+$/ ) {
dbg_info(" going to struct => public");
push @ACCESS, PUBLIC;
push @EXPORTED, 0;
push @global_bracket_nesting_index, 0;
}
@ -463,12 +470,13 @@ while ($line_idx < $line_count){
if ( $line =~ m/^(\s*class)\s+([A-Z]+_EXPORT\s+)?(\w+)(\s*\:\s*(public|private)\s+\w+(<([\w]|::)+>)?(::\w+(<\w+>)?)*(,\s*(public|private)\s+\w+(<([\w]|::)+>)?(::\w+(<\w+>)?)*)*)?(?<annot>\s*SIP_.*)?$/ ){
dbg_info("class definition started => private");
push @ACCESS, PRIVATE;
push @EXPORTED, 0;
push @global_bracket_nesting_index, 0;
my @template_inheritance_template = ();
my @template_inheritance_class = ();
do {no warnings 'uninitialized';
$classname = $3;
$line =~ m/\b[A-Z]+_EXPORT\b/ or die "Class $classname in $headerfile should be exported with appropriate [LIB]_EXPORT macro. If this should not be available in python, wrap it in a `#ifndef SIP_RUN` block.";
$EXPORTED[-1]++ if $line =~ m/\b[A-Z]+_EXPORT\b/;
};
$line = "$1 $3";
# Inheritance
@ -626,6 +634,11 @@ while ($line_idx < $line_count){
$line =~ s/\bnullptr\b/0/g;
$line =~ s/\s*=\s*default\b//g;
if( $line =~ /\w+_EXPORT/ ) {
$EXPORTED[-1]++;
$line =~ s/\b\w+_EXPORT\s+//g;
}
# remove constructor definition, function bodies, member initializing list
$SIP_RUN == 1 or detect_and_remove_following_body_or_initializerlist();

16
src/core/qgsfeaturerequest.h
View File

@ -215,21 +215,21 @@ class CORE_EXPORT QgsFeatureRequest
*
* \since QGIS 2.14
*/
class CORE_EXPORT OrderBy : public QList<QgsFeatureRequest::OrderByClause>
class OrderBy : public QList<QgsFeatureRequest::OrderByClause>
{
public:
/**
* Create a new empty order by
*/
OrderBy()
CORE_EXPORT OrderBy()
: QList<QgsFeatureRequest::OrderByClause>()
{}
/**
* Create a new order by from a list of clauses
*/
OrderBy( const QList<QgsFeatureRequest::OrderByClause> &other );
CORE_EXPORT OrderBy( const QList<QgsFeatureRequest::OrderByClause> &other );
/**
* Get a copy as a list of OrderByClauses
@ -237,27 +237,27 @@ class CORE_EXPORT QgsFeatureRequest
* This is only required in Python where the inheritance
* is not properly propagated and this makes it usable.
*/
QList<QgsFeatureRequest::OrderByClause> list() const;
QList<QgsFeatureRequest::OrderByClause> CORE_EXPORT list() const;
/**
* Serialize to XML
*/
void save( QDomElement &elem ) const;
void CORE_EXPORT save( QDomElement &elem ) const;
/**
* Deserialize from XML
*/
void load( const QDomElement &elem );
void CORE_EXPORT load( const QDomElement &elem );
/**
* Returns a set of used attributes
*/
QSet<QString> usedAttributes() const;
QSet<QString> CORE_EXPORT usedAttributes() const;
/**
* Dumps the content to an SQL equivalent syntax
*/
QString dump() const;
QString CORE_EXPORT dump() const;
};
/**