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

sipify batch

Browse Source 
* QgsDial
* QgsDialog
* QgsDockWidget
* QgsEncodingFileDialog
* QgsErrorDialog
This commit is contained in:
Denis Rouzaud 2017-04-25 08:42:22 +02:00
parent 448d2fddd3
commit c1832854a2
21 changed files with 260 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python/auto_sip.blacklist
View File

@ -327,11 +327,6 @@ gui/qgscurveeditorwidget.sip
gui/qgsdetaileditemdata.sip
gui/qgsdetaileditemdelegate.sip
gui/qgsdetaileditemwidget.sip
gui/qgsdial.sip
gui/qgsdialog.sip
gui/qgsdockwidget.sip
gui/qgsencodingfiledialog.sip
gui/qgserrordialog.sip
gui/qgsexpressionbuilderdialog.sip
gui/qgsexpressionbuilderwidget.sip
gui/qgsexpressionhighlighter.sip

1
python/core/processing/qgsprocessingalgorithm.sip
View File

@ -10,7 +10,6 @@
class QgsProcessingAlgorithm
{
%Docstring

1
python/core/processing/qgsprocessingfeedback.sip
View File

@ -9,7 +9,6 @@
class QgsProcessingFeedback : QgsFeedback
{
%Docstring

1
python/core/processing/qgsprocessingprovider.sip
View File

@ -9,7 +9,6 @@
class QgsProcessingProvider : QObject
{
%Docstring

1
python/core/processing/qgsprocessingregistry.sip
View File

@ -9,7 +9,6 @@
class QgsProcessingRegistry : QObject
{
%Docstring

1
python/core/processing/qgsprocessingutils.sip
View File

@ -12,7 +12,6 @@
class QgsProcessingUtils
{
%Docstring

1
python/core/qgsaggregatecalculator.sip
View File

@ -11,7 +11,6 @@
class QgsAggregateCalculator
{
%Docstring

1
python/core/qgsdatasourceuri.sip
View File

@ -10,7 +10,6 @@
class QgsDataSourceUri
{
%Docstring

1
python/core/qgsdistancearea.sip
View File

@ -9,7 +9,6 @@
class QgsDistanceArea
{
%Docstring

1
python/core/qgsellipsoidutils.sip
View File

@ -8,7 +8,6 @@
class QgsEllipsoidUtils
{
%Docstring

45
python/gui/qgsdial.sip
View File

@ -1,21 +1,48 @@
class QgsDial: QDial
{
%TypeHeaderCode
#include <qgsdial.h>
%End
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgsdial.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
QgsDial( QWidget *parent /TransferThis/ = 0 );
class QgsDial : QDial
{
%TypeHeaderCode
#include "qgsdial.h"
%End
public:
QgsDial( QWidget *parent /TransferThis/ = 0 );
%Docstring
QgsDial constructor for QgsDial
@param parent parent object
%End
void setMinimum( const QVariant &min );
void setMaximum( const QVariant &max );
void setSingleStep( const QVariant &step );
void setValue( const QVariant &value );
QVariant variantValue() const;
%Docstring
:rtype: QVariant
%End
signals:
void valueChanged( const QVariant& );
void valueChanged( const QVariant & );
protected:
virtual void paintEvent( QPaintEvent * event );
virtual void paintEvent( QPaintEvent *event );
};
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgsdial.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/

49
python/gui/qgsdialog.sip
View File

@ -1,20 +1,51 @@
/** \ingroup gui
* A generic dialog with layout and button box
*/
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgsdialog.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
class QgsDialog : QDialog
{
%TypeHeaderCode
#include <qgsdialog.h>
%Docstring
A generic dialog with layout and button box
%End
%TypeHeaderCode
#include "qgsdialog.h"
%End
public:
QgsDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags& fl = QgisGui::ModalDialogFlags,
QgsDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags,
QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Close,
Qt::Orientation orientation = Qt::Horizontal );
~QgsDialog();
%Docstring
Constructor for QgsDialog.
%End
//! Returns the central layout. Widgets added to it must have this dialog as parent.
QVBoxLayout *layout();
//! Returns the button box.
%Docstring
Returns the central layout. Widgets added to it must have this dialog as parent.
:rtype: QVBoxLayout
%End
QDialogButtonBox *buttonBox();
%Docstring
Returns the button box.
:rtype: QDialogButtonBox
%End
protected:
};
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgsdialog.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/

131
python/gui/qgsdockwidget.sip
View File

@ -1,83 +1,108 @@
/** \ingroup gui
* \class QgsDockWidget
* QDockWidget subclass with more fine-grained control over how the widget is closed or opened.
* \note added in 2.16
*/
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgsdockwidget.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
class QgsDockWidget : QDockWidget
{
%TypeHeaderCode
#include <qgsdockwidget.h>
%Docstring
QgsDockWidget subclass with more fine-grained control over how the widget is closed or opened.
.. versionadded:: 2.16
%End
%TypeHeaderCode
#include "qgsdockwidget.h"
%End
public:
/** Constructor for QgsDockWidget.
* @param parent parent widget
* @param flags window flags
*/
explicit QgsDockWidget( QWidget* parent /TransferThis/ = nullptr, Qt::WindowFlags flags = 0 );
explicit QgsDockWidget( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags flags = 0 );
%Docstring
Constructor for QgsDockWidget.
\param parent parent widget
\param flags window flags
%End
/** Constructor for QgsDockWidget.
* @param title dock title
* @param parent parent widget
* @param flags window flags
*/
explicit QgsDockWidget( const QString &title, QWidget* parent /TransferThis/ = nullptr, Qt::WindowFlags flags = 0 );
explicit QgsDockWidget( const QString &title, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags flags = 0 );
%Docstring
Constructor for QgsDockWidget.
\param title dock title
\param parent parent widget
\param flags window flags
%End
public slots:
/** Sets the dock widget as visible to a user, ie both shown and raised to the front.
* @param visible set to true to show the dock to the user, or false to hide the dock.
* When setting a dock as user visible, the dock will be opened (if it is not already
* opened) and raised to the front.
* When setting as hidden, the following logic is used:
* - hiding a dock which is open but not raised (ie hidden by another tab) will have no
* effect, and the dock will still be opened and hidden by the other tab
* - hiding a dock which is open and raised (ie, user visible) will cause the dock to
* be closed
* - hiding a dock which is closed has no effect and raises no signals
* @see isUserVisible()
*/
void setUserVisible( bool visible );
%Docstring
Sets the dock widget as visible to a user, ie both shown and raised to the front.
\param visible set to true to show the dock to the user, or false to hide the dock.
When setting a dock as user visible, the dock will be opened (if it is not already
opened) and raised to the front.
When setting as hidden, the following logic is used:
- hiding a dock which is open but not raised (ie hidden by another tab) will have no
effect, and the dock will still be opened and hidden by the other tab
- hiding a dock which is open and raised (ie, user visible) will cause the dock to
be closed
- hiding a dock which is closed has no effect and raises no signals
\see isUserVisible()
%End
/** Returns true if the dock is both opened and raised to the front (ie not hidden by
* any other tabs.
* @see setUserVisible()
*/
bool isUserVisible() const;
%Docstring
Returns true if the dock is both opened and raised to the front (ie not hidden by
any other tabs.
\see setUserVisible()
:rtype: bool
%End
protected:
virtual void closeEvent( QCloseEvent * );
virtual void showEvent( QShowEvent* event );
virtual void showEvent( QShowEvent *event );
signals:
/** Emitted when dock widget is closed.
* @see closedStateChanged()
* @see opened()
*/
void closed();
%Docstring
Emitted when dock widget is closed.
\see closedStateChanged()
\see opened()
%End
/** Emitted when dock widget is closed (or opened).
* @param wasClosed will be true if dock widget was closed, or false if dock widget was opened
* @see closed()
* @see openedStateChanged()
*/
void closedStateChanged( bool wasClosed );
%Docstring
Emitted when dock widget is closed (or opened).
\param wasClosed will be true if dock widget was closed, or false if dock widget was opened
\see closed()
\see openedStateChanged()
%End
/** Emitted when dock widget is opened.
* @see openedStateChanged()
* @see closed()
*/
void opened();
%Docstring
Emitted when dock widget is opened.
\see openedStateChanged()
\see closed()
%End
/** Emitted when dock widget is opened (or closed).
* @param wasOpened will be true if dock widget was opened, or false if dock widget was closed
* @see closedStateChanged()
* @see opened()
*/
void openedStateChanged( bool wasOpened );
%Docstring
Emitted when dock widget is opened (or closed).
\param wasOpened will be true if dock widget was opened, or false if dock widget was closed
\see closedStateChanged()
\see opened()
%End
};
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgsdockwidget.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/

55
python/gui/qgsencodingfiledialog.sip
View File

@ -1,25 +1,58 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgsencodingfiledialog.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
/** A file dialog which lets the user select the preferred encoding type for a data provider*/
class QgsEncodingFileDialog : QFileDialog
class QgsEncodingFileDialog: QFileDialog
{
%TypeHeaderCode
#include <qgsencodingfiledialog.h>
%Docstring
A file dialog which lets the user select the preferred encoding type for a data provider.
*
%End
%TypeHeaderCode
#include "qgsencodingfiledialog.h"
%End
public:
QgsEncodingFileDialog( QWidget * parent /TransferThis/ = 0,
const QString & caption = QString(), const QString & directory = QString(),
const QString & filter = QString(), const QString & encoding = QString() );
~QgsEncodingFileDialog();
/** Returns a string describing the chosen encoding*/
QgsEncodingFileDialog( QWidget *parent /TransferThis/ = 0,
const QString &caption = QString(), const QString &directory = QString(),
const QString &filter = QString(), const QString &encoding = QString() );
%Docstring
QgsEncodingFileDialog constructor for QgsEncodingFileDialog
%End
QString encoding() const;
/** Adds a 'Cancel All' button for the user to click */
%Docstring
Returns a string describing the chosen encoding
:rtype: str
%End
void addCancelAll();
/** Returns true if the user clicked 'Cancel All' */
%Docstring
Adds a 'Cancel All' button for the user to click
%End
bool cancelAll();
%Docstring
Returns true if the user clicked 'Cancel All'
:rtype: bool
%End
public slots:
void saveUsedEncoding();
void pbnCancelAll_clicked();
};
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgsencodingfiledialog.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/

47
python/gui/qgserrordialog.sip
View File

@ -1,21 +1,46 @@
class QgsErrorDialog : QDialog
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgserrordialog.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
class QgsErrorDialog: QDialog
{
%TypeHeaderCode
#include <qgserrordialog.h>
#include "qgserrordialog.h"
%End
public:
QgsErrorDialog( const QgsError & error, const QString & title, QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags& fl = QgisGui::ModalDialogFlags );
~QgsErrorDialog();
/** Show dialog with error
* @param error error
* @param title title
* @param parent parent object
* @param fl widget flags
*/
static void show( const QgsError & error, const QString & title, QWidget *parent = 0, const Qt::WindowFlags& fl = QgisGui::ModalDialogFlags );
QgsErrorDialog( const QgsError &error, const QString &title, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
%Docstring
QgsErrorDialog constructor for QgsErrorDialog
%End
static void show( const QgsError &error, const QString &title, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
%Docstring
Show dialog with error
\param error error
\param title title
\param parent parent object
\param fl widget flags
%End
public slots:
void on_mDetailPushButton_clicked();
void on_mDetailCheckBox_stateChanged( int state );
};
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgserrordialog.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/

2
scripts/sipify.pl
View File

@ -59,7 +59,7 @@ my $is_override = 0;
my %qflag_hash;
my $line_count = @lines;
my $line_idx = -1;
my $line_idx = 0;
my $line;
my @output = ();

8
src/gui/qgsdial.h
View File

@ -18,6 +18,7 @@
#include <QDial>
#include <QVariant>
#include "qgis_gui.h"
#include "qgis.h"
class QPaintEvent;
@ -28,7 +29,12 @@ class GUI_EXPORT QgsDial : public QDial
{
Q_OBJECT
public:
QgsDial( QWidget *parent = nullptr );
/**
* @brief QgsDial constructor for QgsDial
* @param parent parent object
*/
QgsDial( QWidget *parent SIP_TRANSFERTHIS = nullptr );
void setMinimum( const QVariant &min );
void setMaximum( const QVariant &max );

3
src/gui/qgsdialog.h
View File

@ -24,6 +24,7 @@
#include <QDialogButtonBox>
#include <QLayout>
#include "qgis_gui.h"
#include "qgis.h"
/** \ingroup gui
* A generic dialog with layout and button box
@ -36,7 +37,7 @@ class GUI_EXPORT QgsDialog : public QDialog
/**
* Constructor for QgsDialog.
*/
QgsDialog( QWidget *parent = nullptr, Qt::WindowFlags fl = QgisGui::ModalDialogFlags,
QgsDialog( QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags fl = QgisGui::ModalDialogFlags,
QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Close,
Qt::Orientation orientation = Qt::Horizontal );

5
src/gui/qgsdockwidget.h
View File

@ -19,6 +19,7 @@
#include <QDockWidget>
#include "qgis_gui.h"
#include "qgis.h"
/** \ingroup gui
* \class QgsDockWidget
@ -36,14 +37,14 @@ class GUI_EXPORT QgsDockWidget : public QDockWidget
* \param parent parent widget
* \param flags window flags
*/
explicit QgsDockWidget( QWidget *parent = nullptr, Qt::WindowFlags flags = 0 );
explicit QgsDockWidget( QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags flags = 0 );
/** Constructor for QgsDockWidget.
* \param title dock title
* \param parent parent widget
* \param flags window flags
*/
explicit QgsDockWidget( const QString &title, QWidget *parent = nullptr, Qt::WindowFlags flags = 0 );
explicit QgsDockWidget( const QString &title, QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags flags = 0 );
public slots:

8
src/gui/qgsencodingfiledialog.h
View File

@ -18,6 +18,8 @@
#include <QFileDialog>
#include "qgis_gui.h"
#include "qgis.h"
class QComboBox;
class QPushButton;
@ -28,7 +30,11 @@ class GUI_EXPORT QgsEncodingFileDialog: public QFileDialog
{
Q_OBJECT
public:
QgsEncodingFileDialog( QWidget *parent = nullptr,
/**
* @brief QgsEncodingFileDialog constructor for QgsEncodingFileDialog
*/
QgsEncodingFileDialog( QWidget *parent SIP_TRANSFERTHIS = nullptr,
const QString &caption = QString(), const QString &directory = QString(),
const QString &filter = QString(), const QString &encoding = QString() );
//! Returns a string describing the chosen encoding

7
src/gui/qgserrordialog.h
View File

@ -23,6 +23,7 @@
#include "qgisgui.h"
#include "qgserror.h"
#include "qgis_gui.h"
#include "qgis.h"
/** \ingroup gui
* \class QgsErrorDialog
@ -31,7 +32,11 @@ class GUI_EXPORT QgsErrorDialog: public QDialog, private Ui::QgsErrorDialogBase
{
Q_OBJECT
public:
QgsErrorDialog( const QgsError &error, const QString &title, QWidget *parent = nullptr, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
/**
* @brief QgsErrorDialog constructor for QgsErrorDialog
*/
QgsErrorDialog( const QgsError &error, const QString &title, QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
/** Show dialog with error
* \param error error