[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 5008
Author: scorpio810
Date: 2017-08-05 04:06:59 +0200 (Sat, 05 Aug 2017)
Log Message:
-----------
Modernize-use-nullptr refactors code
Modified Paths:
--------------
trunk/sources/ElementsCollection/elementslocation.cpp
trunk/sources/ElementsCollection/elementstreeview.cpp
trunk/sources/ElementsCollection/ui/renamedialog.h
trunk/sources/PropertiesEditor/propertieseditordialog.h
trunk/sources/PropertiesEditor/propertieseditordockwidget.h
trunk/sources/PropertiesEditor/propertieseditorwidget.h
trunk/sources/QPropertyUndoCommand/qpropertyundocommand.h
trunk/sources/aboutqet.h
trunk/sources/autoNum/numerotationcontextcommands.cpp
trunk/sources/autoNum/ui/autonumberingdockwidget.cpp
trunk/sources/autoNum/ui/autonumberingdockwidget.h
trunk/sources/autoNum/ui/autonumberingmanagementw.h
trunk/sources/autoNum/ui/folioautonumbering.h
trunk/sources/autoNum/ui/formulaautonumberingw.h
trunk/sources/autoNum/ui/numparteditorw.cpp
trunk/sources/autoNum/ui/numparteditorw.h
trunk/sources/autoNum/ui/selectautonumw.h
trunk/sources/bordertitleblock.h
trunk/sources/conductorsegment.cpp
trunk/sources/conductorsegment.h
trunk/sources/configdialog.h
trunk/sources/configpages.h
trunk/sources/diagram.cpp
trunk/sources/diagram.h
trunk/sources/diagramcommands.h
trunk/sources/diagramcontextwidget.h
trunk/sources/diagramevent/diagrameventaddelement.cpp
trunk/sources/diagramprintdialog.cpp
trunk/sources/diagramprintdialog.h
trunk/sources/diagramschooser.cpp
trunk/sources/diagramschooser.h
trunk/sources/diagramview.h
trunk/sources/editor/arceditor.cpp
trunk/sources/editor/arceditor.h
trunk/sources/editor/editorcommands.cpp
trunk/sources/editor/editorcommands.h
trunk/sources/editor/elementitemeditor.cpp
trunk/sources/editor/elementitemeditor.h
trunk/sources/editor/elementprimitivedecorator.cpp
trunk/sources/editor/elementprimitivedecorator.h
trunk/sources/editor/elementscene.h
trunk/sources/editor/elementview.h
trunk/sources/editor/ellipseeditor.cpp
trunk/sources/editor/ellipseeditor.h
trunk/sources/editor/graphicspart/abstractpartellipse.h
trunk/sources/editor/graphicspart/customelementgraphicpart.h
trunk/sources/editor/graphicspart/partarc.h
trunk/sources/editor/graphicspart/partellipse.h
trunk/sources/editor/graphicspart/partline.h
trunk/sources/editor/graphicspart/partpolygon.h
trunk/sources/editor/graphicspart/partrectangle.h
trunk/sources/editor/graphicspart/partterminal.h
trunk/sources/editor/graphicspart/parttext.h
trunk/sources/editor/graphicspart/parttextfield.h
trunk/sources/editor/lineeditor.cpp
trunk/sources/editor/lineeditor.h
trunk/sources/editor/polygoneditor.cpp
trunk/sources/editor/polygoneditor.h
trunk/sources/editor/qetelementeditor.cpp
trunk/sources/editor/qetelementeditor.h
trunk/sources/editor/rectangleeditor.cpp
trunk/sources/editor/rectangleeditor.h
trunk/sources/editor/styleeditor.h
trunk/sources/editor/terminaleditor.cpp
trunk/sources/editor/terminaleditor.h
trunk/sources/editor/texteditor.cpp
trunk/sources/editor/texteditor.h
trunk/sources/editor/textfieldeditor.cpp
trunk/sources/editor/textfieldeditor.h
trunk/sources/editor/ui/elementpropertieseditorwidget.h
trunk/sources/elementprovider.h
trunk/sources/elementscollectioncache.cpp
trunk/sources/elementscollectioncache.h
trunk/sources/elementsmover.cpp
trunk/sources/elementsmover.h
trunk/sources/elementspanel.cpp
trunk/sources/elementspanel.h
trunk/sources/elementspanelwidget.h
trunk/sources/exportdialog.h
trunk/sources/exportpropertieswidget.h
trunk/sources/factory/elementfactory.h
trunk/sources/genericpanel.cpp
trunk/sources/genericpanel.h
trunk/sources/nameslistwidget.h
trunk/sources/newelementwizard.h
trunk/sources/nomenclature.h
trunk/sources/projectconfigpages.h
trunk/sources/projectview.cpp
trunk/sources/projectview.h
trunk/sources/qet.cpp
trunk/sources/qet.h
trunk/sources/qetapp.cpp
trunk/sources/qetarguments.h
trunk/sources/qetdiagrameditor.cpp
trunk/sources/qetdiagrameditor.h
trunk/sources/qetgraphicsitem/conductor.cpp
trunk/sources/qetgraphicsitem/conductor.h
trunk/sources/qetgraphicsitem/conductortextitem.h
trunk/sources/qetgraphicsitem/customelement.cpp
trunk/sources/qetgraphicsitem/customelement.h
trunk/sources/qetgraphicsitem/diagramimageitem.h
trunk/sources/qetgraphicsitem/diagramtextitem.h
trunk/sources/qetgraphicsitem/element.cpp
trunk/sources/qetgraphicsitem/element.h
trunk/sources/qetgraphicsitem/elementtextitem.h
trunk/sources/qetgraphicsitem/fixedelement.h
trunk/sources/qetgraphicsitem/ghostelement.h
trunk/sources/qetgraphicsitem/independenttextitem.cpp
trunk/sources/qetgraphicsitem/masterelement.h
trunk/sources/qetgraphicsitem/qetgraphicsitem.h
trunk/sources/qetgraphicsitem/qetshapeitem.cpp
trunk/sources/qetgraphicsitem/qetshapeitem.h
trunk/sources/qetgraphicsitem/reportelement.cpp
trunk/sources/qetgraphicsitem/reportelement.h
trunk/sources/qetgraphicsitem/simpleelement.h
trunk/sources/qetgraphicsitem/slaveelement.cpp
trunk/sources/qetgraphicsitem/slaveelement.h
trunk/sources/qetgraphicsitem/terminal.cpp
trunk/sources/qetgraphicsitem/terminal.h
trunk/sources/qetgraphicsitem/terminalelement.h
trunk/sources/qetmainwindow.cpp
trunk/sources/qetmainwindow.h
trunk/sources/qetprintpreviewdialog.h
trunk/sources/qetproject.cpp
trunk/sources/qetproject.h
trunk/sources/qfilenameedit.h
trunk/sources/qtextorientationspinboxwidget.h
trunk/sources/qtextorientationwidget.h
trunk/sources/recentfiles.cpp
trunk/sources/recentfiles.h
trunk/sources/richtext/richtexteditor.cpp
trunk/sources/richtext/richtexteditor_p.h
trunk/sources/richtext/ui_addlinkdialog.h
trunk/sources/titleblock/dimensionwidget.h
trunk/sources/titleblock/gridlayoutanimation.h
trunk/sources/titleblock/helpercell.h
trunk/sources/titleblock/integrationmovetemplateshandler.cpp
trunk/sources/titleblock/integrationmovetemplateshandler.h
trunk/sources/titleblock/movetemplateshandler.h
trunk/sources/titleblock/qettemplateeditor.cpp
trunk/sources/titleblock/qettemplateeditor.h
trunk/sources/titleblock/splittedhelpercell.h
trunk/sources/titleblock/templatecellsset.cpp
trunk/sources/titleblock/templatecellwidget.h
trunk/sources/titleblock/templatecommands.cpp
trunk/sources/titleblock/templatecommands.h
trunk/sources/titleblock/templatedeleter.h
trunk/sources/titleblock/templatelocation.cpp
trunk/sources/titleblock/templatelocation.h
trunk/sources/titleblock/templatelocationchooser.h
trunk/sources/titleblock/templatelocationsaver.h
trunk/sources/titleblock/templatelogomanager.cpp
trunk/sources/titleblock/templatelogomanager.h
trunk/sources/titleblock/templatescollection.cpp
trunk/sources/titleblock/templatescollection.h
trunk/sources/titleblock/templateview.cpp
trunk/sources/titleblock/templateview.h
trunk/sources/titleblock/templatevisualcell.cpp
trunk/sources/titleblock/templatevisualcell.h
trunk/sources/titleblockcell.cpp
trunk/sources/titleblocktemplate.cpp
trunk/sources/titleblocktemplate.h
trunk/sources/titleblocktemplaterenderer.cpp
trunk/sources/titleblocktemplaterenderer.h
trunk/sources/ui/abstractelementpropertieseditorwidget.h
trunk/sources/ui/borderpropertieswidget.h
trunk/sources/ui/conductorpropertiesdialog.h
trunk/sources/ui/conductorpropertieswidget.h
trunk/sources/ui/diagrampropertiesdialog.h
trunk/sources/ui/diagramselection.h
trunk/sources/ui/dialogwaiting.h
trunk/sources/ui/dynamicelementtextitemeditor.h
trunk/sources/ui/elementinfopartwidget.h
trunk/sources/ui/elementinfowidget.h
trunk/sources/ui/elementpropertieswidget.h
trunk/sources/ui/formulaassistantdialog.h
trunk/sources/ui/imagepropertieswidget.h
trunk/sources/ui/importelementdialog.h
trunk/sources/ui/linksingleelementwidget.h
trunk/sources/ui/masterpropertieswidget.h
trunk/sources/ui/projectpropertiesdialog.h
trunk/sources/ui/reportpropertiewidget.h
trunk/sources/ui/shapegraphicsitempropertieswidget.h
trunk/sources/ui/titleblockpropertieswidget.cpp
trunk/sources/ui/titleblockpropertieswidget.h
trunk/sources/ui/xrefpropertieswidget.h
trunk/sources/undocommand/linkelementcommand.h
Modified: trunk/sources/ElementsCollection/elementslocation.cpp
===================================================================
--- trunk/sources/ElementsCollection/elementslocation.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ElementsCollection/elementslocation.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -649,7 +649,7 @@
{
ElementFactory *factory = ElementFactory::Instance();
int state;
- Element *elmt = factory->createElement(*this, 0, &state);
+ Element *elmt = factory->createElement(*this, nullptr, &state);
if (state == 0)
return QIcon(elmt->pixmap());
Modified: trunk/sources/ElementsCollection/elementstreeview.cpp
===================================================================
--- trunk/sources/ElementsCollection/elementstreeview.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ElementsCollection/elementstreeview.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -89,7 +89,7 @@
//Build the element for set the pixmap of the QDrag
int elmt_creation_state;
- Element *temp_elmt = ElementFactory::Instance()->createElement(location, 0, &elmt_creation_state);
+ Element *temp_elmt = ElementFactory::Instance()->createElement(location, nullptr, &elmt_creation_state);
if (elmt_creation_state)
{
delete temp_elmt;
Modified: trunk/sources/ElementsCollection/ui/renamedialog.h
===================================================================
--- trunk/sources/ElementsCollection/ui/renamedialog.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ElementsCollection/ui/renamedialog.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -30,7 +30,7 @@
Q_OBJECT
public:
- explicit RenameDialog(QString path, QWidget *parent = 0);
+ explicit RenameDialog(QString path, QWidget *parent = nullptr);
~RenameDialog();
QString newName() const {return m_new_name;}
Modified: trunk/sources/PropertiesEditor/propertieseditordialog.h
===================================================================
--- trunk/sources/PropertiesEditor/propertieseditordialog.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/PropertiesEditor/propertieseditordialog.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -39,7 +39,7 @@
Q_OBJECT
public:
template<typename T>
- PropertiesEditorDialog(T editor, QWidget *parent = 0) :
+ PropertiesEditorDialog(T editor, QWidget *parent = nullptr) :
QDialog (parent)
{
//Set dialog title
Modified: trunk/sources/PropertiesEditor/propertieseditordockwidget.h
===================================================================
--- trunk/sources/PropertiesEditor/propertieseditordockwidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/PropertiesEditor/propertieseditordockwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -31,7 +31,7 @@
Q_OBJECT
public:
- explicit PropertiesEditorDockWidget(QWidget *parent = 0);
+ explicit PropertiesEditorDockWidget(QWidget *parent = nullptr);
~PropertiesEditorDockWidget();
virtual void clear();
Modified: trunk/sources/PropertiesEditor/propertieseditorwidget.h
===================================================================
--- trunk/sources/PropertiesEditor/propertieseditorwidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/PropertiesEditor/propertieseditorwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -31,7 +31,7 @@
{
Q_OBJECT
public:
- explicit PropertiesEditorWidget(QWidget *parent = 0);
+ explicit PropertiesEditorWidget(QWidget *parent = nullptr);
virtual void apply() {}
virtual void reset() {}
Modified: trunk/sources/QPropertyUndoCommand/qpropertyundocommand.h
===================================================================
--- trunk/sources/QPropertyUndoCommand/qpropertyundocommand.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/QPropertyUndoCommand/qpropertyundocommand.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -33,8 +33,8 @@
class QPropertyUndoCommand : public QUndoCommand
{
public:
- QPropertyUndoCommand(QObject *object, const char *property_name, const QVariant &old_value, const QVariant &new_value, QUndoCommand *parent = 0);
- QPropertyUndoCommand(QObject *object, const char *property_name, const QVariant &old_value, QUndoCommand *parent = 0);
+ QPropertyUndoCommand(QObject *object, const char *property_name, const QVariant &old_value, const QVariant &new_value, QUndoCommand *parent = nullptr);
+ QPropertyUndoCommand(QObject *object, const char *property_name, const QVariant &old_value, QUndoCommand *parent = nullptr);
void setNewValue(const QVariant &new_value);
void enableAnimation (bool animate = true);
Modified: trunk/sources/aboutqet.h
===================================================================
--- trunk/sources/aboutqet.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/aboutqet.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -27,7 +27,7 @@
// constructors, destructor
public:
- AboutQET(QWidget * = 0);
+ AboutQET(QWidget * = nullptr);
virtual ~AboutQET();
private:
Modified: trunk/sources/autoNum/numerotationcontextcommands.cpp
===================================================================
--- trunk/sources/autoNum/numerotationcontextcommands.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/autoNum/numerotationcontextcommands.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -24,7 +24,7 @@
NumerotationContextCommands::NumerotationContextCommands(const NumerotationContext &nc, Diagram *d):
diagram_ (d),
context_ (nc),
- strategy_ (NULL)
+ strategy_ (nullptr)
{}
/**
Modified: trunk/sources/autoNum/ui/autonumberingdockwidget.cpp
===================================================================
--- trunk/sources/autoNum/ui/autonumberingdockwidget.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/autoNum/ui/autonumberingdockwidget.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -167,7 +167,7 @@
* @param dv: activated diagramview
*/
void AutoNumberingDockWidget::setConductorActive(DiagramView* dv) {
- if (dv!=NULL) {
+ if (dv!=nullptr) {
QString conductor_autonum = dv->diagram()->conductorsAutonumName();
int conductor_index = ui->m_conductor_cb->findText(conductor_autonum);
ui->m_conductor_cb->setCurrentIndex(conductor_index);
@@ -180,7 +180,7 @@
*/
void AutoNumberingDockWidget::setActive() {
- if (m_project_view!=NULL) {
+ if (m_project_view!=nullptr) {
//Conductor
if (m_project_view->currentDiagram()) {
QString conductor_autonum = m_project_view->currentDiagram()->diagram()->conductorsAutonumName();
Modified: trunk/sources/autoNum/ui/autonumberingdockwidget.h
===================================================================
--- trunk/sources/autoNum/ui/autonumberingdockwidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/autoNum/ui/autonumberingdockwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -31,7 +31,7 @@
Q_OBJECT
public:
- explicit AutoNumberingDockWidget(QWidget *parent = 0);
+ explicit AutoNumberingDockWidget(QWidget *parent = nullptr);
~AutoNumberingDockWidget();
void setContext();
Modified: trunk/sources/autoNum/ui/autonumberingmanagementw.h
===================================================================
--- trunk/sources/autoNum/ui/autonumberingmanagementw.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/autoNum/ui/autonumberingmanagementw.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -34,7 +34,7 @@
//METHODS
public:
- explicit AutoNumberingManagementW(QETProject *project, QWidget *parent = 0);
+ explicit AutoNumberingManagementW(QETProject *project, QWidget *parent = nullptr);
~AutoNumberingManagementW();
Ui::AutoNumberingManagementW *ui;
void setProjectContext ();
Modified: trunk/sources/autoNum/ui/folioautonumbering.h
===================================================================
--- trunk/sources/autoNum/ui/folioautonumbering.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/autoNum/ui/folioautonumbering.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -35,7 +35,7 @@
//METHODS
public:
- explicit FolioAutonumberingW(QETProject *project, QWidget *parent = 0);
+ explicit FolioAutonumberingW(QETProject *project, QWidget *parent = nullptr);
~FolioAutonumberingW();
void setContext (QList <QString> autonums);
Modified: trunk/sources/autoNum/ui/formulaautonumberingw.h
===================================================================
--- trunk/sources/autoNum/ui/formulaautonumberingw.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/autoNum/ui/formulaautonumberingw.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -38,7 +38,7 @@
//METHODS
public:
- explicit FormulaAutonumberingW(QWidget *parent = 0);
+ explicit FormulaAutonumberingW(QWidget *parent = nullptr);
~FormulaAutonumberingW();
QString formula();
void setContext(QString);
Modified: trunk/sources/autoNum/ui/numparteditorw.cpp
===================================================================
--- trunk/sources/autoNum/ui/numparteditorw.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/autoNum/ui/numparteditorw.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -249,7 +249,7 @@
ui -> value_field -> clear();
ui -> increase_spinBox -> setDisabled(true);
if (t==string) {
- ui -> value_field -> setValidator(0);
+ ui -> value_field -> setValidator(nullptr);
ui -> value_field -> setEnabled(true);
}
else if (t==folio) {
Modified: trunk/sources/autoNum/ui/numparteditorw.h
===================================================================
--- trunk/sources/autoNum/ui/numparteditorw.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/autoNum/ui/numparteditorw.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -37,8 +37,8 @@
//METHODS
public:
- explicit NumPartEditorW(int type, QWidget *parent = 0);
- NumPartEditorW (NumerotationContext &, int, int type, QWidget *parent=0);
+ explicit NumPartEditorW(int type, QWidget *parent = nullptr);
+ NumPartEditorW (NumerotationContext &, int, int type, QWidget *parent=nullptr);
~NumPartEditorW();
enum type {unit,unitfolio,ten,tenfolio, hundred, hundredfolio,
Modified: trunk/sources/autoNum/ui/selectautonumw.h
===================================================================
--- trunk/sources/autoNum/ui/selectautonumw.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/autoNum/ui/selectautonumw.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -37,8 +37,8 @@
//METHODS
public:
- explicit SelectAutonumW(int type, QWidget *parent = 0);
- explicit SelectAutonumW(const NumerotationContext &context, int type, QWidget *parent = 0);
+ explicit SelectAutonumW(int type, QWidget *parent = nullptr);
+ explicit SelectAutonumW(const NumerotationContext &context, int type, QWidget *parent = nullptr);
~SelectAutonumW();
void setContext (const NumerotationContext &context);
Modified: trunk/sources/bordertitleblock.h
===================================================================
--- trunk/sources/bordertitleblock.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/bordertitleblock.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -37,7 +37,7 @@
Q_OBJECT
public:
- BorderTitleBlock(QObject * = 0);
+ BorderTitleBlock(QObject * = nullptr);
virtual ~BorderTitleBlock();
private:
@@ -153,7 +153,7 @@
btb_folio_ = folio;
emit (titleBlockFolioChanged(folio));
}
- void setFolioData(int, int, QString = NULL, const DiagramContext & = DiagramContext());
+ void setFolioData(int, int, QString = nullptr, const DiagramContext & = DiagramContext());
/// @param author the new value of the "File" field
void setMachine(const QString &machine) { btb_machine_ = machine; }
void setLocMach(const QString &locmach) { btb_locmach_ = locmach; }
@@ -180,7 +180,7 @@
public slots:
void titleBlockTemplateChanged(const QString &);
- void titleBlockTemplateRemoved(const QString &, const TitleBlockTemplate * = 0);
+ void titleBlockTemplateRemoved(const QString &, const TitleBlockTemplate * = nullptr);
// methods to set display options
void displayTitleBlock(bool);
Modified: trunk/sources/conductorsegment.cpp
===================================================================
--- trunk/sources/conductorsegment.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/conductorsegment.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -477,7 +477,7 @@
@return true si le segment a un segment precedent, false sinon
*/
bool ConductorSegment::hasPreviousSegment() const {
- return(previous_segment != NULL);
+ return(previous_segment != nullptr);
}
/**
@@ -484,7 +484,7 @@
@return true si le segment a un segment suivant, false sinon
*/
bool ConductorSegment::hasNextSegment() const {
- return(next_segment != NULL);
+ return(next_segment != nullptr);
}
/**
Modified: trunk/sources/conductorsegment.h
===================================================================
--- trunk/sources/conductorsegment.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/conductorsegment.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -26,7 +26,7 @@
// constructors, destructor
public:
- ConductorSegment(const QPointF &, const QPointF &, ConductorSegment * = NULL, ConductorSegment * = NULL);
+ ConductorSegment(const QPointF &, const QPointF &, ConductorSegment * = nullptr, ConductorSegment * = nullptr);
virtual ~ConductorSegment();
private:
Modified: trunk/sources/configdialog.h
===================================================================
--- trunk/sources/configdialog.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/configdialog.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -32,7 +32,7 @@
Q_OBJECT
// constructors, destructor
public:
- ConfigDialog(QWidget * = 0);
+ ConfigDialog(QWidget * = nullptr);
virtual ~ConfigDialog();
private:
ConfigDialog(const ConfigDialog &);
Modified: trunk/sources/configpages.h
===================================================================
--- trunk/sources/configpages.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/configpages.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -38,7 +38,7 @@
Q_OBJECT
// constructors, destructor
public:
- NewDiagramPage(QETProject *project = 0, QWidget * = 0, ProjectPropertiesDialog *teste = NULL);
+ NewDiagramPage(QETProject *project = nullptr, QWidget * = nullptr, ProjectPropertiesDialog *teste = nullptr);
virtual ~NewDiagramPage();
private:
NewDiagramPage(const NewDiagramPage &);
@@ -76,7 +76,7 @@
Q_OBJECT
// constructors, destructor
public:
- GeneralConfigurationPage(QWidget * = 0);
+ GeneralConfigurationPage(QWidget * = nullptr);
virtual ~GeneralConfigurationPage();
private:
GeneralConfigurationPage(const GeneralConfigurationPage &);
@@ -121,7 +121,7 @@
Q_OBJECT
// constructors, destructor
public:
- ExportConfigPage(QWidget * = 0);
+ ExportConfigPage(QWidget * = nullptr);
virtual ~ExportConfigPage();
private:
ExportConfigPage(const ExportConfigPage &);
@@ -144,7 +144,7 @@
Q_OBJECT
// constructors, destructor
public:
- PrintConfigPage(QWidget * = 0);
+ PrintConfigPage(QWidget * = nullptr);
virtual ~PrintConfigPage();
private:
PrintConfigPage(const PrintConfigPage &);
Modified: trunk/sources/diagram.cpp
===================================================================
--- trunk/sources/diagram.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/diagram.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -67,7 +67,7 @@
setProject(project);
qgi_manager_ = new QGIManager(this);
setBackgroundBrush(Qt::white);
- conductor_setter_ = new QGraphicsLineItem(0);
+ conductor_setter_ = new QGraphicsLineItem(nullptr);
conductor_setter_ -> setZValue(1000000);
QPen pen(Qt::NoBrush, 1.5, Qt::DashLine);
@@ -863,7 +863,7 @@
}
int state = 0;
- Element *nvel_elmt = ElementFactory::Instance() -> createElement(element_location, 0, &state);
+ Element *nvel_elmt = ElementFactory::Instance() -> createElement(element_location, nullptr, &state);
if (state)
{
QString debug_message = QString("Diagram::fromXml() : Le chargement de la description de l'element %1 a echoue avec le code d'erreur %2").arg(element_location.path()).arg(state);
Modified: trunk/sources/diagram.h
===================================================================
--- trunk/sources/diagram.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/diagram.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -150,9 +150,9 @@
// methods related to XML import/export
QDomDocument toXml(bool = true);
- bool initFromXml(QDomElement &, QPointF = QPointF(), bool = true, DiagramContent * = 0);
- bool fromXml(QDomDocument &, QPointF = QPointF(), bool = true, DiagramContent * = 0);
- bool fromXml(QDomElement &, QPointF = QPointF(), bool = true, DiagramContent * = 0);
+ bool initFromXml(QDomElement &, QPointF = QPointF(), bool = true, DiagramContent * = nullptr);
+ bool fromXml(QDomDocument &, QPointF = QPointF(), bool = true, DiagramContent * = nullptr);
+ bool fromXml(QDomElement &, QPointF = QPointF(), bool = true, DiagramContent * = nullptr);
void folioSequentialsToXml(QHash<QString, QStringList>*, QDomElement *, QString, QString, QDomDocument *);
void folioSequentialsFromXml(const QDomElement&, QHash<QString, QStringList>*, QString, QString, QString, QString);
@@ -192,10 +192,10 @@
DiagramContent content() const;
DiagramContent selectedContent();
bool canRotateSelection() const;
- int beginMoveElements(QGraphicsItem * = 0);
+ int beginMoveElements(QGraphicsItem * = nullptr);
void continueMoveElements(const QPointF &);
void endMoveElements();
- int beginMoveElementTexts(QGraphicsItem * = 0);
+ int beginMoveElementTexts(QGraphicsItem * = nullptr);
void continueMoveElementTexts(const QPointF &);
void endMoveElementTexts();
bool usesElement(const ElementsLocation &);
Modified: trunk/sources/diagramcommands.h
===================================================================
--- trunk/sources/diagramcommands.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/diagramcommands.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -87,7 +87,7 @@
class PasteDiagramCommand : public QUndoCommand {
// constructors, destructor
public:
- PasteDiagramCommand(Diagram *, const DiagramContent &, QUndoCommand * = 0);
+ PasteDiagramCommand(Diagram *, const DiagramContent &, QUndoCommand * = nullptr);
virtual ~PasteDiagramCommand();
private:
PasteDiagramCommand(const PasteDiagramCommand &);
@@ -115,7 +115,7 @@
class CutDiagramCommand : public DeleteQGraphicsItemCommand {
// constructors, destructor
public:
- CutDiagramCommand(Diagram *, const DiagramContent &, QUndoCommand * = 0);
+ CutDiagramCommand(Diagram *, const DiagramContent &, QUndoCommand * = nullptr);
virtual ~CutDiagramCommand();
private:
CutDiagramCommand(const CutDiagramCommand &);
@@ -127,7 +127,7 @@
class MoveElementsCommand : public QUndoCommand {
// constructors, destructor
public:
- MoveElementsCommand(Diagram *, const DiagramContent &, const QPointF &m, QUndoCommand * = 0);
+ MoveElementsCommand(Diagram *, const DiagramContent &, const QPointF &m, QUndoCommand * = nullptr);
virtual ~MoveElementsCommand();
private:
MoveElementsCommand(const MoveElementsCommand &);
@@ -162,7 +162,7 @@
class MoveConductorsTextsCommand : public QUndoCommand {
// constructors, destructor
public:
- MoveConductorsTextsCommand(Diagram *, QUndoCommand * = 0);
+ MoveConductorsTextsCommand(Diagram *, QUndoCommand * = nullptr);
virtual ~MoveConductorsTextsCommand();
private:
MoveConductorsTextsCommand(const MoveConductorsTextsCommand &);
@@ -192,7 +192,7 @@
class ChangeDiagramTextCommand : public QUndoCommand {
// constructors, destructor
public:
- ChangeDiagramTextCommand(DiagramTextItem *, const QString &before, const QString &after, QUndoCommand * = 0);
+ ChangeDiagramTextCommand(DiagramTextItem *, const QString &before, const QString &after, QUndoCommand * = nullptr);
virtual ~ChangeDiagramTextCommand();
private:
ChangeDiagramTextCommand(const ChangeDiagramTextCommand &);
@@ -221,7 +221,7 @@
class RotateElementsCommand : public QUndoCommand {
// constructors, destructor
public:
- RotateElementsCommand(const QList<Element *> &elements, const QList<DiagramTextItem *> &, const QList<DiagramImageItem *> &, QUndoCommand * = 0);
+ RotateElementsCommand(const QList<Element *> &elements, const QList<DiagramTextItem *> &, const QList<DiagramImageItem *> &, QUndoCommand * = nullptr);
virtual ~RotateElementsCommand();
private:
RotateElementsCommand(const RotateElementsCommand &);
@@ -284,7 +284,7 @@
class ChangeConductorCommand : public QUndoCommand {
// constructors, destructor
public:
- ChangeConductorCommand(Conductor *, const ConductorProfile &, const ConductorProfile &, Qt::Corner, QUndoCommand * = 0);
+ ChangeConductorCommand(Conductor *, const ConductorProfile &, const ConductorProfile &, Qt::Corner, QUndoCommand * = nullptr);
virtual ~ChangeConductorCommand();
private:
ChangeConductorCommand(const ChangeConductorCommand &);
@@ -320,7 +320,7 @@
class ResetConductorCommand : public QUndoCommand {
// constructors, destructor
public:
- ResetConductorCommand(const QHash<Conductor *, ConductorProfilesGroup> &, QUndoCommand * = 0);
+ ResetConductorCommand(const QHash<Conductor *, ConductorProfilesGroup> &, QUndoCommand * = nullptr);
virtual ~ResetConductorCommand();
private:
ResetConductorCommand(const ResetConductorCommand &);
@@ -343,7 +343,7 @@
class ChangeTitleBlockCommand : public QUndoCommand {
// constructors, destructor
public:
- ChangeTitleBlockCommand(Diagram *, const TitleBlockProperties &, const TitleBlockProperties &, QUndoCommand * = 0);
+ ChangeTitleBlockCommand(Diagram *, const TitleBlockProperties &, const TitleBlockProperties &, QUndoCommand * = nullptr);
virtual ~ChangeTitleBlockCommand();
private:
ChangeTitleBlockCommand(const ChangeTitleBlockCommand &);
@@ -369,7 +369,7 @@
class ChangeBorderCommand : public QUndoCommand {
// constructors, destructor
public:
- ChangeBorderCommand(Diagram *, const BorderProperties &, const BorderProperties &, QUndoCommand * = 0);
+ ChangeBorderCommand(Diagram *, const BorderProperties &, const BorderProperties &, QUndoCommand * = nullptr);
virtual ~ChangeBorderCommand();
private:
ChangeBorderCommand(const ChangeBorderCommand &);
Modified: trunk/sources/diagramcontextwidget.h
===================================================================
--- trunk/sources/diagramcontextwidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/diagramcontextwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -29,7 +29,7 @@
Q_OBJECT
// Constructor, destructor
public:
- DiagramContextWidget(QWidget *parent = 0);
+ DiagramContextWidget(QWidget *parent = nullptr);
virtual ~DiagramContextWidget();
private:
DiagramContextWidget(const DiagramContextWidget &);
Modified: trunk/sources/diagramevent/diagrameventaddelement.cpp
===================================================================
--- trunk/sources/diagramevent/diagrameventaddelement.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/diagramevent/diagrameventaddelement.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -180,7 +180,7 @@
int state;
ElementsLocation loc(m_integrate_path);
- m_element = ElementFactory::Instance() -> createElement(loc, 0, &state);
+ m_element = ElementFactory::Instance() -> createElement(loc, nullptr, &state);
//The creation of element failed, we delete it
if (state) {
delete m_element;
@@ -200,9 +200,9 @@
int state;
Element *element;
if (m_integrate_path.isEmpty())
- element = ElementFactory::Instance() -> createElement(m_location, 0, &state);
+ element = ElementFactory::Instance() -> createElement(m_location, nullptr, &state);
else
- element = ElementFactory::Instance() -> createElement(ElementsLocation(m_integrate_path), 0, &state);
+ element = ElementFactory::Instance() -> createElement(ElementsLocation(m_integrate_path), nullptr, &state);
//Build failed
if (state)
Modified: trunk/sources/diagramprintdialog.cpp
===================================================================
--- trunk/sources/diagramprintdialog.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/diagramprintdialog.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -34,7 +34,7 @@
DiagramPrintDialog::DiagramPrintDialog(QETProject *project, QWidget *parent) :
QWidget(parent),
project_(project),
- dialog_(0)
+ dialog_(nullptr)
{
// initialise l'imprimante
printer_ = new QPrinter();
Modified: trunk/sources/diagramprintdialog.h
===================================================================
--- trunk/sources/diagramprintdialog.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/diagramprintdialog.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -36,7 +36,7 @@
Q_OBJECT
// Constructors, destructor
public:
- DiagramPrintDialog(QETProject *, QWidget * = 0);
+ DiagramPrintDialog(QETProject *, QWidget * = nullptr);
virtual ~DiagramPrintDialog();
private:
DiagramPrintDialog(const DiagramPrintDialog &);
@@ -63,7 +63,7 @@
private slots:
void print(const QList<Diagram *> &, bool, const ExportProperties);
- void printDiagram(Diagram *, bool, const ExportProperties &, QPainter *, QPrinter * = 0);
+ void printDiagram(Diagram *, bool, const ExportProperties &, QPainter *, QPrinter * = nullptr);
void updatePrintTypeDialog();
void acceptPrintTypeDialog();
void browseFilePrintTypeDialog();
Modified: trunk/sources/diagramschooser.cpp
===================================================================
--- trunk/sources/diagramschooser.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/diagramschooser.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -27,8 +27,8 @@
DiagramsChooser::DiagramsChooser(QETProject *project, QWidget *parent) :
QScrollArea(parent),
project_(project),
- widget0_(0),
- vlayout0_(0)
+ widget0_(nullptr),
+ vlayout0_(nullptr)
{
setFrameShadow(QFrame::Sunken);
setFrameShape(QFrame::StyledPanel);
Modified: trunk/sources/diagramschooser.h
===================================================================
--- trunk/sources/diagramschooser.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/diagramschooser.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -29,7 +29,7 @@
// constructors, destructor
public:
- DiagramsChooser(QETProject *, QWidget * = 0);
+ DiagramsChooser(QETProject *, QWidget * = nullptr);
virtual ~DiagramsChooser();
private:
DiagramsChooser(const DiagramsChooser &);
Modified: trunk/sources/diagramview.h
===================================================================
--- trunk/sources/diagramview.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/diagramview.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -41,7 +41,7 @@
// constructors, destructor
public:
- DiagramView(Diagram *diagram, QWidget * = 0);
+ DiagramView(Diagram *diagram, QWidget * = nullptr);
virtual ~DiagramView();
private:
Modified: trunk/sources/editor/arceditor.cpp
===================================================================
--- trunk/sources/editor/arceditor.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/arceditor.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -93,8 +93,8 @@
disconnect(part, &PartArc::spanAngleChanged, this, &ArcEditor::updateForm);
disconnect(part, &PartArc::startAngleChanged, this, &ArcEditor::updateForm);
}
- part = 0;
- style_ -> setPart(0);
+ part = nullptr;
+ style_ -> setPart(nullptr);
return(true);
}
Modified: trunk/sources/editor/arceditor.h
===================================================================
--- trunk/sources/editor/arceditor.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/arceditor.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -34,7 +34,7 @@
// constructors, destructor
public:
- ArcEditor(QETElementEditor *, PartArc * = 0, QWidget * = 0);
+ ArcEditor(QETElementEditor *, PartArc * = nullptr, QWidget * = nullptr);
virtual ~ArcEditor();
private:
ArcEditor(const ArcEditor &);
Modified: trunk/sources/editor/editorcommands.cpp
===================================================================
--- trunk/sources/editor/editorcommands.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/editorcommands.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -86,7 +86,7 @@
const QList<QGraphicsItem *> parts,
QUndoCommand *parent
) :
- ElementEditionCommand(QObject::tr("suppression", "undo caption"), scene, 0, parent),
+ ElementEditionCommand(QObject::tr("suppression", "undo caption"), scene, nullptr, parent),
deleted_parts(parts)
{
foreach(QGraphicsItem *qgi, deleted_parts) {
@@ -131,7 +131,7 @@
const ElementContent &c,
QUndoCommand *parent
) :
- ElementEditionCommand(view ? view -> scene() : 0, view, parent),
+ ElementEditionCommand(view ? view -> scene() : nullptr, view, parent),
content_(c),
uses_offset(false),
first_redo(true)
@@ -227,7 +227,7 @@
const QList<QGraphicsItem *> parts,
QUndoCommand *parent
) :
- ElementEditionCommand(QObject::tr("déplacement", "undo caption"), scene, 0, parent),
+ ElementEditionCommand(QObject::tr("déplacement", "undo caption"), scene, nullptr, parent),
movement(m),
first_redo(true)
{
@@ -267,7 +267,7 @@
QGraphicsItem *p,
QUndoCommand *parent
) :
- ElementEditionCommand(QString(QObject::tr("ajout %1", "undo caption")).arg(name), scene, 0, parent),
+ ElementEditionCommand(QString(QObject::tr("ajout %1", "undo caption")).arg(name), scene, nullptr, parent),
part(p),
first_redo(true)
{
@@ -315,7 +315,7 @@
const NamesList &after,
QUndoCommand *parent
) :
- ElementEditionCommand(QObject::tr("modification noms", "undo caption"), element_scene, 0, parent),
+ ElementEditionCommand(QObject::tr("modification noms", "undo caption"), element_scene, nullptr, parent),
names_before(before),
names_after(after)
{
@@ -346,7 +346,7 @@
ChangeZValueCommand::Option o,
QUndoCommand *parent
) :
- ElementEditionCommand(elmt, 0, parent),
+ ElementEditionCommand(elmt, nullptr, parent),
option(o)
{
// retrieve all primitives but terminals
@@ -466,7 +466,7 @@
@param parent QUndoCommand parent
*/
ChangeInformationsCommand::ChangeInformationsCommand(ElementScene *elmt, const QString &old_infos, const QString &new_infos, QUndoCommand *parent) :
- ElementEditionCommand(QObject::tr("modification informations complementaires", "undo caption"), elmt, 0, parent),
+ ElementEditionCommand(QObject::tr("modification informations complementaires", "undo caption"), elmt, nullptr, parent),
old_informations_(old_infos),
new_informations_(new_infos)
{
@@ -492,7 +492,7 @@
@param parent Parent QUndoCommand
*/
ScalePartsCommand::ScalePartsCommand(ElementScene *scene, QUndoCommand * parent) :
- ElementEditionCommand(scene, 0, parent),
+ ElementEditionCommand(scene, nullptr, parent),
first_redo(true)
{}
@@ -594,7 +594,7 @@
* @param parent: parent undo
*/
ChangePropertiesCommand::ChangePropertiesCommand(ElementScene *scene, QString type, DiagramContext info, QUndoCommand *parent) :
- ElementEditionCommand(scene, 0, parent)
+ ElementEditionCommand(scene, nullptr, parent)
{
m_type << scene->m_elmt_type << type;
m_info << scene->m_elmt_kindInfo << info;
Modified: trunk/sources/editor/editorcommands.h
===================================================================
--- trunk/sources/editor/editorcommands.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/editorcommands.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -33,8 +33,8 @@
{
// constructors, destructor
public:
- ElementEditionCommand(ElementScene * = 0, ElementView * = 0, QUndoCommand * = 0);
- ElementEditionCommand(const QString &, ElementScene * = 0, ElementView * = 0, QUndoCommand * = 0);
+ ElementEditionCommand(ElementScene * = nullptr, ElementView * = nullptr, QUndoCommand * = nullptr);
+ ElementEditionCommand(const QString &, ElementScene * = nullptr, ElementView * = nullptr, QUndoCommand * = nullptr);
virtual ~ElementEditionCommand();
private:
ElementEditionCommand(const ElementEditionCommand &);
@@ -60,7 +60,7 @@
class DeletePartsCommand : public ElementEditionCommand {
// constructors, destructor
public:
- DeletePartsCommand(ElementScene *, const QList<QGraphicsItem *>, QUndoCommand * = 0);
+ DeletePartsCommand(ElementScene *, const QList<QGraphicsItem *>, QUndoCommand * = nullptr);
virtual ~DeletePartsCommand();
private:
DeletePartsCommand(const DeletePartsCommand &);
@@ -82,7 +82,7 @@
class PastePartsCommand : public ElementEditionCommand {
// constructors, destructor
public:
- PastePartsCommand(ElementView *, const ElementContent &, QUndoCommand * = 0);
+ PastePartsCommand(ElementView *, const ElementContent &, QUndoCommand * = nullptr);
virtual ~PastePartsCommand();
private:
PastePartsCommand(const PastePartsCommand &);
@@ -113,7 +113,7 @@
class CutPartsCommand : public DeletePartsCommand {
// constructors, destructor
public:
- CutPartsCommand(ElementScene *, const QList<QGraphicsItem *>, QUndoCommand * = 0);
+ CutPartsCommand(ElementScene *, const QList<QGraphicsItem *>, QUndoCommand * = nullptr);
virtual ~CutPartsCommand();
private:
CutPartsCommand(const CutPartsCommand &);
@@ -125,7 +125,7 @@
class MovePartsCommand : public ElementEditionCommand {
// constructors, destructor
public:
- MovePartsCommand(const QPointF &, ElementScene *, const QList<QGraphicsItem *>, QUndoCommand * = 0);
+ MovePartsCommand(const QPointF &, ElementScene *, const QList<QGraphicsItem *>, QUndoCommand * = nullptr);
virtual ~MovePartsCommand();
private:
MovePartsCommand(const MovePartsCommand &);
@@ -151,7 +151,7 @@
class AddPartCommand : public ElementEditionCommand {
// constructors, destructor
public:
- AddPartCommand(const QString &, ElementScene *, QGraphicsItem *, QUndoCommand * = 0);
+ AddPartCommand(const QString &, ElementScene *, QGraphicsItem *, QUndoCommand * = nullptr);
virtual ~AddPartCommand();
private:
AddPartCommand(const AddPartCommand &);
@@ -175,7 +175,7 @@
class ChangeNamesCommand : public ElementEditionCommand {
// constructors, destructor
public:
- ChangeNamesCommand(ElementScene *, const NamesList &, const NamesList &, QUndoCommand * = 0);
+ ChangeNamesCommand(ElementScene *, const NamesList &, const NamesList &, QUndoCommand * = nullptr);
virtual ~ChangeNamesCommand();
private:
ChangeNamesCommand(const ChangeNamesCommand &);
@@ -207,7 +207,7 @@
Lower, ///< Send primitives one layer below their current one; zValues are decremented
SendBackward ///< Send primitives to the background so they have the lowest zValue
};
- ChangeZValueCommand(ElementScene *, Option, QUndoCommand * = 0);
+ ChangeZValueCommand(ElementScene *, Option, QUndoCommand * = nullptr);
virtual ~ChangeZValueCommand();
private:
ChangeZValueCommand(const ChangeZValueCommand &);
@@ -239,7 +239,7 @@
class ChangeInformationsCommand : public ElementEditionCommand {
// constructors, destructor
public:
- ChangeInformationsCommand(ElementScene *, const QString &, const QString &, QUndoCommand * = 0);
+ ChangeInformationsCommand(ElementScene *, const QString &, const QString &, QUndoCommand * = nullptr);
virtual ~ChangeInformationsCommand();
private:
ChangeInformationsCommand(const ChangeInformationsCommand &);
@@ -263,7 +263,7 @@
class ScalePartsCommand : public ElementEditionCommand {
// constructors, destructor
public:
- ScalePartsCommand(ElementScene * = 0, QUndoCommand * = 0);
+ ScalePartsCommand(ElementScene * = nullptr, QUndoCommand * = nullptr);
virtual ~ScalePartsCommand();
private:
ScalePartsCommand(const ScalePartsCommand &);
@@ -296,7 +296,7 @@
class ChangePropertiesCommand : public ElementEditionCommand {
public:
- ChangePropertiesCommand (ElementScene *scene, QString type, DiagramContext info, QUndoCommand *parent=0);
+ ChangePropertiesCommand (ElementScene *scene, QString type, DiagramContext info, QUndoCommand *parent=nullptr);
virtual ~ChangePropertiesCommand ();
virtual void undo();
Modified: trunk/sources/editor/elementitemeditor.cpp
===================================================================
--- trunk/sources/editor/elementitemeditor.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/elementitemeditor.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -61,5 +61,5 @@
@see setPart
*/
void ElementItemEditor::detach() {
- setPart(0);
+ setPart(nullptr);
}
Modified: trunk/sources/editor/elementitemeditor.h
===================================================================
--- trunk/sources/editor/elementitemeditor.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/elementitemeditor.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -35,7 +35,7 @@
Q_OBJECT
// constructors, destructor
public:
- ElementItemEditor(QETElementEditor *, QWidget * = 0);
+ ElementItemEditor(QETElementEditor *, QWidget * = nullptr);
virtual ~ElementItemEditor() {};
private:
ElementItemEditor(const ElementItemEditor &);
Modified: trunk/sources/editor/elementprimitivedecorator.cpp
===================================================================
--- trunk/sources/editor/elementprimitivedecorator.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/elementprimitivedecorator.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -222,7 +222,7 @@
{
Q_UNUSED(event)
- ElementEditionCommand *command = 0;
+ ElementEditionCommand *command = nullptr;
if (current_operation_square_ == QET::MoveArea)
{
@@ -229,7 +229,7 @@
QPointF movement = mapToScene(modified_bounding_rect_.topLeft()) - mapToScene(original_bounding_rect_.topLeft());
if (!movement.isNull())
{
- MovePartsCommand *move_command = new MovePartsCommand(movement, 0, graphicsItems());
+ MovePartsCommand *move_command = new MovePartsCommand(movement, nullptr, graphicsItems());
command = move_command;
}
@@ -282,7 +282,7 @@
moving_by_keys_ && !e -> isAutoRepeat()
) {
// cree un objet d'annulation pour le mouvement qui vient de se finir
- emit(actionFinished(new MovePartsCommand(keys_movement_, 0, graphicsItems())));
+ emit(actionFinished(new MovePartsCommand(keys_movement_, nullptr, graphicsItems())));
keys_movement_ = QPointF();
moving_by_keys_ = false;
}
@@ -378,7 +378,7 @@
if (decorated_items_.count() == 1) {
return(decorated_items_.first());
}
- return(0);
+ return(nullptr);
}
/**
@@ -538,7 +538,7 @@
Q_UNUSED(qghi);
Q_UNUSED(event);
- ElementEditionCommand *command = 0;
+ ElementEditionCommand *command = nullptr;
if (current_operation_square_ > QET::NoOperation)
{
ScalePartsCommand *scale_command = new ScalePartsCommand();
Modified: trunk/sources/editor/elementprimitivedecorator.h
===================================================================
--- trunk/sources/editor/elementprimitivedecorator.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/elementprimitivedecorator.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -42,7 +42,7 @@
Q_OBJECT
public:
- ElementPrimitiveDecorator(QGraphicsItem * = 0);
+ ElementPrimitiveDecorator(QGraphicsItem * = nullptr);
virtual ~ElementPrimitiveDecorator();
enum { Type = UserType + 2200 };
@@ -50,7 +50,7 @@
// methods
QRectF internalBoundingRect() const;
virtual QRectF boundingRect () const;
- virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0);
+ virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr);
virtual int type() const { return Type; }
void setItems(const QList<QGraphicsItem *> &);
void setItems(const QList<CustomElementPart *> &);
Modified: trunk/sources/editor/elementscene.h
===================================================================
--- trunk/sources/editor/elementscene.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/elementscene.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -55,7 +55,7 @@
// constructors, destructor
public:
- ElementScene(QETElementEditor *, QObject * = 0);
+ ElementScene(QETElementEditor *, QObject * = nullptr);
virtual ~ElementScene();
private:
@@ -113,7 +113,7 @@
virtual void setGrid(int, int);
virtual const QDomDocument toXml(bool = true);
virtual QRectF boundingRectFromXml(const QDomDocument &);
- virtual void fromXml(const QDomDocument &, const QPointF & = QPointF(), bool = true, ElementContent * = 0);
+ virtual void fromXml(const QDomDocument &, const QPointF & = QPointF(), bool = true, ElementContent * = nullptr);
virtual void reset();
virtual QList<CustomElementPart *> primitives() const;
virtual QList<QGraphicsItem *> zItems(ItemOptions options = ItemOptions(SortByZValue | IncludeTerminals | SelectedOrNot)) const;
@@ -141,10 +141,10 @@
private:
QRectF elementContentBoundingRect(const ElementContent &) const;
- bool applyInformations(const QDomDocument &, QString * = 0);
- ElementContent loadContent(const QDomDocument &, QString * = 0);
- ElementContent addContent(const ElementContent &, QString * = 0);
- ElementContent addContentAtPos(const ElementContent &, const QPointF &, QString * = 0);
+ bool applyInformations(const QDomDocument &, QString * = nullptr);
+ ElementContent loadContent(const QDomDocument &, QString * = nullptr);
+ ElementContent addContent(const ElementContent &, QString * = nullptr);
+ ElementContent addContentAtPos(const ElementContent &, const QPointF &, QString * = nullptr);
void addPrimitive(QGraphicsItem *);
void initPasteArea();
static bool zValueLessThan(QGraphicsItem *, QGraphicsItem *);
Modified: trunk/sources/editor/elementview.h
===================================================================
--- trunk/sources/editor/elementview.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/elementview.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -30,7 +30,7 @@
// constructors, destructor
public:
- ElementView(ElementScene *, QWidget * = 0);
+ ElementView(ElementScene *, QWidget * = nullptr);
virtual ~ElementView();
private:
Modified: trunk/sources/editor/ellipseeditor.cpp
===================================================================
--- trunk/sources/editor/ellipseeditor.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/ellipseeditor.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -83,8 +83,8 @@
{
if (part)
disconnect(part, &PartEllipse::rectChanged, this, &EllipseEditor::updateForm);
- part = 0;
- style_ -> setPart(0);
+ part = nullptr;
+ style_ -> setPart(nullptr);
return(true);
}
if (PartEllipse *part_ellipse = dynamic_cast<PartEllipse *>(new_part))
Modified: trunk/sources/editor/ellipseeditor.h
===================================================================
--- trunk/sources/editor/ellipseeditor.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/ellipseeditor.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -33,7 +33,7 @@
// constructors, destructor
public:
- EllipseEditor(QETElementEditor *, PartEllipse * = 0, QWidget * = 0);
+ EllipseEditor(QETElementEditor *, PartEllipse * = nullptr, QWidget * = nullptr);
virtual ~EllipseEditor();
private:
EllipseEditor(const EllipseEditor &);
Modified: trunk/sources/editor/graphicspart/abstractpartellipse.h
===================================================================
--- trunk/sources/editor/graphicspart/abstractpartellipse.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/graphicspart/abstractpartellipse.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -41,7 +41,7 @@
// constructors, destructor
public:
- AbstractPartEllipse(QETElementEditor *editor, QGraphicsItem * parent = 0);
+ AbstractPartEllipse(QETElementEditor *editor, QGraphicsItem * parent = nullptr);
virtual ~AbstractPartEllipse();
private:
Modified: trunk/sources/editor/graphicspart/customelementgraphicpart.h
===================================================================
--- trunk/sources/editor/graphicspart/customelementgraphicpart.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/graphicspart/customelementgraphicpart.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -64,7 +64,7 @@
// constructors, destructor
public:
- CustomElementGraphicPart(QETElementEditor *editor, QGraphicsItem *parent = 0);
+ CustomElementGraphicPart(QETElementEditor *editor, QGraphicsItem *parent = nullptr);
virtual ~CustomElementGraphicPart();
static void drawCross (const QPointF ¢er, QPainter *painter);
Modified: trunk/sources/editor/graphicspart/partarc.h
===================================================================
--- trunk/sources/editor/graphicspart/partarc.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/graphicspart/partarc.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -33,7 +33,7 @@
Q_OBJECT
public:
- PartArc(QETElementEditor *editor, QGraphicsItem *parent = 0);
+ PartArc(QETElementEditor *editor, QGraphicsItem *parent = nullptr);
virtual ~PartArc();
private:
@@ -46,7 +46,7 @@
* @return the QGraphicsItem type
*/
virtual int type() const { return Type; }
- virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0);
+ virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr);
//Name and XML
virtual QString name() const { return(QObject::tr("arc", "element part name")); }
Modified: trunk/sources/editor/graphicspart/partellipse.h
===================================================================
--- trunk/sources/editor/graphicspart/partellipse.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/graphicspart/partellipse.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -33,7 +33,7 @@
// constructors, destructor
public:
- PartEllipse(QETElementEditor *editor, QGraphicsItem * parent = 0);
+ PartEllipse(QETElementEditor *editor, QGraphicsItem * parent = nullptr);
virtual ~PartEllipse();
private:
@@ -47,7 +47,7 @@
* @return the QGraphicsItem type
*/
virtual int type() const { return Type; }
- virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0);
+ virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr);
//Name and XML
virtual QString name() const { return(QObject::tr("ellipse", "element part name")); }
Modified: trunk/sources/editor/graphicspart/partline.h
===================================================================
--- trunk/sources/editor/graphicspart/partline.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/graphicspart/partline.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -45,7 +45,7 @@
// constructors, destructor
public:
- PartLine(QETElementEditor *, QGraphicsItem * = 0);
+ PartLine(QETElementEditor *, QGraphicsItem * = nullptr);
virtual ~PartLine();
private:
PartLine(const PartLine &);
@@ -67,7 +67,7 @@
* @return the QGraphicsItem type
*/
virtual int type() const { return Type; }
- virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0);
+ virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr);
virtual QString name() const { return(QObject::tr("ligne", "element part name")); }
virtual QString xmlName() const { return(QString("line")); }
virtual const QDomElement toXml(QDomDocument &) const;
Modified: trunk/sources/editor/graphicspart/partpolygon.h
===================================================================
--- trunk/sources/editor/graphicspart/partpolygon.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/graphicspart/partpolygon.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -38,7 +38,7 @@
// constructors, destructor
public:
- PartPolygon(QETElementEditor *editor, QGraphicsItem *parent = 0);
+ PartPolygon(QETElementEditor *editor, QGraphicsItem *parent = nullptr);
virtual ~PartPolygon();
private:
Modified: trunk/sources/editor/graphicspart/partrectangle.h
===================================================================
--- trunk/sources/editor/graphicspart/partrectangle.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/graphicspart/partrectangle.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -36,7 +36,7 @@
// constructors, destructor
public:
- PartRectangle(QETElementEditor *, QGraphicsItem *parent = 0);
+ PartRectangle(QETElementEditor *, QGraphicsItem *parent = nullptr);
virtual ~PartRectangle();
private:
@@ -53,7 +53,7 @@
* @return the QGraphicsItem type
*/
virtual int type () const { return Type; }
- virtual void paint (QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0);
+ virtual void paint (QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr);
virtual QString name () const { return(QObject::tr("rectangle", "element part name")); }
virtual QString xmlName () const { return(QString("rect")); }
Modified: trunk/sources/editor/graphicspart/partterminal.h
===================================================================
--- trunk/sources/editor/graphicspart/partterminal.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/graphicspart/partterminal.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -35,7 +35,7 @@
public:
// constructors, destructor
- PartTerminal(QETElementEditor *editor, QGraphicsItem *parent = 0);
+ PartTerminal(QETElementEditor *editor, QGraphicsItem *parent = nullptr);
virtual ~PartTerminal();
private:
PartTerminal(const PartTerminal &);
Modified: trunk/sources/editor/graphicspart/parttext.h
===================================================================
--- trunk/sources/editor/graphicspart/parttext.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/graphicspart/parttext.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -31,7 +31,7 @@
// constructors, destructor
public:
- PartText(QETElementEditor *, QGraphicsItem * = 0);
+ PartText(QETElementEditor *, QGraphicsItem * = nullptr);
virtual ~PartText();
private:
Modified: trunk/sources/editor/graphicspart/parttextfield.h
===================================================================
--- trunk/sources/editor/graphicspart/parttextfield.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/graphicspart/parttextfield.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -35,7 +35,7 @@
// constructors, destructor
public:
- PartTextField(QETElementEditor *, QGraphicsItem * = 0);
+ PartTextField(QETElementEditor *, QGraphicsItem * = nullptr);
virtual ~PartTextField();
private:
Modified: trunk/sources/editor/lineeditor.cpp
===================================================================
--- trunk/sources/editor/lineeditor.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/lineeditor.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -110,8 +110,8 @@
disconnect(part, &PartLine::firstEndLengthChanged, this, &LineEditor::updateForm);
disconnect(part, &PartLine::secondEndLengthChanged, this, &LineEditor::updateForm);
}
- part = 0;
- style_ -> setPart(0);
+ part = nullptr;
+ style_ -> setPart(nullptr);
return(true);
}
if (PartLine *part_line = dynamic_cast<PartLine *>(new_part))
Modified: trunk/sources/editor/lineeditor.h
===================================================================
--- trunk/sources/editor/lineeditor.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/lineeditor.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -33,7 +33,7 @@
Q_OBJECT
// constructors, destructor
public:
- LineEditor(QETElementEditor *, PartLine * = 0, QWidget * = 0);
+ LineEditor(QETElementEditor *, PartLine * = nullptr, QWidget * = nullptr);
virtual ~LineEditor();
private:
LineEditor(const LineEditor &);
Modified: trunk/sources/editor/polygoneditor.cpp
===================================================================
--- trunk/sources/editor/polygoneditor.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/polygoneditor.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -130,8 +130,8 @@
disconnect(part, &PartPolygon::polygonChanged, this, &PolygonEditor::updateForm);
disconnect(part, &PartPolygon::closedChange, this, &PolygonEditor::updateForm);
}
- part = 0;
- style_ -> setPart(0);
+ part = nullptr;
+ style_ -> setPart(nullptr);
return(true);
}
if (PartPolygon *part_polygon = dynamic_cast<PartPolygon *>(new_part))
Modified: trunk/sources/editor/polygoneditor.h
===================================================================
--- trunk/sources/editor/polygoneditor.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/polygoneditor.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -35,7 +35,7 @@
// constructors, destructor
public:
- PolygonEditor(QETElementEditor *, PartPolygon * = 0, QWidget * = 0);
+ PolygonEditor(QETElementEditor *, PartPolygon * = nullptr, QWidget * = nullptr);
virtual ~PolygonEditor();
private:
Modified: trunk/sources/editor/qetelementeditor.cpp
===================================================================
--- trunk/sources/editor/qetelementeditor.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/qetelementeditor.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -1267,11 +1267,11 @@
*/
QWidget *QETElementEditor::clearToolsDock() {
if (QWidget *previous_widget = tools_dock_scroll_area_ -> takeWidget()) {
- previous_widget -> setParent(0);
+ previous_widget -> setParent(nullptr);
previous_widget -> hide();
return(previous_widget);
}
- return(0);
+ return(nullptr);
}
/**
Modified: trunk/sources/editor/qetelementeditor.h
===================================================================
--- trunk/sources/editor/qetelementeditor.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/qetelementeditor.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -36,7 +36,7 @@
// constructor, destructor
public:
- QETElementEditor(QWidget * = 0);
+ QETElementEditor(QWidget * = nullptr);
virtual ~QETElementEditor();
private:
QETElementEditor(const QETElementEditor &);
@@ -109,7 +109,7 @@
void readSettings();
void writeSettings();
static QPointF pasteOffset();
- static QString getOpenElementFileName(QWidget * = 0, const QString & = QString());
+ static QString getOpenElementFileName(QWidget * = nullptr, const QString & = QString());
void contextMenu(QPoint p);
signals:
Modified: trunk/sources/editor/rectangleeditor.cpp
===================================================================
--- trunk/sources/editor/rectangleeditor.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/rectangleeditor.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -82,8 +82,8 @@
{
if (part)
disconnect(part, &PartRectangle::rectChanged, this, &RectangleEditor::updateForm);
- part = 0;
- style_ -> setPart(0);
+ part = nullptr;
+ style_ -> setPart(nullptr);
return(true);
}
Modified: trunk/sources/editor/rectangleeditor.h
===================================================================
--- trunk/sources/editor/rectangleeditor.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/rectangleeditor.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -33,7 +33,7 @@
// constructors, destructor
public:
- RectangleEditor(QETElementEditor *, PartRectangle * = 0, QWidget * = 0);
+ RectangleEditor(QETElementEditor *, PartRectangle * = nullptr, QWidget * = nullptr);
virtual ~RectangleEditor();
private:
RectangleEditor(const RectangleEditor &);
Modified: trunk/sources/editor/styleeditor.h
===================================================================
--- trunk/sources/editor/styleeditor.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/styleeditor.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -36,7 +36,7 @@
Q_OBJECT
// constructors, destructor
public:
- StyleEditor(QETElementEditor *, CustomElementGraphicPart * = 0, QWidget * = 0);
+ StyleEditor(QETElementEditor *, CustomElementGraphicPart * = nullptr, QWidget * = nullptr);
virtual ~StyleEditor();
private:
Modified: trunk/sources/editor/terminaleditor.cpp
===================================================================
--- trunk/sources/editor/terminaleditor.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/terminaleditor.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -88,7 +88,7 @@
{
if (part)
disconnect(part, &PartTerminal::orientationChanged, this, &TerminalEditor::updateForm);
- part = 0;
+ part = nullptr;
return(true);
}
if (PartTerminal *part_terminal = dynamic_cast<PartTerminal *>(new_part))
Modified: trunk/sources/editor/terminaleditor.h
===================================================================
--- trunk/sources/editor/terminaleditor.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/terminaleditor.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -31,7 +31,7 @@
Q_OBJECT
// Constructors, destructor
public:
- TerminalEditor(QETElementEditor *, PartTerminal * = 0, QWidget * = 0);
+ TerminalEditor(QETElementEditor *, PartTerminal * = nullptr, QWidget * = nullptr);
virtual ~TerminalEditor();
private:
TerminalEditor(const TerminalEditor &);
Modified: trunk/sources/editor/texteditor.cpp
===================================================================
--- trunk/sources/editor/texteditor.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/texteditor.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -107,7 +107,7 @@
{
if (!new_part)
{
- part = 0;
+ part = nullptr;
return(true);
}
if (PartText *part_text = dynamic_cast<PartText *>(new_part))
Modified: trunk/sources/editor/texteditor.h
===================================================================
--- trunk/sources/editor/texteditor.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/texteditor.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -38,7 +38,7 @@
// Constructors, destructor
public:
- TextEditor(QETElementEditor *, PartText * = 0, QWidget * = 0);
+ TextEditor(QETElementEditor *, PartText * = nullptr, QWidget * = nullptr);
virtual ~TextEditor();
private:
TextEditor(const TextEditor &);
Modified: trunk/sources/editor/textfieldeditor.cpp
===================================================================
--- trunk/sources/editor/textfieldeditor.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/textfieldeditor.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -106,7 +106,7 @@
{
if (!new_part)
{
- part = 0;
+ part = nullptr;
return(true);
}
if (PartTextField *part_textfield = dynamic_cast<PartTextField *>(new_part))
Modified: trunk/sources/editor/textfieldeditor.h
===================================================================
--- trunk/sources/editor/textfieldeditor.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/textfieldeditor.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -37,7 +37,7 @@
// Constructors, destructor
public:
- TextFieldEditor(QETElementEditor *, PartTextField * = 0, QWidget * = 0);
+ TextFieldEditor(QETElementEditor *, PartTextField * = nullptr, QWidget * = nullptr);
virtual ~TextFieldEditor();
private:
TextFieldEditor(const TextFieldEditor &);
Modified: trunk/sources/editor/ui/elementpropertieseditorwidget.h
===================================================================
--- trunk/sources/editor/ui/elementpropertieseditorwidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/editor/ui/elementpropertieseditorwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -37,7 +37,7 @@
//METHODS
public:
- explicit ElementPropertiesEditorWidget(QString &basic_type, DiagramContext &dc, QWidget *parent = 0);
+ explicit ElementPropertiesEditorWidget(QString &basic_type, DiagramContext &dc, QWidget *parent = nullptr);
~ElementPropertiesEditorWidget();
void upDateInterface();
Modified: trunk/sources/elementprovider.h
===================================================================
--- trunk/sources/elementprovider.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/elementprovider.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -34,7 +34,7 @@
class ElementProvider
{
public:
- ElementProvider(QETProject *prj, Diagram *diagram=0);
+ ElementProvider(QETProject *prj, Diagram *diagram=nullptr);
ElementProvider(Diagram *diag);
QList <Element *> freeElement(const int filter) const;
QList <Element *> fromUuids(QList <QUuid>) const;
Modified: trunk/sources/elementscollectioncache.cpp
===================================================================
--- trunk/sources/elementscollectioncache.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/elementscollectioncache.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -208,7 +208,7 @@
*/
bool ElementsCollectionCache::fetchData(const ElementsLocation &location) {
int state;
- Element *custom_elmt = ElementFactory::Instance() -> createElement(location, 0, &state);
+ Element *custom_elmt = ElementFactory::Instance() -> createElement(location, nullptr, &state);
if (state) {
qDebug() << "ElementsCollectionCache::fetchData() : Le chargement du composant" << qPrintable(location.toString()) << "a echoue avec le code d'erreur" << state;
} else {
Modified: trunk/sources/elementscollectioncache.h
===================================================================
--- trunk/sources/elementscollectioncache.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/elementscollectioncache.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -31,7 +31,7 @@
{
public:
// constructor, destructor
- ElementsCollectionCache(const QString &database_path, QObject * = 0);
+ ElementsCollectionCache(const QString &database_path, QObject * = nullptr);
virtual ~ElementsCollectionCache();
// methods
Modified: trunk/sources/elementsmover.cpp
===================================================================
--- trunk/sources/elementsmover.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/elementsmover.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -32,8 +32,8 @@
ElementsMover::ElementsMover() :
movement_running_(false),
current_movement_(),
- diagram_(0),
- movement_driver_(0),
+ diagram_(nullptr),
+ movement_driver_(nullptr),
moved_content_()
{
Modified: trunk/sources/elementsmover.h
===================================================================
--- trunk/sources/elementsmover.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/elementsmover.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -46,7 +46,7 @@
// methods
public:
bool isReady() const;
- int beginMovement(Diagram *, QGraphicsItem * = 0);
+ int beginMovement(Diagram *, QGraphicsItem * = nullptr);
void continueMovement(const QPointF &);
void endMovement();
Modified: trunk/sources/elementspanel.cpp
===================================================================
--- trunk/sources/elementspanel.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/elementspanel.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -127,7 +127,7 @@
bool first_add = (first_reload_ || !projects_to_display_.contains(project));
// create the QTreeWidgetItem representing the project
- QTreeWidgetItem *qtwi_project = GenericPanel::addProject(project, 0, GenericPanel::All);
+ QTreeWidgetItem *qtwi_project = GenericPanel::addProject(project, nullptr, GenericPanel::All);
// the project will be inserted right before the common tb templates collection
invisibleRootItem() -> insertChild(
indexOfTopLevelItem(common_tbt_collection_item_),
Modified: trunk/sources/elementspanel.h
===================================================================
--- trunk/sources/elementspanel.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/elementspanel.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -36,7 +36,7 @@
// constructors, destructor
public:
- ElementsPanel(QWidget * = 0);
+ ElementsPanel(QWidget * = nullptr);
virtual ~ElementsPanel();
private:
Modified: trunk/sources/elementspanelwidget.h
===================================================================
--- trunk/sources/elementspanelwidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/elementspanelwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -30,7 +30,7 @@
// constructors, destructor
public:
- ElementsPanelWidget(QWidget * = 0);
+ ElementsPanelWidget(QWidget * = nullptr);
virtual ~ElementsPanelWidget();
private:
Modified: trunk/sources/exportdialog.h
===================================================================
--- trunk/sources/exportdialog.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/exportdialog.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -32,7 +32,7 @@
// constructors, destructor
public:
- ExportDialog(QETProject *, QWidget * = 0);
+ ExportDialog(QETProject *, QWidget * = nullptr);
virtual ~ExportDialog();
private:
Modified: trunk/sources/exportpropertieswidget.h
===================================================================
--- trunk/sources/exportpropertieswidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/exportpropertieswidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -28,8 +28,8 @@
Q_OBJECT
// constructors, destructor
public:
- ExportPropertiesWidget(QWidget * = 0);
- ExportPropertiesWidget(const ExportProperties &, QWidget * = 0);
+ ExportPropertiesWidget(QWidget * = nullptr);
+ ExportPropertiesWidget(const ExportProperties &, QWidget * = nullptr);
virtual ~ExportPropertiesWidget();
private:
ExportPropertiesWidget(const ExportPropertiesWidget &);
Modified: trunk/sources/factory/elementfactory.h
===================================================================
--- trunk/sources/factory/elementfactory.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/factory/elementfactory.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -52,7 +52,7 @@
if (factory_) {
mutex.lock();
delete factory_;
- factory_ = 0;
+ factory_ = nullptr;
mutex.unlock();
}
}
@@ -69,7 +69,7 @@
~ElementFactory() {}
public:
- Element *createElement (const ElementsLocation &, QGraphicsItem * = 0, int * = 0);
+ Element *createElement (const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr);
};
//ElementFactory ElementFactory::factory_ = 0;
#endif // ELEMENTFACTORY_H
Modified: trunk/sources/genericpanel.cpp
===================================================================
--- trunk/sources/genericpanel.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/genericpanel.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -55,7 +55,7 @@
if (item && item -> type() == QET::Project) {
return(valueForItem<QETProject *>(item));
}
- return(0);
+ return(nullptr);
}
@@ -66,7 +66,7 @@
if (item && item -> type() == QET::Diagram) {
return(valueForItem<Diagram *>(item));
}
- return(0);
+ return(nullptr);
}
/**
@@ -104,7 +104,7 @@
*/
QTreeWidgetItem *GenericPanel::addProject(QETProject *project, QTreeWidgetItem *parent_item, PanelOptions options) {
- if (!project) return(0);
+ if (!project) return(nullptr);
bool creation_required;
QTreeWidgetItem *project_qtwi = getItemForProject(project, &creation_required);
@@ -121,8 +121,8 @@
project does not appear within this panel.
*/
QTreeWidgetItem *GenericPanel::itemForProject(QETProject *project) {
- if (!project) return(0);
- return(projects_.value(project, 0));
+ if (!project) return(nullptr);
+ return(projects_.value(project, nullptr));
}
/**
@@ -134,9 +134,9 @@
appear within this panel, it is created.
*/
QTreeWidgetItem *GenericPanel::getItemForProject(QETProject *project, bool *created) {
- if (!project) return(0);
+ if (!project) return(nullptr);
- QTreeWidgetItem *project_qtwi = projects_.value(project, 0);
+ QTreeWidgetItem *project_qtwi = projects_.value(project, nullptr);
if (project_qtwi) {
if (created) *created = false;
return(project_qtwi);
@@ -152,7 +152,7 @@
*/
QTreeWidgetItem *GenericPanel::updateProjectItem(QTreeWidgetItem *project_qtwi, QETProject *project, PanelOptions options, bool freshly_created) {
Q_UNUSED(options)
- if (!project_qtwi || !project) return(0);
+ if (!project_qtwi || !project) return(nullptr);
if (freshly_created) {
project_qtwi -> setData(0, GenericPanel::Item, qVariantFromValue(project));
@@ -188,7 +188,7 @@
*/
QTreeWidgetItem *GenericPanel::fillProjectItem(QTreeWidgetItem *project_qtwi, QETProject *project, PanelOptions options, bool freshly_created) {
- if (!project_qtwi || !project) return(0);
+ if (!project_qtwi || !project) return(nullptr);
if (options & AddChildDiagrams) {
@@ -211,7 +211,7 @@
}
int index = 0;
foreach (Diagram *diagram, project -> diagrams()) {
- QTreeWidgetItem *diagram_qtwi = addDiagram(diagram, 0, options);
+ QTreeWidgetItem *diagram_qtwi = addDiagram(diagram, nullptr, options);
project_qtwi -> insertChild(index, diagram_qtwi);
++ index;
}
@@ -239,7 +239,7 @@
*/
QTreeWidgetItem *GenericPanel::addDiagram(Diagram *diagram, QTreeWidgetItem *parent_item, PanelOptions options) {
Q_UNUSED(options)
- if (!diagram) return(0);
+ if (!diagram) return(nullptr);
bool creation_required;
@@ -255,9 +255,9 @@
*/
QTreeWidgetItem *GenericPanel::getItemForDiagram(Diagram *diagram, bool *created) {
- if (!diagram) return(0);
+ if (!diagram) return(nullptr);
- QTreeWidgetItem *diagram_qtwi = diagrams_.value(diagram, 0);
+ QTreeWidgetItem *diagram_qtwi = diagrams_.value(diagram, nullptr);
if (diagram_qtwi) {
if (created) *created = false;
return(diagram_qtwi);
@@ -273,7 +273,7 @@
*/
QTreeWidgetItem *GenericPanel::updateDiagramItem(QTreeWidgetItem *diagram_qtwi, Diagram *diagram, PanelOptions options, bool freshly_created) {
Q_UNUSED(options)
- if (!diagram || !diagram_qtwi) return(0);
+ if (!diagram || !diagram_qtwi) return(nullptr);
QSettings settings;
QString displayed_title = diagram -> title();
@@ -342,7 +342,7 @@
*/
QTreeWidgetItem *GenericPanel::addTemplatesCollection(TitleBlockTemplatesCollection *tbt_collection, QTreeWidgetItem *parent_item, PanelOptions options) {
- if (!tbt_collection) return(0);
+ if (!tbt_collection) return(nullptr);
bool creation_required;
QTreeWidgetItem *tbt_collection_qtwi = getItemForTemplatesCollection(tbt_collection, &creation_required);
@@ -357,8 +357,8 @@
*/
QTreeWidgetItem *GenericPanel::itemForTemplatesCollection(TitleBlockTemplatesCollection *tbt_collection) {
- if (!tbt_collection) return(0);
- return(tb_templates_.value(tbt_collection -> location(), 0));
+ if (!tbt_collection) return(nullptr);
+ return(tb_templates_.value(tbt_collection -> location(), nullptr));
}
/**
@@ -365,8 +365,8 @@
*/
QTreeWidgetItem *GenericPanel::getItemForTemplatesCollection(TitleBlockTemplatesCollection *tbt_collection, bool *created) {
- if (!tbt_collection) return(0);
- QTreeWidgetItem *tbt_collection_item = tb_templates_.value(tbt_collection -> location(), 0);
+ if (!tbt_collection) return(nullptr);
+ QTreeWidgetItem *tbt_collection_item = tb_templates_.value(tbt_collection -> location(), nullptr);
if (tbt_collection_item) {
if (created) *created = false;
return(tbt_collection_item);
@@ -421,7 +421,7 @@
int index = 0;
foreach (QString template_name, tbt_collection -> templates()) {
- QTreeWidgetItem *template_item = addTemplate(tbt_collection -> location(template_name), 0, options);
+ QTreeWidgetItem *template_item = addTemplate(tbt_collection -> location(template_name), nullptr, options);
tbt_collection_qtwi -> insertChild(index ++, template_item);
}
}
@@ -433,7 +433,7 @@
*/
QTreeWidgetItem *GenericPanel::addTemplate(const TitleBlockTemplateLocation &tb_template, QTreeWidgetItem *parent_item, PanelOptions options) {
- if (!tb_template.isValid()) return(0);
+ if (!tb_template.isValid()) return(nullptr);
bool creation_required;
QTreeWidgetItem *tb_template_qtwi = getItemForTemplate(tb_template, &creation_required);
@@ -448,9 +448,9 @@
*/
QTreeWidgetItem *GenericPanel::getItemForTemplate(const TitleBlockTemplateLocation &tb_template, bool *created) {
- if (!tb_template.isValid()) return(0);
+ if (!tb_template.isValid()) return(nullptr);
- QTreeWidgetItem *tb_template_qtwi = tb_templates_.value(tb_template, 0);
+ QTreeWidgetItem *tb_template_qtwi = tb_templates_.value(tb_template, nullptr);
if (tb_template_qtwi) {
if (created) *created = false;
return(tb_template_qtwi);
@@ -530,7 +530,7 @@
*/
void GenericPanel::projectInformationsChanged(QETProject *project) {
- addProject(project, 0, 0);
+ addProject(project, nullptr, nullptr);
emit(panelContentChanged());
}
@@ -539,7 +539,7 @@
*/
void GenericPanel::diagramAdded(QETProject *project, Diagram *diagram) {
Q_UNUSED(diagram)
- addProject(project, 0, GenericPanel::AddChildDiagrams);
+ addProject(project, nullptr, GenericPanel::AddChildDiagrams);
emit(panelContentChanged());
}
@@ -548,7 +548,7 @@
*/
void GenericPanel::diagramRemoved(QETProject *project, Diagram *diagram) {
Q_UNUSED(diagram)
- addProject(project, 0, GenericPanel::AddChildDiagrams);
+ addProject(project, nullptr, GenericPanel::AddChildDiagrams);
emit(panelContentChanged());
}
Modified: trunk/sources/genericpanel.h
===================================================================
--- trunk/sources/genericpanel.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/genericpanel.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -55,7 +55,7 @@
// Constructors, destructor
public:
- GenericPanel(QWidget * = 0);
+ GenericPanel(QWidget * = nullptr);
virtual ~GenericPanel();
public:
@@ -72,35 +72,35 @@
// project-related methods
public:
- virtual QTreeWidgetItem *addProject(QETProject *, QTreeWidgetItem * = 0, PanelOptions = AddAllChild);
+ virtual QTreeWidgetItem *addProject(QETProject *, QTreeWidgetItem * = nullptr, PanelOptions = AddAllChild);
virtual QTreeWidgetItem *itemForProject(QETProject *);
protected:
- virtual QTreeWidgetItem *getItemForProject(QETProject *, bool * = 0);
+ virtual QTreeWidgetItem *getItemForProject(QETProject *, bool * = nullptr);
virtual QTreeWidgetItem *updateProjectItem(QTreeWidgetItem *, QETProject *, PanelOptions = AddAllChild, bool = false);
virtual QTreeWidgetItem *fillProjectItem (QTreeWidgetItem *, QETProject *, PanelOptions = AddAllChild, bool = false);
// diagram-related methods
public:
- virtual QTreeWidgetItem *addDiagram(Diagram *, QTreeWidgetItem * = 0, PanelOptions = AddAllChild);
+ virtual QTreeWidgetItem *addDiagram(Diagram *, QTreeWidgetItem * = nullptr, PanelOptions = AddAllChild);
protected:
- virtual QTreeWidgetItem *getItemForDiagram(Diagram *, bool * = 0);
+ virtual QTreeWidgetItem *getItemForDiagram(Diagram *, bool * = nullptr);
virtual QTreeWidgetItem *updateDiagramItem(QTreeWidgetItem *, Diagram *, PanelOptions = AddAllChild, bool = false);
virtual QTreeWidgetItem *fillDiagramItem (QTreeWidgetItem *, Diagram *, PanelOptions = AddAllChild, bool = false);
// title block templates collections methods
public:
- virtual QTreeWidgetItem *addTemplatesCollection(TitleBlockTemplatesCollection *, QTreeWidgetItem * = 0, PanelOptions = AddAllChild);
+ virtual QTreeWidgetItem *addTemplatesCollection(TitleBlockTemplatesCollection *, QTreeWidgetItem * = nullptr, PanelOptions = AddAllChild);
virtual QTreeWidgetItem *itemForTemplatesCollection(TitleBlockTemplatesCollection *);
protected:
- virtual QTreeWidgetItem *getItemForTemplatesCollection(TitleBlockTemplatesCollection *, bool * = 0);
+ virtual QTreeWidgetItem *getItemForTemplatesCollection(TitleBlockTemplatesCollection *, bool * = nullptr);
virtual QTreeWidgetItem *updateTemplatesCollectionItem(QTreeWidgetItem *, TitleBlockTemplatesCollection *, PanelOptions = AddAllChild, bool = false);
virtual QTreeWidgetItem *fillTemplatesCollectionItem (QTreeWidgetItem *, TitleBlockTemplatesCollection *, PanelOptions = AddAllChild, bool = false);
// title block templates methods
public:
- virtual QTreeWidgetItem *addTemplate(const TitleBlockTemplateLocation &, QTreeWidgetItem * = 0, PanelOptions = AddAllChild);
+ virtual QTreeWidgetItem *addTemplate(const TitleBlockTemplateLocation &, QTreeWidgetItem * = nullptr, PanelOptions = AddAllChild);
protected:
- virtual QTreeWidgetItem *getItemForTemplate(const TitleBlockTemplateLocation &, bool * = 0);
+ virtual QTreeWidgetItem *getItemForTemplate(const TitleBlockTemplateLocation &, bool * = nullptr);
virtual QTreeWidgetItem *updateTemplateItem(QTreeWidgetItem *, const TitleBlockTemplateLocation &, PanelOptions = AddAllChild, bool = false);
virtual QTreeWidgetItem *fillTemplateItem (QTreeWidgetItem *, const TitleBlockTemplateLocation &, PanelOptions = AddAllChild, bool = false);
@@ -123,7 +123,7 @@
protected:
virtual QString defaultText(QET::ItemType);
virtual QIcon defaultIcon(QET::ItemType);
- virtual QTreeWidgetItem *makeItem(QET::ItemType, QTreeWidgetItem * = 0, const QString & = QString(), const QIcon & = QIcon());
+ virtual QTreeWidgetItem *makeItem(QET::ItemType, QTreeWidgetItem * = nullptr, const QString & = QString(), const QIcon & = QIcon());
virtual void deleteItem(QTreeWidgetItem *, bool = false);
virtual void markItemAsUnused(QTreeWidgetItem *);
virtual void reparent(QTreeWidgetItem *, QTreeWidgetItem *);
Modified: trunk/sources/nameslistwidget.h
===================================================================
--- trunk/sources/nameslistwidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/nameslistwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -28,7 +28,7 @@
// constructors, destructor
public:
- NamesListWidget(QWidget * = 0);
+ NamesListWidget(QWidget * = nullptr);
virtual ~NamesListWidget();
private:
Modified: trunk/sources/newelementwizard.h
===================================================================
--- trunk/sources/newelementwizard.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/newelementwizard.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -41,7 +41,7 @@
// constructors, destructor
public:
- NewElementWizard(QWidget * = 0, Qt::WindowFlags = 0);
+ NewElementWizard(QWidget * = nullptr, Qt::WindowFlags = nullptr);
virtual ~NewElementWizard();
void preselectedLocation(const ElementsLocation &location);
Modified: trunk/sources/nomenclature.h
===================================================================
--- trunk/sources/nomenclature.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/nomenclature.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -43,7 +43,7 @@
// constructors, destructor
public:
- nomenclature(QETProject *project, QWidget *parent =0);
+ nomenclature(QETProject *project, QWidget *parent =nullptr);
virtual ~nomenclature();
// attributes
Modified: trunk/sources/projectconfigpages.h
===================================================================
--- trunk/sources/projectconfigpages.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/projectconfigpages.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -40,7 +40,7 @@
Q_OBJECT
// Constructor, destructor
public:
- ProjectConfigPage(QETProject *, QWidget * = 0);
+ ProjectConfigPage(QETProject *, QWidget * = nullptr);
virtual ~ProjectConfigPage();
private:
ProjectConfigPage(const ProjectConfigPage &);
@@ -90,7 +90,7 @@
Q_OBJECT
// Constructor, destructor
public:
- ProjectMainConfigPage(QETProject *, QWidget * = 0);
+ ProjectMainConfigPage(QETProject *, QWidget * = nullptr);
virtual ~ProjectMainConfigPage();
private:
ProjectMainConfigPage(const ProjectMainConfigPage &);
@@ -122,7 +122,7 @@
//Methods
public:
- ProjectAutoNumConfigPage (QETProject *project, QWidget *parent = 0);
+ ProjectAutoNumConfigPage (QETProject *project, QWidget *parent = nullptr);
virtual QString title() const;
virtual QIcon icon() const;
Modified: trunk/sources/projectview.cpp
===================================================================
--- trunk/sources/projectview.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/projectview.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -41,7 +41,7 @@
*/
ProjectView::ProjectView(QETProject *project, QWidget *parent) :
QWidget(parent),
- m_project(0)
+ m_project(nullptr)
{
initActions();
initWidgets();
@@ -123,7 +123,7 @@
*/
void ProjectView::changeTabDown(){
DiagramView *nextDiagramView = this->nextDiagram();
- if (nextDiagramView!=NULL){
+ if (nextDiagramView!=nullptr){
rebuildDiagramsMap();
m_tab -> setCurrentWidget(nextDiagramView);
}
@@ -138,7 +138,7 @@
if (next_tab_index<m_diagram_ids.count()) //if next tab index >= greatest tab the last tab is activated so no need to change tab.
return(m_diagram_ids[next_tab_index]);
else
- return NULL;
+ return nullptr;
}
/**
@@ -146,7 +146,7 @@
*/
void ProjectView::changeTabUp(){
DiagramView *previousDiagramView = this->previousDiagram();
- if (previousDiagramView!=NULL){
+ if (previousDiagramView!=nullptr){
rebuildDiagramsMap();
m_tab -> setCurrentWidget(previousDiagramView);
}
@@ -161,7 +161,7 @@
if (previous_tab_index>=0) //if previous tab index = 0 then the first tab is activated so no need to change tab.
return(m_diagram_ids[previous_tab_index]);
else
- return NULL;
+ return nullptr;
}
/**
@@ -965,7 +965,7 @@
return(diagram_view);
}
}
- return(0);
+ return(nullptr);
}
/**
Modified: trunk/sources/projectview.h
===================================================================
--- trunk/sources/projectview.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/projectview.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -41,7 +41,7 @@
// constructors, destructor
public:
- ProjectView(QETProject *, QWidget * = 0);
+ ProjectView(QETProject *, QWidget * = nullptr);
virtual ~ProjectView();
private:
ProjectView(const ProjectView &);
Modified: trunk/sources/qet.cpp
===================================================================
--- trunk/sources/qet.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qet.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -199,7 +199,7 @@
bool ok;
int tmp = e.attribute(nom_attribut).toInt(&ok);
if (!ok) return(false);
- if (entier != NULL) *entier = tmp;
+ if (entier != nullptr) *entier = tmp;
return(true);
}
@@ -218,7 +218,7 @@
bool ok;
qreal tmp = e.attribute(nom_attribut).toDouble(&ok);
if (!ok) return(false);
- if (reel != NULL) *reel = tmp;
+ if (reel != nullptr) *reel = tmp;
return(true);
}
Modified: trunk/sources/qet.h
===================================================================
--- trunk/sources/qet.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qet.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -140,9 +140,9 @@
QetCollection qetCollectionFromString (const QString &str);
bool lineContainsPoint(const QLineF &, const QPointF &);
- bool orthogonalProjection(const QPointF &, const QLineF &, QPointF * = 0);
- bool attributeIsAnInteger(const QDomElement &, QString , int * = NULL);
- bool attributeIsAReal(const QDomElement &, QString , qreal * = NULL);
+ bool orthogonalProjection(const QPointF &, const QLineF &, QPointF * = nullptr);
+ bool attributeIsAnInteger(const QDomElement &, QString , int * = nullptr);
+ bool attributeIsAReal(const QDomElement &, QString , qreal * = nullptr);
QString ElementsAndConductorsSentence(int, int, int = 0, int = 0, int = 0, int = 0);
QList<QDomElement> findInDomElement(const QDomElement &, const QString &);
QList<QDomElement> findInDomElement(const QDomElement &, const QString &, const QString &);
@@ -160,7 +160,7 @@
qreal correctAngle(const qreal &);
bool compareCanonicalFilePaths(const QString &, const QString &);
QString titleBlockColumnLengthToString(const TitleBlockColumnLength &);
- bool writeXmlFile(QDomDocument &, const QString &, QString * = 0);
+ bool writeXmlFile(QDomDocument &, const QString &, QString * = nullptr);
QPointF graphicsSceneEventPos(QEvent *);
bool eachStrIsEqual (const QStringList &qsl);
}
Modified: trunk/sources/qetapp.cpp
===================================================================
--- trunk/sources/qetapp.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetapp.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -62,7 +62,7 @@
*/
QETApp::QETApp(int &argc, char **argv) :
QETSingleApplication(argc, argv, QString("qelectrotech-" + QETApp::userName())),
- splash_screen_(0),
+ splash_screen_(nullptr),
non_interactive_execution_(false)
{
parseArguments();
@@ -378,7 +378,7 @@
return(project -> embeddedTitleBlockTemplatesCollection());
}
}
- return(0);
+ return(nullptr);
}
/**
@@ -597,7 +597,7 @@
n'est pas edite par l'application.
*/
QETDiagramEditor *QETApp::diagramEditorForFile(const QString &filepath) {
- if (filepath.isEmpty()) return(0);
+ if (filepath.isEmpty()) return(nullptr);
QETApp *qet_app(QETApp::instance());
foreach (QETDiagramEditor *diagram_editor, qet_app -> diagramEditors()) {
@@ -606,7 +606,7 @@
}
}
- return(0);
+ return(nullptr);
}
/**
@@ -1225,7 +1225,7 @@
// affiche le dialogue puis evite de le lier a un quelconque widget parent
cd.exec();
- cd.setParent(0, cd.windowFlags());
+ cd.setParent(nullptr, cd.windowFlags());
}
/**
@@ -1471,7 +1471,7 @@
*/
QETProject *QETApp::projectFromString(const QString &url) {
int project_id = projectIdFromString(url);
- if (project_id == -1) return(0);
+ if (project_id == -1) return(nullptr);
return(project(project_id));
}
@@ -1655,7 +1655,7 @@
if (registered_projects_.contains(id)) {
return(registered_projects_[id]);
} else {
- return(0);
+ return(nullptr);
}
}
Modified: trunk/sources/qetarguments.h
===================================================================
--- trunk/sources/qetarguments.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetarguments.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -28,8 +28,8 @@
// constructors, destructor
public:
- QETArguments(QObject * = 0);
- QETArguments(const QList<QString> &, QObject * = 0);
+ QETArguments(QObject * = nullptr);
+ QETArguments(const QList<QString> &, QObject * = nullptr);
QETArguments(const QETArguments &);
QETArguments &operator=(const QETArguments &);
virtual ~QETArguments();
Modified: trunk/sources/qetdiagrameditor.cpp
===================================================================
--- trunk/sources/qetdiagrameditor.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetdiagrameditor.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -983,7 +983,7 @@
// met a jour le panel d'elements
if (update_panel) {
pa -> elementsPanel().projectWasOpened(project);
- if (currentDiagram() != NULL)
+ if (currentDiagram() != nullptr)
m_autonumbering_dock->setProject(project, project_view);
}
@@ -1010,15 +1010,15 @@
*/
ProjectView *QETDiagramEditor::currentProject() const {
QMdiSubWindow *current_window = workspace.activeSubWindow();
- if (!current_window) return(0);
+ if (!current_window) return(nullptr);
QWidget *current_widget = current_window -> widget();
- if (!current_widget) return(0);
+ if (!current_widget) return(nullptr);
if (ProjectView *project_view = qobject_cast<ProjectView *>(current_widget)) {
return(project_view);
}
- return(0);
+ return(nullptr);
}
/**
@@ -1029,7 +1029,7 @@
if (ProjectView *project_view = currentProject()) {
return(project_view -> currentDiagram());
}
- return(0);
+ return(nullptr);
}
/**
@@ -1040,10 +1040,10 @@
*/
Element *QETDiagramEditor::currentElement() const {
DiagramView *dv = currentDiagram();
- if (!dv) return(0);
+ if (!dv) return(nullptr);
QList<Element *> selected_elements = dv -> diagram() -> selectedContent().m_elements.toList();
- if (selected_elements.count() != 1) return(0);
+ if (selected_elements.count() != 1) return(nullptr);
return(selected_elements.first());
}
@@ -1070,7 +1070,7 @@
return(project_view);
}
}
- return(0);
+ return(nullptr);
}
/**
@@ -1086,7 +1086,7 @@
}
}
}
- return(0);
+ return(nullptr);
}
/**
@@ -1099,7 +1099,7 @@
return(opened_project);
}
}
- return(0);
+ return(nullptr);
}
/**
@@ -1115,7 +1115,7 @@
}
}
}
- return(0);
+ return(nullptr);
}
/**
@@ -1129,7 +1129,7 @@
return(sub_window);
}
}
- return(0);
+ return(nullptr);
}
/**
@@ -1357,7 +1357,7 @@
void QETDiagramEditor::slot_updateAutoNumDock() {
if ( workspace.subWindowList().indexOf(workspace.activeSubWindow()) != activeSubWindowIndex) {
activeSubWindowIndex = workspace.subWindowList().indexOf(workspace.activeSubWindow());
- if (currentProject() != NULL && currentDiagram() != NULL) {
+ if (currentProject() != nullptr && currentDiagram() != nullptr) {
m_autonumbering_dock->setProject(currentProject()->project(),currentProject());
}
}
@@ -1584,12 +1584,12 @@
pas edite par cet editeur de schemas.
*/
ProjectView *QETDiagramEditor::viewForFile(const QString &filepath) const {
- if (filepath.isEmpty()) return(0);
+ if (filepath.isEmpty()) return(nullptr);
QString searched_can_file_path = QFileInfo(filepath).canonicalFilePath();
if (searched_can_file_path.isEmpty()) {
// QFileInfo returns an empty path for non-existent files
- return(0);
+ return(nullptr);
}
foreach (ProjectView *project_view, openedProjects()) {
QString project_can_file_path = QFileInfo(project_view -> project() -> filePath()).canonicalFilePath();
@@ -1597,7 +1597,7 @@
return(project_view);
}
}
- return(0);
+ return(nullptr);
}
/**
@@ -1606,15 +1606,15 @@
*/
ProjectView *QETDiagramEditor::acessCurrentProject (){
QMdiSubWindow *current_window = workspace.activeSubWindow();
- if (!current_window) return(0);
+ if (!current_window) return(nullptr);
QWidget *current_widget = current_window -> widget();
- if (!current_widget) return(0);
+ if (!current_widget) return(nullptr);
if (ProjectView *project_view = qobject_cast<ProjectView *>(current_widget)) {
return(project_view);
}
- return(0);
+ return(nullptr);
}
/**
@@ -1633,7 +1633,7 @@
if (ProjectView *project_view = currentProject()) {
return(project_view -> currentDiagram());
}
- return(0);
+ return(nullptr);
}
/**
@@ -2191,7 +2191,7 @@
success = process->startDetached("qet_tb_generator");
#endif
if ( !success ) {
-QMessageBox::warning(0,
+QMessageBox::warning(nullptr,
"Error launching plugin",
"To install the plugin qet_tb_generator\nVisit https://pypi.python.org/pypi/qet-tb-generator/\n";
"\n"
Modified: trunk/sources/qetdiagrameditor.h
===================================================================
--- trunk/sources/qetdiagrameditor.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetdiagrameditor.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -43,7 +43,7 @@
// constructors, destructor
public:
- QETDiagramEditor(const QStringList & = QStringList(), QWidget * = 0);
+ QETDiagramEditor(const QStringList & = QStringList(), QWidget * = nullptr);
virtual ~QETDiagramEditor();
private:
Modified: trunk/sources/qetgraphicsitem/conductor.cpp
===================================================================
--- trunk/sources/qetgraphicsitem/conductor.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/conductor.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -74,12 +74,12 @@
*/
Conductor::Conductor(Terminal *p1, Terminal* p2) :
QObject(),
- QGraphicsPathItem(0),
+ QGraphicsPathItem(nullptr),
terminal1(p1),
terminal2(p2),
m_mouse_over(false),
- m_text_item(0),
- segments(NULL),
+ m_text_item(nullptr),
+ segments(nullptr),
m_moving_segment(false),
modified_path(false),
has_to_save_profile(false),
@@ -178,7 +178,7 @@
{
QPainterPath path;
- if (segments == NULL)
+ if (segments == nullptr)
setPath(path);
//Start the path
@@ -913,7 +913,7 @@
QList<QPointF> points_list;
// on retourne la liste tout de suite s'il n'y a pas de segments
- if (segments == NULL) return(points_list);
+ if (segments == nullptr) return(points_list);
// recupere le premier point
points_list << segments -> firstPoint();
@@ -941,7 +941,7 @@
deleteSegments();
// cree les segments a partir de la liste de points
- ConductorSegment *last_segment = NULL;
+ ConductorSegment *last_segment = nullptr;
for (int i = 0 ; i < points_list.size() - 1 ; ++ i) {
last_segment = new ConductorSegment(points_list.at(i), points_list.at(i + 1), last_segment);
if (!i) segments = last_segment;
@@ -956,8 +956,8 @@
*/
bool Conductor::fromXml(QDomElement &dom_element)
{
- setPos(dom_element.attribute("x", 0).toDouble(),
- dom_element.attribute("y", 0).toDouble());
+ setPos(dom_element.attribute("x", nullptr).toDouble(),
+ dom_element.attribute("y", nullptr).toDouble());
bool return_ = pathFromXml(dom_element);
@@ -1123,7 +1123,7 @@
/// @return les segments de ce conducteur
const QList<ConductorSegment *> Conductor::segmentsList() const {
- if (segments == NULL) return(QList<ConductorSegment *>());
+ if (segments == nullptr) return(QList<ConductorSegment *>());
QList<ConductorSegment *> segments_vector;
ConductorSegment *segment = segments;
@@ -1148,7 +1148,7 @@
@return Le segment qui contient le point au milieu du conducteur
*/
ConductorSegment *Conductor::middleSegment() {
- if (segments == NULL) return(NULL);
+ if (segments == nullptr) return(nullptr);
qreal half_length = length() / 2.0;
@@ -1532,7 +1532,7 @@
*/
QSet<Conductor *> Conductor::relatedPotentialConductors(const bool all_diagram, QList <Terminal *> *t_list) {
bool declar_t_list = false;
- if (t_list == 0) {
+ if (t_list == nullptr) {
declar_t_list = true;
t_list = new QList <Terminal *>;
}
@@ -1802,10 +1802,10 @@
/// Supprime les segments
void Conductor::deleteSegments() {
- if (segments != NULL) {
+ if (segments != nullptr) {
while (segments -> hasNextSegment()) delete segments -> nextSegment();
delete segments;
- segments = NULL;
+ segments = nullptr;
}
}
Modified: trunk/sources/qetgraphicsitem/conductor.h
===================================================================
--- trunk/sources/qetgraphicsitem/conductor.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/conductor.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -113,7 +113,7 @@
void calculateTextItemPosition();
virtual Highlight highlight() const;
virtual void setHighlighted(Highlight);
- QSet<Conductor *> relatedPotentialConductors(const bool all_diagram = true, QList <Terminal *> *t_list=0);
+ QSet<Conductor *> relatedPotentialConductors(const bool all_diagram = true, QList <Terminal *> *t_list=nullptr);
QETDiagramEditor* diagramEditor() const;
void editProperty ();
Modified: trunk/sources/qetgraphicsitem/conductortextitem.h
===================================================================
--- trunk/sources/qetgraphicsitem/conductortextitem.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/conductortextitem.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -32,8 +32,8 @@
// constructors, destructor
public:
- ConductorTextItem(Conductor * = 0);
- ConductorTextItem(const QString &, Conductor * = 0);
+ ConductorTextItem(Conductor * = nullptr);
+ ConductorTextItem(const QString &, Conductor * = nullptr);
virtual ~ConductorTextItem();
private:
ConductorTextItem(const ConductorTextItem &);
Modified: trunk/sources/qetgraphicsitem/customelement.cpp
===================================================================
--- trunk/sources/qetgraphicsitem/customelement.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/customelement.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -692,7 +692,7 @@
!QET::attributeIsAReal(e, "x", &pos_x) ||\
!QET::attributeIsAReal(e, "y", &pos_y) ||\
!QET::attributeIsAnInteger(e, "size", &size)
- ) return(0);
+ ) return(nullptr);
ElementTextItem *eti = new ElementTextItem(e.attribute("text"), this);
eti -> setFont(QETApp::diagramTextsFont(size));
@@ -733,14 +733,14 @@
// verifie la presence et la validite des attributs obligatoires
qreal terminalx, terminaly;
Qet::Orientation terminalo;
- if (!QET::attributeIsAReal(e, QString("x"), &terminalx)) return(0);
- if (!QET::attributeIsAReal(e, QString("y"), &terminaly)) return(0);
- if (!e.hasAttribute("orientation")) return(0);
+ if (!QET::attributeIsAReal(e, QString("x"), &terminalx)) return(nullptr);
+ if (!QET::attributeIsAReal(e, QString("y"), &terminaly)) return(nullptr);
+ if (!e.hasAttribute("orientation")) return(nullptr);
if (e.attribute("orientation") == "n") terminalo = Qet::North;
else if (e.attribute("orientation") == "s") terminalo = Qet::South;
else if (e.attribute("orientation") == "e") terminalo = Qet::East;
else if (e.attribute("orientation") == "w") terminalo = Qet::West;
- else return(0);
+ else return(nullptr);
Terminal *new_terminal = new Terminal(terminalx, terminaly, terminalo, this);
new_terminal -> setZValue(420); // valeur arbitraire pour maintenir les bornes au-dessus des champs de texte
list_terminals << new_terminal;
@@ -991,5 +991,5 @@
foreach (ElementTextItem *eti, list_texts_) {
if (eti -> tagg() == tagg) return eti;
}
- return NULL;
+ return nullptr;
}
Modified: trunk/sources/qetgraphicsitem/customelement.h
===================================================================
--- trunk/sources/qetgraphicsitem/customelement.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/customelement.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -36,7 +36,7 @@
// constructors, destructor
public:
- CustomElement (const ElementsLocation &, QGraphicsItem * = 0, int * = 0);
+ CustomElement (const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr);
virtual ~CustomElement();
@@ -78,7 +78,7 @@
ElementTextItem* taggedText(const QString &tagg) const;
protected:
- virtual bool buildFromXml(const QDomElement &, int * = 0);
+ virtual bool buildFromXml(const QDomElement &, int * = nullptr);
virtual bool parseElement(QDomElement &, QPainter &);
virtual bool parseLine(QDomElement &, QPainter &);
virtual bool parseRect(QDomElement &, QPainter &);
Modified: trunk/sources/qetgraphicsitem/diagramimageitem.h
===================================================================
--- trunk/sources/qetgraphicsitem/diagramimageitem.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/diagramimageitem.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -33,8 +33,8 @@
// constructors, destructor
public:
- DiagramImageItem(QetGraphicsItem * = 0);
- DiagramImageItem(const QPixmap &pixmap, QetGraphicsItem * = 0);
+ DiagramImageItem(QetGraphicsItem * = nullptr);
+ DiagramImageItem(const QPixmap &pixmap, QetGraphicsItem * = nullptr);
virtual ~DiagramImageItem();
// attributes
Modified: trunk/sources/qetgraphicsitem/diagramtextitem.h
===================================================================
--- trunk/sources/qetgraphicsitem/diagramtextitem.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/diagramtextitem.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -41,8 +41,8 @@
void colorChanged(QColor color);
public:
- DiagramTextItem(QGraphicsItem * = 0);
- DiagramTextItem(const QString &, QGraphicsItem * = 0);
+ DiagramTextItem(QGraphicsItem * = nullptr);
+ DiagramTextItem(const QString &, QGraphicsItem * = nullptr);
private:
void build();
Modified: trunk/sources/qetgraphicsitem/element.cpp
===================================================================
--- trunk/sources/qetgraphicsitem/element.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/element.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -337,7 +337,7 @@
// Translation de l'origine du repere de la pixmap
p.translate(hotspot_coord);
// L'element se dessine sur la pixmap
- paint(&p, 0);
+ paint(&p, nullptr);
}
/**
Modified: trunk/sources/qetgraphicsitem/element.h
===================================================================
--- trunk/sources/qetgraphicsitem/element.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/element.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -41,7 +41,7 @@
// constructors, destructor
public:
- Element(QGraphicsItem * = 0);
+ Element(QGraphicsItem * = nullptr);
virtual ~Element();
private:
Element(const Element &);
Modified: trunk/sources/qetgraphicsitem/elementtextitem.h
===================================================================
--- trunk/sources/qetgraphicsitem/elementtextitem.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/elementtextitem.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -31,8 +31,8 @@
Q_OBJECT
// constructors, destructor
public:
- ElementTextItem(Element * = 0);
- ElementTextItem(const QString &, Element * = 0);
+ ElementTextItem(Element * = nullptr);
+ ElementTextItem(const QString &, Element * = nullptr);
virtual ~ElementTextItem();
// attributes
Modified: trunk/sources/qetgraphicsitem/fixedelement.h
===================================================================
--- trunk/sources/qetgraphicsitem/fixedelement.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/fixedelement.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -29,7 +29,7 @@
// constructors, destructor
public:
- FixedElement(QGraphicsItem * = 0);
+ FixedElement(QGraphicsItem * = nullptr);
virtual ~FixedElement();
// methods
Modified: trunk/sources/qetgraphicsitem/ghostelement.h
===================================================================
--- trunk/sources/qetgraphicsitem/ghostelement.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/ghostelement.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -36,7 +36,7 @@
// constructor, destructor
public:
- GhostElement(const ElementsLocation &, QGraphicsItem * = 0);
+ GhostElement(const ElementsLocation &, QGraphicsItem * = nullptr);
virtual ~GhostElement();
// methods
Modified: trunk/sources/qetgraphicsitem/independenttextitem.cpp
===================================================================
--- trunk/sources/qetgraphicsitem/independenttextitem.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/independenttextitem.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -23,7 +23,7 @@
@param parent_diagram Le schema auquel est rattache le champ de texte
*/
IndependentTextItem::IndependentTextItem() :
- DiagramTextItem(0)
+ DiagramTextItem(nullptr)
{}
/**
@@ -32,7 +32,7 @@
@param parent_diagram Le schema auquel est rattache le champ de texte
*/
IndependentTextItem::IndependentTextItem(const QString &text) :
- DiagramTextItem(text, 0)
+ DiagramTextItem(text, nullptr)
{}
/// Destructeur
Modified: trunk/sources/qetgraphicsitem/masterelement.h
===================================================================
--- trunk/sources/qetgraphicsitem/masterelement.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/masterelement.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -33,7 +33,7 @@
Q_OBJECT
public:
- explicit MasterElement(const ElementsLocation &, QGraphicsItem * = 0, int * = 0);
+ explicit MasterElement(const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr);
~MasterElement();
virtual void linkToElement (Element *elmt);
Modified: trunk/sources/qetgraphicsitem/qetgraphicsitem.h
===================================================================
--- trunk/sources/qetgraphicsitem/qetgraphicsitem.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/qetgraphicsitem.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -28,7 +28,7 @@
public:
//constructor destructor
- QetGraphicsItem(QGraphicsItem *parent = 0);
+ QetGraphicsItem(QGraphicsItem *parent = nullptr);
virtual ~QetGraphicsItem() = 0;
//public methode
Modified: trunk/sources/qetgraphicsitem/qetshapeitem.cpp
===================================================================
--- trunk/sources/qetgraphicsitem/qetshapeitem.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/qetshapeitem.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -606,14 +606,14 @@
if (m_shapeType != Polygon)
{
- m_P1.setX(e.attribute("x1", 0).toDouble());
- m_P1.setY(e.attribute("y1", 0).toDouble());
- m_P2.setX(e.attribute("x2", 0).toDouble());
- m_P2.setY(e.attribute("y2", 0).toDouble());
+ m_P1.setX(e.attribute("x1", nullptr).toDouble());
+ m_P1.setY(e.attribute("y1", nullptr).toDouble());
+ m_P2.setX(e.attribute("x2", nullptr).toDouble());
+ m_P2.setY(e.attribute("y2", nullptr).toDouble());
}
else
foreach(QDomElement de, QET::findInDomElement(e, "points", "point"))
- m_polygon << QPointF(de.attribute("x", 0).toDouble(), de.attribute("y", 0).toDouble());
+ m_polygon << QPointF(de.attribute("x", nullptr).toDouble(), de.attribute("y", nullptr).toDouble());
return (true);
}
Modified: trunk/sources/qetgraphicsitem/qetshapeitem.h
===================================================================
--- trunk/sources/qetgraphicsitem/qetshapeitem.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/qetshapeitem.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -56,7 +56,7 @@
enum { Type = UserType + 1008 };
- QetShapeItem(QPointF, QPointF = QPointF(0,0), ShapeType = Line, QGraphicsItem *parent = 0);
+ QetShapeItem(QPointF, QPointF = QPointF(0,0), ShapeType = Line, QGraphicsItem *parent = nullptr);
virtual ~QetShapeItem();
//Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a QetShapeItem @return the QGraphicsItem type
Modified: trunk/sources/qetgraphicsitem/reportelement.cpp
===================================================================
--- trunk/sources/qetgraphicsitem/reportelement.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/reportelement.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -59,7 +59,7 @@
{
unlinkAllElements();
if (terminals().size())
- disconnect(terminals().first(), 0, 0, 0);
+ disconnect(terminals().first(), nullptr, nullptr, nullptr);
if (m_watched_conductor)
disconnect(m_watched_conductor, &Conductor::propertiesChange, this, &ReportElement::updateLabel);
}
Modified: trunk/sources/qetgraphicsitem/reportelement.h
===================================================================
--- trunk/sources/qetgraphicsitem/reportelement.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/reportelement.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -32,7 +32,7 @@
Q_OBJECT
public :
- explicit ReportElement(const ElementsLocation &,QString link_type, QGraphicsItem * = 0, int * = 0);
+ explicit ReportElement(const ElementsLocation &,QString link_type, QGraphicsItem * = nullptr, int * = nullptr);
~ReportElement();
virtual void linkToElement(Element *);
virtual void unlinkAllElements();
Modified: trunk/sources/qetgraphicsitem/simpleelement.h
===================================================================
--- trunk/sources/qetgraphicsitem/simpleelement.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/simpleelement.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -32,7 +32,7 @@
Q_OBJECT
public :
- explicit SimpleElement(const ElementsLocation &, QGraphicsItem * = 0, int * = 0);
+ explicit SimpleElement(const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr);
~SimpleElement();
virtual void initLink(QETProject *project);
Modified: trunk/sources/qetgraphicsitem/slaveelement.cpp
===================================================================
--- trunk/sources/qetgraphicsitem/slaveelement.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/slaveelement.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -110,7 +110,7 @@
disconnect(elmt -> diagram(), SIGNAL(XRefPropertiesChanged()), this, SLOT(updateLabel()));
disconnect(elmt, SIGNAL(updateLabel()), this, SLOT(updateLabel()));
- delete m_xref_item; m_xref_item = NULL;
+ delete m_xref_item; m_xref_item = nullptr;
if (ElementTextItem *eti = this->taggedText("label"))
eti->setPlainText("_");
Modified: trunk/sources/qetgraphicsitem/slaveelement.h
===================================================================
--- trunk/sources/qetgraphicsitem/slaveelement.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/slaveelement.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -25,7 +25,7 @@
{
Q_OBJECT
public:
- explicit SlaveElement (const ElementsLocation &, QGraphicsItem * = 0, int * = 0);
+ explicit SlaveElement (const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr);
~SlaveElement();
virtual void linkToElement(Element *elmt);
virtual void unlinkAllElements();
Modified: trunk/sources/qetgraphicsitem/terminal.cpp
===================================================================
--- trunk/sources/qetgraphicsitem/terminal.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/terminal.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -62,7 +62,7 @@
// QRectF null
br_ = new QRectF();
- previous_terminal_ = 0;
+ previous_terminal_ = nullptr;
// divers
setAcceptHoverEvents(true);
setAcceptedMouseButtons(Qt::LeftButton);
@@ -559,7 +559,7 @@
*/
void Terminal::mouseReleaseEvent(QGraphicsSceneMouseEvent *e)
{
- previous_terminal_ = 0;
+ previous_terminal_ = nullptr;
hovered_color_ = neutralColor;
if (!diagram()) return;
Modified: trunk/sources/qetgraphicsitem/terminal.h
===================================================================
--- trunk/sources/qetgraphicsitem/terminal.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/terminal.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -37,9 +37,9 @@
// constructors, destructor
public:
- Terminal(QPointF, Qet::Orientation, Element * = 0);
- Terminal(qreal, qreal, Qet::Orientation, Element * = 0);
- Terminal(QPointF, Qet::Orientation, QString number, QString name, bool hiddenName, Element * = 0);
+ Terminal(QPointF, Qet::Orientation, Element * = nullptr);
+ Terminal(qreal, qreal, Qet::Orientation, Element * = nullptr);
+ Terminal(QPointF, Qet::Orientation, QString number, QString name, bool hiddenName, Element * = nullptr);
virtual ~Terminal();
private:
Modified: trunk/sources/qetgraphicsitem/terminalelement.h
===================================================================
--- trunk/sources/qetgraphicsitem/terminalelement.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetgraphicsitem/terminalelement.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -27,7 +27,7 @@
{
Q_OBJECT
public:
- TerminalElement(const ElementsLocation &, QGraphicsItem * = 0, int * = 0);
+ TerminalElement(const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr);
~TerminalElement();
virtual void initLink(QETProject *project);
Modified: trunk/sources/qetmainwindow.cpp
===================================================================
--- trunk/sources/qetmainwindow.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetmainwindow.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -33,7 +33,7 @@
*/
QETMainWindow::QETMainWindow(QWidget *widget, Qt::WindowFlags flags) :
QMainWindow(widget, flags),
- display_toolbars_(0),
+ display_toolbars_(nullptr),
first_activation_(true)
{
initCommonActions();
@@ -161,8 +161,8 @@
upgrade_M -> setVisible(false);
#endif
- insertMenu(0, settings_menu_);
- insertMenu(0, help_menu_);
+ insertMenu(nullptr, settings_menu_);
+ insertMenu(nullptr, help_menu_);
}
/**
@@ -185,7 +185,7 @@
@return the action returned when inserting \a menu
*/
QAction *QETMainWindow::actionForMenu(QMenu *menu) {
- return(menu_actions_.value(menu, 0));
+ return(menu_actions_.value(menu, nullptr));
}
/**
Modified: trunk/sources/qetmainwindow.h
===================================================================
--- trunk/sources/qetmainwindow.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetmainwindow.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -28,7 +28,7 @@
// constructor, destructor
public:
- QETMainWindow(QWidget * = 0, Qt::WindowFlags = 0);
+ QETMainWindow(QWidget * = nullptr, Qt::WindowFlags = nullptr);
virtual ~QETMainWindow();
// methods
Modified: trunk/sources/qetprintpreviewdialog.h
===================================================================
--- trunk/sources/qetprintpreviewdialog.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetprintpreviewdialog.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -36,7 +36,7 @@
// constructors, destructor
public:
- QETPrintPreviewDialog(QETProject *, QPrinter *, QWidget * = 0, Qt::WindowFlags = 0);
+ QETPrintPreviewDialog(QETProject *, QPrinter *, QWidget * = nullptr, Qt::WindowFlags = nullptr);
virtual ~QETPrintPreviewDialog();
private:
QETPrintPreviewDialog(const QETPrintPreviewDialog &);
Modified: trunk/sources/qetproject.cpp
===================================================================
--- trunk/sources/qetproject.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetproject.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -1044,7 +1044,7 @@
*/
Diagram *QETProject::addNewDiagram() {
// ne fait rien si le projet est en lecture seule
- if (isReadOnly()) return(0);
+ if (isReadOnly()) return(nullptr);
// cree un nouveau schema
Diagram *diagram = new Diagram(this);
@@ -1189,7 +1189,7 @@
if (conv_ok && QET::version.toDouble() < project_qet_version_)
{
int ret = QET::QetMessageBox::warning(
- 0,
+ nullptr,
tr("Avertissement", "message box title"),
tr(
"Ce document semble avoir été enregistré avec "
@@ -1636,7 +1636,7 @@
m_diagrams_list[i]->project()->addFolioAutoNum(autopagenum,nCC.next());
}
else{
- m_diagrams_list[i] -> border_and_titleblock.setFolioData(i + 1, total_folio, NULL, project_wide_properties);
+ m_diagrams_list[i] -> border_and_titleblock.setFolioData(i + 1, total_folio, nullptr, project_wide_properties);
}
m_diagrams_list[i] -> update();
}
Modified: trunk/sources/qetproject.h
===================================================================
--- trunk/sources/qetproject.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qetproject.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -49,8 +49,8 @@
// constructors, destructor
public:
- QETProject (int = 1, QObject * = 0);
- QETProject (const QString &, QObject * = 0);
+ QETProject (int = 1, QObject * = nullptr);
+ QETProject (const QString &, QObject * = nullptr);
virtual ~QETProject();
private:
Modified: trunk/sources/qfilenameedit.h
===================================================================
--- trunk/sources/qfilenameedit.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qfilenameedit.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -34,8 +34,8 @@
// constructors, destructor
public:
- QFileNameEdit(QWidget * = 0);
- QFileNameEdit(const QString &, QWidget * = 0);
+ QFileNameEdit(QWidget * = nullptr);
+ QFileNameEdit(const QString &, QWidget * = nullptr);
virtual ~QFileNameEdit();
private:
QFileNameEdit(const QFileNameEdit &);
Modified: trunk/sources/qtextorientationspinboxwidget.h
===================================================================
--- trunk/sources/qtextorientationspinboxwidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qtextorientationspinboxwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -29,7 +29,7 @@
// constructors, destructor
public:
- QTextOrientationSpinBoxWidget(QWidget * = 0);
+ QTextOrientationSpinBoxWidget(QWidget * = nullptr);
virtual ~QTextOrientationSpinBoxWidget();
private:
QTextOrientationSpinBoxWidget(const QTextOrientationSpinBoxWidget &);
Modified: trunk/sources/qtextorientationwidget.h
===================================================================
--- trunk/sources/qtextorientationwidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/qtextorientationwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -26,7 +26,7 @@
// constructors, destructor
public:
- QTextOrientationWidget(QWidget * = 0);
+ QTextOrientationWidget(QWidget * = nullptr);
virtual ~QTextOrientationWidget();
private:
QTextOrientationWidget(const QTextOrientationWidget &);
@@ -82,6 +82,6 @@
private:
QString getMostUsableStringForRadius(const qreal &);
void generateTextSizeHash();
- bool positionIsASquare(const QPointF &, double * = 0);
+ bool positionIsASquare(const QPointF &, double * = nullptr);
};
#endif
Modified: trunk/sources/recentfiles.cpp
===================================================================
--- trunk/sources/recentfiles.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/recentfiles.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -30,7 +30,7 @@
QObject(parent),
identifier_(identifier.isEmpty() ? "unnamed" : identifier),
size_(size > 0 ? size : 10),
- menu_(0)
+ menu_(nullptr)
{
mapper_ = new QSignalMapper(this);
connect(mapper_, SIGNAL(mapped(const QString &)), this, SLOT(handleMenuRequest(const QString &)));
Modified: trunk/sources/recentfiles.h
===================================================================
--- trunk/sources/recentfiles.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/recentfiles.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -28,7 +28,7 @@
// constructors, destructor
public:
- RecentFiles(const QString &, int = 10, QObject * = 0);
+ RecentFiles(const QString &, int = 10, QObject * = nullptr);
virtual ~RecentFiles();
private:
RecentFiles(const RecentFiles &);
Modified: trunk/sources/richtext/richtexteditor.cpp
===================================================================
--- trunk/sources/richtext/richtexteditor.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/richtext/richtexteditor.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -134,7 +134,7 @@
// Richtext simplification filter: Remove hard-coded font settings,
// <style> elements, <p> attributes other than 'align' and
// and unnecessary meta-information.
- QString simplifyRichTextFilter(const QString &in, bool *isPlainTextPtr = 0)
+ QString simplifyRichTextFilter(const QString &in, bool *isPlainTextPtr = nullptr)
{
unsigned elementCount = 0;
bool paragraphAlignmentFound = false;
@@ -180,10 +180,10 @@
{
Q_OBJECT
public:
- RichTextEditor(QWidget *parent = 0);
+ RichTextEditor(QWidget *parent = nullptr);
void setDefaultFont(QFont font);
- QToolBar *createToolBar(QWidget *parent = 0);
+ QToolBar *createToolBar(QWidget *parent = nullptr);
bool simplifyRichText() const { return m_simplifyRichText; }
public slots:
@@ -206,7 +206,7 @@
Q_OBJECT
public:
- AddLinkDialog(RichTextEditor *editor, QWidget *parent = 0);
+ AddLinkDialog(RichTextEditor *editor, QWidget *parent = nullptr);
~AddLinkDialog();
int showDialog();
@@ -275,7 +275,7 @@
Q_OBJECT
public:
- HtmlTextEdit(QWidget *parent = 0)
+ HtmlTextEdit(QWidget *parent = nullptr)
: QTextEdit(parent)
{}
@@ -367,7 +367,7 @@
void ColorAction::chooseColor()
{
- const QColor col = QColorDialog::getColor(m_color, 0);
+ const QColor col = QColorDialog::getColor(m_color, nullptr);
if (col.isValid() && col != m_color) {
setColor(col);
emit colorChanged(m_color);
@@ -379,7 +379,7 @@
Q_OBJECT
public:
RichTextEditorToolBar(RichTextEditor *editor,
- QWidget *parent = 0);
+ QWidget *parent = nullptr);
public slots:
void updateActions();
@@ -415,7 +415,7 @@
static QAction *createCheckableAction(const QIcon &icon, const QString &text,
QObject *receiver, const char *slot,
- QObject *parent = 0)
+ QObject *parent = nullptr)
{
QAction *result = new QAction(parent);
result->setIcon(icon);
@@ -477,22 +477,22 @@
m_align_left_action = createCheckableAction(
QIcon(),
- tr("Left Align"), editor, 0, alignment_group);
+ tr("Left Align"), editor, nullptr, alignment_group);
addAction(m_align_left_action);
m_align_center_action = createCheckableAction(
QIcon(),
- tr("Center"), editor, 0, alignment_group);
+ tr("Center"), editor, nullptr, alignment_group);
addAction(m_align_center_action);
m_align_right_action = createCheckableAction(
QIcon(),
- tr("Right Align"), editor, 0, alignment_group);
+ tr("Right Align"), editor, nullptr, alignment_group);
addAction(m_align_right_action);
m_align_justify_action = createCheckableAction(
QIcon(),
- tr("Justify"), editor, 0, alignment_group);
+ tr("Justify"), editor, nullptr, alignment_group);
addAction(m_align_justify_action);
m_align_justify_action -> setVisible( false );
@@ -629,7 +629,7 @@
void RichTextEditorToolBar::updateActions()
{
- if (m_editor == 0) {
+ if (m_editor == nullptr) {
setEnabled(false);
return;
}
Modified: trunk/sources/richtext/richtexteditor_p.h
===================================================================
--- trunk/sources/richtext/richtexteditor_p.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/richtext/richtexteditor_p.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -71,7 +71,7 @@
{
Q_OBJECT
public:
- explicit RichTextEditorDialog(QWidget *parent = 0);
+ explicit RichTextEditorDialog(QWidget *parent = nullptr);
~RichTextEditorDialog();
int showDialog();
Modified: trunk/sources/richtext/ui_addlinkdialog.h
===================================================================
--- trunk/sources/richtext/ui_addlinkdialog.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/richtext/ui_addlinkdialog.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -101,9 +101,9 @@
void retranslateUi(QDialog *AddLinkDialog)
{
- AddLinkDialog->setWindowTitle(QApplication::translate("AddLinkDialog", "Insert Link", 0));
- label->setText(QApplication::translate("AddLinkDialog", "Title:", 0));
- label_2->setText(QApplication::translate("AddLinkDialog", "URL:", 0));
+ AddLinkDialog->setWindowTitle(QApplication::translate("AddLinkDialog", "Insert Link", nullptr));
+ label->setText(QApplication::translate("AddLinkDialog", "Title:", nullptr));
+ label_2->setText(QApplication::translate("AddLinkDialog", "URL:", nullptr));
} // retranslateUi
};
Modified: trunk/sources/titleblock/dimensionwidget.h
===================================================================
--- trunk/sources/titleblock/dimensionwidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/dimensionwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -29,7 +29,7 @@
// constructors, destructor
public:
- TitleBlockDimensionWidget(bool, QWidget * parent = 0);
+ TitleBlockDimensionWidget(bool, QWidget * parent = nullptr);
virtual ~TitleBlockDimensionWidget();
private:
TitleBlockDimensionWidget(const TitleBlockDimensionWidget &);
Modified: trunk/sources/titleblock/gridlayoutanimation.h
===================================================================
--- trunk/sources/titleblock/gridlayoutanimation.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/gridlayoutanimation.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -26,7 +26,7 @@
class GridLayoutAnimation : public QVariantAnimation {
// Constructors, destructor
public:
- GridLayoutAnimation(QGraphicsGridLayout * = 0, QObject * = 0);
+ GridLayoutAnimation(QGraphicsGridLayout * = nullptr, QObject * = nullptr);
virtual ~GridLayoutAnimation();
// methods
Modified: trunk/sources/titleblock/helpercell.h
===================================================================
--- trunk/sources/titleblock/helpercell.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/helpercell.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -30,7 +30,7 @@
// constructor, destructor
public:
- HelperCell(QGraphicsItem * = 0);
+ HelperCell(QGraphicsItem * = nullptr);
virtual ~HelperCell();
private:
HelperCell(const HelperCell &);
@@ -48,7 +48,7 @@
virtual void setGeometry(const QRectF &);
virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF & = QSizeF()) const;
virtual QRectF boundingRect() const;
- void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0);
+ void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr);
virtual void setType(QET::TitleBlockColumnLength);
virtual void setActions(const QList<QAction *> &);
virtual QList<QAction *> actions() const;
Modified: trunk/sources/titleblock/integrationmovetemplateshandler.cpp
===================================================================
--- trunk/sources/titleblock/integrationmovetemplateshandler.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/integrationmovetemplateshandler.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -26,7 +26,7 @@
IntegrationMoveTitleBlockTemplatesHandler::IntegrationMoveTitleBlockTemplatesHandler(QWidget *parent) :
MoveTitleBlockTemplatesHandler(parent),
parent_widget_(parent),
- integ_dialog_(0)
+ integ_dialog_(nullptr)
{
}
Modified: trunk/sources/titleblock/integrationmovetemplateshandler.h
===================================================================
--- trunk/sources/titleblock/integrationmovetemplateshandler.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/integrationmovetemplateshandler.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -29,7 +29,7 @@
// constructors, destructor
public:
- IntegrationMoveTitleBlockTemplatesHandler(QWidget * = 0);
+ IntegrationMoveTitleBlockTemplatesHandler(QWidget * = nullptr);
virtual ~IntegrationMoveTitleBlockTemplatesHandler();
private:
IntegrationMoveTitleBlockTemplatesHandler(const IntegrationMoveTitleBlockTemplatesHandler &);
Modified: trunk/sources/titleblock/movetemplateshandler.h
===================================================================
--- trunk/sources/titleblock/movetemplateshandler.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/movetemplateshandler.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -32,7 +32,7 @@
// Constructors, destructor
public:
- MoveTitleBlockTemplatesHandler(QObject * = 0) {}
+ MoveTitleBlockTemplatesHandler(QObject * = nullptr) {}
virtual ~MoveTitleBlockTemplatesHandler() {}
private:
MoveTitleBlockTemplatesHandler(const MoveTitleBlockTemplatesHandler &);
Modified: trunk/sources/titleblock/qettemplateeditor.cpp
===================================================================
--- trunk/sources/titleblock/qettemplateeditor.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/qettemplateeditor.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -35,8 +35,8 @@
opened_from_file_(false),
read_only_(false),
duplicate_(false),
- tb_template_(0),
- logo_manager_(0)
+ tb_template_(nullptr),
+ logo_manager_(nullptr)
{
setWindowIcon(QET::Icons::QETLogo);
setAttribute(Qt::WA_DeleteOnClose);
Modified: trunk/sources/titleblock/qettemplateeditor.h
===================================================================
--- trunk/sources/titleblock/qettemplateeditor.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/qettemplateeditor.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -38,7 +38,7 @@
// constructor, destructor
public:
- QETTitleBlockTemplateEditor(QWidget * = 0);
+ QETTitleBlockTemplateEditor(QWidget * = nullptr);
virtual ~QETTitleBlockTemplateEditor();
private:
QETTitleBlockTemplateEditor(const QETTitleBlockTemplateEditor &);
Modified: trunk/sources/titleblock/splittedhelpercell.h
===================================================================
--- trunk/sources/titleblock/splittedhelpercell.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/splittedhelpercell.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -26,7 +26,7 @@
class SplittedHelperCell : public HelperCell {
Q_OBJECT
public:
- SplittedHelperCell(QGraphicsItem * = 0);
+ SplittedHelperCell(QGraphicsItem * = nullptr);
virtual ~SplittedHelperCell();
private:
SplittedHelperCell(const SplittedHelperCell &);
@@ -33,7 +33,7 @@
// methods
public:
- void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0);
+ void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr);
// attributes
QColor split_background_color; ///< Background color on the split side
Modified: trunk/sources/titleblock/templatecellsset.cpp
===================================================================
--- trunk/sources/titleblock/templatecellsset.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/templatecellsset.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -103,7 +103,7 @@
@return the top left cell within this set, or 0 if this set is empty
*/
TitleBlockTemplateVisualCell *TitleBlockTemplateCellsSet::topLeftCell() const {
- if (empty()) return(0);
+ if (empty()) return(nullptr);
if (count() == 1) return(first());
// look for cells at the top
@@ -118,7 +118,7 @@
// look for the cell at the left
int lowest_num_col = 100000;
- TitleBlockTemplateVisualCell *candidate = 0;
+ TitleBlockTemplateVisualCell *candidate = nullptr;
foreach (TitleBlockTemplateVisualCell *cell_view, candidates) {
if (TitleBlockCell *cell = cell_view -> cell()) {
if (cell -> num_col < lowest_num_col) {
@@ -134,7 +134,7 @@
@return the bottom right cell within this set, or 0 if this set is empty
*/
TitleBlockTemplateVisualCell *TitleBlockTemplateCellsSet::bottomRightCell() const {
- if (empty()) return(0);
+ if (empty()) return(nullptr);
if (count() == 1) return(first());
// look for cells at the bottom
@@ -147,7 +147,7 @@
// look for the cell at the right
qreal highest_right = -100000;
- TitleBlockTemplateVisualCell *candidate = 0;
+ TitleBlockTemplateVisualCell *candidate = nullptr;
foreach (TitleBlockTemplateVisualCell *cell_view, candidates) {
qreal right = cell_view -> geometry().right();
if (right > highest_right) {
Modified: trunk/sources/titleblock/templatecellwidget.h
===================================================================
--- trunk/sources/titleblock/templatecellwidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/templatecellwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -33,7 +33,7 @@
// constructor, destructor
public:
- TitleBlockTemplateCellWidget(TitleBlockTemplate * = 0, QWidget * = 0);
+ TitleBlockTemplateCellWidget(TitleBlockTemplate * = nullptr, QWidget * = nullptr);
virtual ~TitleBlockTemplateCellWidget();
private:
TitleBlockTemplateCellWidget(const TitleBlockTemplateCellWidget &);
Modified: trunk/sources/titleblock/templatecommands.cpp
===================================================================
--- trunk/sources/titleblock/templatecommands.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/templatecommands.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -30,7 +30,7 @@
*/
ModifyTitleBlockCellCommand::ModifyTitleBlockCellCommand(TitleBlockCell *cell, QUndoCommand *parent) :
QUndoCommand(parent),
- view_(0),
+ view_(nullptr),
modified_cell_(cell)
{
}
@@ -159,7 +159,7 @@
TitleBlockTemplateCommand::TitleBlockTemplateCommand(TitleBlockTemplate *tbtemplate, QUndoCommand *parent) :
QUndoCommand(parent),
tbtemplate_(tbtemplate),
- view_(0)
+ view_(nullptr)
{
}
@@ -223,7 +223,7 @@
@return a ModifyTemplateGridCommand object, or 0 if something went wrong.
*/
ModifyTemplateGridCommand *ModifyTemplateGridCommand::addRow(TitleBlockTemplate *tbtemplate, int index) {
- if (!tbtemplate) return(0);
+ if (!tbtemplate) return(nullptr);
// create the command itself
ModifyTemplateGridCommand *add_row_command = new ModifyTemplateGridCommand(tbtemplate);
@@ -244,7 +244,7 @@
@return a ModifyTemplateGridCommand object, or 0 if something went wrong.
*/
ModifyTemplateGridCommand *ModifyTemplateGridCommand::addColumn(TitleBlockTemplate *tbtemplate, int index) {
- if (!tbtemplate) return(0);
+ if (!tbtemplate) return(nullptr);
// create the command itself
ModifyTemplateGridCommand *add_column_command = new ModifyTemplateGridCommand(tbtemplate);
@@ -265,7 +265,7 @@
@return a ModifyTemplateGridCommand object, or 0 if something went wrong.
*/
ModifyTemplateGridCommand *ModifyTemplateGridCommand::deleteRow(TitleBlockTemplate *tbtemplate, int index) {
- if (!tbtemplate) return(0);
+ if (!tbtemplate) return(nullptr);
// create the command itself
ModifyTemplateGridCommand *del_row_command = new ModifyTemplateGridCommand(tbtemplate);
@@ -284,7 +284,7 @@
@return a ModifyTemplateGridCommand object, or 0 if something went wrong.
*/
ModifyTemplateGridCommand *ModifyTemplateGridCommand::deleteColumn(TitleBlockTemplate *tbtemplate, int index) {
- if (!tbtemplate) return(0);
+ if (!tbtemplate) return(nullptr);
// create the command itself
ModifyTemplateGridCommand *del_column_command = new ModifyTemplateGridCommand(tbtemplate);
@@ -588,7 +588,7 @@
*/
MergeCellsCommand::MergeCellsCommand(const TitleBlockTemplateCellsSet &merged_cells, TitleBlockTemplate *tbtemplate, QUndoCommand *parent) :
TitleBlockTemplateCommand(tbtemplate, parent),
- spanning_cell_(0),
+ spanning_cell_(nullptr),
row_span_after_(-1),
col_span_after_(-1)
{
@@ -713,16 +713,16 @@
TitleBlockCell *MergeCellsCommand::getBottomRightCell(const TitleBlockTemplateCellsSet &cells_set) {
// first, we get the visual cell at the bottom right
TitleBlockTemplateVisualCell *bottom_right_cell = cells_set.bottomRightCell();
- if (!bottom_right_cell) return(0);
+ if (!bottom_right_cell) return(nullptr);
// next, we get its logical cells: the painted one and the spanned ones (if any)
QSet<TitleBlockCell *> logical_cells = bottom_right_cell -> cells();
- if (logical_cells.isEmpty()) return(0);
+ if (logical_cells.isEmpty()) return(nullptr);
if (logical_cells.count() == 1) return(logical_cells.toList().first());
// we then look for the bottom right logical cell
int max_num_row = -1, max_num_col = -1;
- TitleBlockCell *candidate = 0;
+ TitleBlockCell *candidate = nullptr;
foreach(TitleBlockCell *cell, logical_cells) {
if (cell -> num_row > max_num_row) max_num_row = cell -> num_row;
if (cell -> num_col > max_num_col) max_num_col = cell -> num_col;
@@ -743,7 +743,7 @@
*/
SplitCellsCommand::SplitCellsCommand(const TitleBlockTemplateCellsSet &splitted_cells, TitleBlockTemplate *tbtemplate, QUndoCommand *parent) :
TitleBlockTemplateCommand(tbtemplate, parent),
- spanning_cell_(0),
+ spanning_cell_(nullptr),
row_span_before_(-1),
col_span_before_(-1)
{
@@ -832,7 +832,7 @@
// the spanned cells are not spanned anymore
foreach(TitleBlockCell *cell, spanned_cells_) {
- cell -> spanner_cell = 0;
+ cell -> spanner_cell = nullptr;
}
// the spanning cell does not span anymore
Modified: trunk/sources/titleblock/templatecommands.h
===================================================================
--- trunk/sources/titleblock/templatecommands.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/templatecommands.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -33,7 +33,7 @@
class ModifyTitleBlockCellCommand : public QUndoCommand {
// constructor, destructor
public:
- ModifyTitleBlockCellCommand(TitleBlockCell *, QUndoCommand * = 0);
+ ModifyTitleBlockCellCommand(TitleBlockCell *, QUndoCommand * = nullptr);
virtual ~ModifyTitleBlockCellCommand();
private:
ModifyTitleBlockCellCommand(const ModifyTitleBlockCellCommand &);
@@ -66,7 +66,7 @@
class TitleBlockTemplateCommand : public QUndoCommand {
// Constructors, destructor
public:
- TitleBlockTemplateCommand(TitleBlockTemplate * = 0, QUndoCommand * = 0);
+ TitleBlockTemplateCommand(TitleBlockTemplate * = nullptr, QUndoCommand * = nullptr);
virtual ~TitleBlockTemplateCommand();
private:
TitleBlockTemplateCommand(const TitleBlockTemplateCommand &);
@@ -100,7 +100,7 @@
// Constructors, destructor
public:
- ModifyTemplateGridCommand(TitleBlockTemplate * = 0, QUndoCommand * = 0);
+ ModifyTemplateGridCommand(TitleBlockTemplate * = nullptr, QUndoCommand * = nullptr);
virtual ~ModifyTemplateGridCommand();
private:
ModifyTemplateGridCommand(const ModifyTemplateGridCommand &);
@@ -140,7 +140,7 @@
class ModifyTemplateDimension : public TitleBlockTemplateCommand {
// Constructor, destructor
public:
- ModifyTemplateDimension(TitleBlockTemplate * = 0, QUndoCommand * = 0);
+ ModifyTemplateDimension(TitleBlockTemplate * = nullptr, QUndoCommand * = nullptr);
virtual ~ModifyTemplateDimension();
private:
ModifyTemplateDimension(const ModifyTemplateDimension &);
@@ -177,7 +177,7 @@
class MergeCellsCommand : public TitleBlockTemplateCommand {
// Constructor, destructor
public:
- MergeCellsCommand(const TitleBlockTemplateCellsSet &, TitleBlockTemplate * = 0, QUndoCommand * = 0);
+ MergeCellsCommand(const TitleBlockTemplateCellsSet &, TitleBlockTemplate * = nullptr, QUndoCommand * = nullptr);
virtual ~MergeCellsCommand();
// methods
@@ -211,7 +211,7 @@
class SplitCellsCommand : public TitleBlockTemplateCommand {
// Constructor, destructor
public:
- SplitCellsCommand(const TitleBlockTemplateCellsSet &, TitleBlockTemplate * = 0, QUndoCommand * = 0);
+ SplitCellsCommand(const TitleBlockTemplateCellsSet &, TitleBlockTemplate * = nullptr, QUndoCommand * = nullptr);
virtual ~SplitCellsCommand();
// methods
@@ -239,7 +239,7 @@
class ChangeTemplateInformationsCommand : public QUndoCommand {
// constructors, destructor
public:
- ChangeTemplateInformationsCommand(TitleBlockTemplate *, const QString &, const QString &, QUndoCommand * = 0);
+ ChangeTemplateInformationsCommand(TitleBlockTemplate *, const QString &, const QString &, QUndoCommand * = nullptr);
virtual ~ChangeTemplateInformationsCommand();
private:
ChangeTemplateInformationsCommand(const ChangeTemplateInformationsCommand &);
@@ -265,7 +265,7 @@
class CutTemplateCellsCommand : public TitleBlockTemplateCommand {
// constructors, destructor
public:
- CutTemplateCellsCommand(TitleBlockTemplate *, QUndoCommand * = 0);
+ CutTemplateCellsCommand(TitleBlockTemplate *, QUndoCommand * = nullptr);
virtual ~CutTemplateCellsCommand();
private:
CutTemplateCellsCommand(const CutTemplateCellsCommand &);
@@ -290,7 +290,7 @@
class PasteTemplateCellsCommand : public TitleBlockTemplateCommand {
// constructors, destructor
public:
- PasteTemplateCellsCommand(TitleBlockTemplate *, QUndoCommand * = 0);
+ PasteTemplateCellsCommand(TitleBlockTemplate *, QUndoCommand * = nullptr);
virtual ~PasteTemplateCellsCommand();
private:
PasteTemplateCellsCommand(const PasteTemplateCellsCommand &);
Modified: trunk/sources/titleblock/templatedeleter.h
===================================================================
--- trunk/sources/titleblock/templatedeleter.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/templatedeleter.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -27,7 +27,7 @@
Q_OBJECT
// Constructors, destructor
public:
- TitleBlockTemplateDeleter(const TitleBlockTemplateLocation &, QWidget * = 0);
+ TitleBlockTemplateDeleter(const TitleBlockTemplateLocation &, QWidget * = nullptr);
virtual ~TitleBlockTemplateDeleter();
private:
TitleBlockTemplateDeleter(const TitleBlockTemplateDeleter &);
Modified: trunk/sources/titleblock/templatelocation.cpp
===================================================================
--- trunk/sources/titleblock/templatelocation.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/templatelocation.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -113,7 +113,7 @@
if (collection_) {
return(collection_ -> parentProject());
}
- return(0);
+ return(nullptr);
}
/**
@@ -141,7 +141,7 @@
parentCollection() -> getTemplate(...).
*/
TitleBlockTemplate *TitleBlockTemplateLocation::getTemplate() const {
- if (!collection_ || name_.isEmpty()) return(0);
+ if (!collection_ || name_.isEmpty()) return(nullptr);
return(collection_ -> getTemplate(name_));
}
Modified: trunk/sources/titleblock/templatelocation.h
===================================================================
--- trunk/sources/titleblock/templatelocation.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/templatelocation.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -29,7 +29,7 @@
class TitleBlockTemplateLocation {
// constructor, destructor
public:
- TitleBlockTemplateLocation(const QString & = QString(), TitleBlockTemplatesCollection * = 0);
+ TitleBlockTemplateLocation(const QString & = QString(), TitleBlockTemplatesCollection * = nullptr);
virtual ~TitleBlockTemplateLocation();
// static methods
Modified: trunk/sources/titleblock/templatelocationchooser.h
===================================================================
--- trunk/sources/titleblock/templatelocationchooser.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/templatelocationchooser.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -29,7 +29,7 @@
Q_OBJECT
// Constructor, destructor
public:
- TitleBlockTemplateLocationChooser(const TitleBlockTemplateLocation &, QWidget * = 0);
+ TitleBlockTemplateLocationChooser(const TitleBlockTemplateLocation &, QWidget * = nullptr);
~TitleBlockTemplateLocationChooser();
private:
TitleBlockTemplateLocationChooser(const TitleBlockTemplateLocationChooser &);
Modified: trunk/sources/titleblock/templatelocationsaver.h
===================================================================
--- trunk/sources/titleblock/templatelocationsaver.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/templatelocationsaver.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -31,7 +31,7 @@
Q_OBJECT
// Constructor, destructor
public:
- TitleBlockTemplateLocationSaver(const TitleBlockTemplateLocation &, QWidget * = 0);
+ TitleBlockTemplateLocationSaver(const TitleBlockTemplateLocation &, QWidget * = nullptr);
~TitleBlockTemplateLocationSaver();
private:
TitleBlockTemplateLocationSaver(const TitleBlockTemplateLocationSaver &);
Modified: trunk/sources/titleblock/templatelogomanager.cpp
===================================================================
--- trunk/sources/titleblock/templatelogomanager.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/templatelogomanager.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -160,7 +160,7 @@
}
QListWidgetItem *current_item = logos_view_ -> currentItem();
- updateLogoInformations(current_item, 0);
+ updateLogoInformations(current_item, nullptr);
}
/**
@@ -181,9 +181,9 @@
*/
QString TitleBlockTemplateLogoManager::confirmLogoName(const QString &initial_name) {
QString name = initial_name;
- QDialog *rename_dialog = 0;
- QLabel *rd_label = 0;
- QLineEdit *rd_input = 0;
+ QDialog *rename_dialog = nullptr;
+ QLabel *rd_label = nullptr;
+ QLineEdit *rd_input = nullptr;
while (managed_template_ -> logos().contains(name)) {
if (!rename_dialog) {
rename_dialog = new QDialog(this);
Modified: trunk/sources/titleblock/templatelogomanager.h
===================================================================
--- trunk/sources/titleblock/templatelogomanager.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/templatelogomanager.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -28,7 +28,7 @@
Q_OBJECT
// Constructor, destructor
public:
- TitleBlockTemplateLogoManager(TitleBlockTemplate *, QWidget * = 0);
+ TitleBlockTemplateLogoManager(TitleBlockTemplate *, QWidget * = nullptr);
virtual ~TitleBlockTemplateLogoManager();
// methods
Modified: trunk/sources/titleblock/templatescollection.cpp
===================================================================
--- trunk/sources/titleblock/templatescollection.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/templatescollection.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -88,7 +88,7 @@
collection is not related to any project.
*/
QETProject *TitleBlockTemplatesCollection::parentProject() {
- return(0);
+ return(nullptr);
}
/**
@@ -195,7 +195,7 @@
// No? Do we even know of it?
if (!titleblock_templates_xml_.contains(template_name)) {
- return(0);
+ return(nullptr);
}
// Ok, we have its XML description, we have to generate a TitleBlockTemplate object
@@ -204,7 +204,7 @@
titleblock_templates_.insert(template_name, titleblock_template);
return(titleblock_template);
} else {
- return(0);
+ return(nullptr);
}
}
@@ -401,7 +401,7 @@
could not be loaded.
*/
TitleBlockTemplate *TitleBlockTemplatesFilesCollection::getTemplate(const QString &template_name) {
- if (!templates().contains(template_name)) return(0);
+ if (!templates().contains(template_name)) return(nullptr);
TitleBlockTemplate *tbtemplate = new TitleBlockTemplate();
QString tbt_file_path = path(template_name);
@@ -409,7 +409,7 @@
bool loading = tbtemplate -> loadFromXmlFile(tbt_file_path);
if (!loading) {
delete tbtemplate;
- return(0);
+ return(nullptr);
}
return(tbtemplate);
}
Modified: trunk/sources/titleblock/templatescollection.h
===================================================================
--- trunk/sources/titleblock/templatescollection.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/templatescollection.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -85,7 +85,7 @@
// Constructors, destructor
public:
- TitleBlockTemplatesProjectCollection(QETProject *, QObject *parent = 0);
+ TitleBlockTemplatesProjectCollection(QETProject *, QObject *parent = nullptr);
virtual ~TitleBlockTemplatesProjectCollection();
private:
TitleBlockTemplatesProjectCollection(const TitleBlockTemplatesProjectCollection &);
@@ -126,7 +126,7 @@
// Constructors, destructor
public:
- TitleBlockTemplatesFilesCollection(const QString &, QObject * = 0);
+ TitleBlockTemplatesFilesCollection(const QString &, QObject * = nullptr);
virtual ~TitleBlockTemplatesFilesCollection();
private:
TitleBlockTemplatesFilesCollection(const TitleBlockTemplatesFilesCollection &);
Modified: trunk/sources/titleblock/templateview.cpp
===================================================================
--- trunk/sources/titleblock/templateview.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/templateview.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -39,9 +39,9 @@
*/
TitleBlockTemplateView::TitleBlockTemplateView(QWidget *parent) :
QGraphicsView(parent),
- tbtemplate_(0),
- tbgrid_(0),
- form_(0),
+ tbtemplate_(nullptr),
+ tbgrid_(nullptr),
+ form_(nullptr),
preview_width_(DEFAULT_PREVIEW_WIDTH),
apply_columns_widths_count_(0),
apply_rows_heights_count_(0),
@@ -57,8 +57,8 @@
*/
TitleBlockTemplateView::TitleBlockTemplateView(QGraphicsScene *scene, QWidget *parent) :
QGraphicsView(scene, parent),
- tbtemplate_(0),
- tbgrid_(0),
+ tbtemplate_(nullptr),
+ tbgrid_(nullptr),
preview_width_(DEFAULT_PREVIEW_WIDTH),
apply_columns_widths_count_(0),
apply_rows_heights_count_(0),
Modified: trunk/sources/titleblock/templateview.h
===================================================================
--- trunk/sources/titleblock/templateview.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/templateview.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -34,8 +34,8 @@
// constructors, destructor
public:
- TitleBlockTemplateView(QWidget * = 0);
- TitleBlockTemplateView(QGraphicsScene *, QWidget * = 0);
+ TitleBlockTemplateView(QWidget * = nullptr);
+ TitleBlockTemplateView(QGraphicsScene *, QWidget * = nullptr);
virtual ~TitleBlockTemplateView();
private:
TitleBlockTemplateView(const TitleBlockTemplateView &);
@@ -69,8 +69,8 @@
void addRowBefore();
void addColumnAfter();
void addRowAfter();
- void editColumn(HelperCell * = 0);
- void editRow(HelperCell * = 0);
+ void editColumn(HelperCell * = nullptr);
+ void editRow(HelperCell * = nullptr);
void deleteColumn();
void deleteRow();
void mergeSelectedCells();
Modified: trunk/sources/titleblock/templatevisualcell.cpp
===================================================================
--- trunk/sources/titleblock/templatevisualcell.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/templatevisualcell.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -26,8 +26,8 @@
TitleBlockTemplateVisualCell::TitleBlockTemplateVisualCell(QGraphicsItem *parent) :
QGraphicsLayoutItem(),
QGraphicsItem(parent),
- template_(0),
- cell_(0)
+ template_(nullptr),
+ cell_(nullptr)
{
setGraphicsItem(this);
setFlag(QGraphicsItem::ItemIsSelectable, true);
Modified: trunk/sources/titleblock/templatevisualcell.h
===================================================================
--- trunk/sources/titleblock/templatevisualcell.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblock/templatevisualcell.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -29,7 +29,7 @@
class TitleBlockTemplateVisualCell : public QGraphicsLayoutItem, public QGraphicsItem {
// constructor, destructor
public:
- TitleBlockTemplateVisualCell(QGraphicsItem * parent = 0);
+ TitleBlockTemplateVisualCell(QGraphicsItem * parent = nullptr);
virtual ~TitleBlockTemplateVisualCell();
private:
TitleBlockTemplateVisualCell(const TitleBlockTemplateVisualCell &);
@@ -39,7 +39,7 @@
virtual void setGeometry(const QRectF &);
virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF & = QSizeF()) const;
virtual QRectF boundingRect() const;
- void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0);
+ void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr);
public slots:
void setTemplateCell(TitleBlockTemplate *, TitleBlockCell *);
Modified: trunk/sources/titleblockcell.cpp
===================================================================
--- trunk/sources/titleblockcell.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblockcell.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -9,7 +9,7 @@
row_span = col_span = 0;
applied_row_span = applied_col_span = 0;
span_state = TitleBlockCell::Enabled;
- spanner_cell = 0;
+ spanner_cell = nullptr;
display_label = true;
alignment = Qt::AlignCenter | Qt::AlignVCenter;
font_size = 9;
Modified: trunk/sources/titleblocktemplate.cpp
===================================================================
--- trunk/sources/titleblocktemplate.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblocktemplate.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -955,8 +955,8 @@
@return the cell located at (row, col)
*/
TitleBlockCell *TitleBlockTemplate::cell(int row, int col) const {
- if (row >= rows_heights_.count()) return(0);
- if (col >= columns_width_.count()) return(0);
+ if (row >= rows_heights_.count()) return(nullptr);
+ if (col >= columns_width_.count()) return(nullptr);
return(cells_[col][row]);
}
@@ -1188,7 +1188,7 @@
if (vector_logos_.contains(logo_name)) {
return vector_logos_[logo_name];
}
- return(0);
+ return(nullptr);
}
/**
@@ -1494,7 +1494,7 @@
void TitleBlockTemplate::forgetSpanning() {
for (int i = 0 ; i < columns_width_.count() ; ++ i) {
for (int j = 0 ; j < rows_heights_.count() ; ++ j) {
- cells_[i][j] -> spanner_cell = 0;
+ cells_[i][j] -> spanner_cell = nullptr;
}
}
}
@@ -1506,7 +1506,7 @@
void TitleBlockTemplate::forgetSpanning(TitleBlockCell *spanning_cell, bool modify_cell) {
if (!spanning_cell) return;
foreach (TitleBlockCell *spanned_cell, spannedCells(spanning_cell)) {
- spanned_cell -> spanner_cell = 0;
+ spanned_cell -> spanner_cell = nullptr;
}
if (modify_cell) {
spanning_cell -> row_span = 0;
Modified: trunk/sources/titleblocktemplate.h
===================================================================
--- trunk/sources/titleblocktemplate.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblocktemplate.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -36,7 +36,7 @@
// constructors, destructor
public:
- TitleBlockTemplate(QObject * = 0);
+ TitleBlockTemplate(QObject * = nullptr);
virtual ~TitleBlockTemplate();
private:
TitleBlockTemplate(const TitleBlockTemplate &);
@@ -43,7 +43,7 @@
// methods
public:
- TitleBlockCell *createCell(const TitleBlockCell * = 0);
+ TitleBlockCell *createCell(const TitleBlockCell * = nullptr);
static QFont fontForCell(const TitleBlockCell &);
bool loadFromXmlFile(const QString &);
bool loadFromXmlElement(const QDomElement &);
@@ -126,7 +126,7 @@
private:
void parseRows(const QString &);
void parseColumns(const QString &);
- bool checkCell(const QDomElement &, TitleBlockCell ** = 0);
+ bool checkCell(const QDomElement &, TitleBlockCell ** = nullptr);
void flushCells();
void initCells();
int lengthRange(int, int, const QList<int> &) const;
Modified: trunk/sources/titleblocktemplaterenderer.cpp
===================================================================
--- trunk/sources/titleblocktemplaterenderer.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblocktemplaterenderer.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -7,7 +7,7 @@
*/
TitleBlockTemplateRenderer::TitleBlockTemplateRenderer(QObject *parent) :
QObject(parent),
- titleblock_template_(0),
+ titleblock_template_(nullptr),
use_cache_(true),
last_known_titleblock_width_(-1)
{
Modified: trunk/sources/titleblocktemplaterenderer.h
===================================================================
--- trunk/sources/titleblocktemplaterenderer.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/titleblocktemplaterenderer.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -24,7 +24,7 @@
Q_OBJECT
public:
- TitleBlockTemplateRenderer(QObject * = 0);
+ TitleBlockTemplateRenderer(QObject * = nullptr);
virtual ~TitleBlockTemplateRenderer();
const TitleBlockTemplate *titleBlockTemplate() const;
void setTitleBlockTemplate(const TitleBlockTemplate *);
Modified: trunk/sources/ui/abstractelementpropertieseditorwidget.h
===================================================================
--- trunk/sources/ui/abstractelementpropertieseditorwidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/abstractelementpropertieseditorwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -30,7 +30,7 @@
{
Q_OBJECT
public:
- explicit AbstractElementPropertiesEditorWidget(QWidget *parent = 0);
+ explicit AbstractElementPropertiesEditorWidget(QWidget *parent = nullptr);
virtual void setElement(Element *element) =0;
protected:
Modified: trunk/sources/ui/borderpropertieswidget.h
===================================================================
--- trunk/sources/ui/borderpropertieswidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/borderpropertieswidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -34,7 +34,7 @@
Q_OBJECT
public:
- explicit BorderPropertiesWidget(const BorderProperties &bp, QWidget *parent = 0);
+ explicit BorderPropertiesWidget(const BorderProperties &bp, QWidget *parent = nullptr);
~BorderPropertiesWidget();
void setProperties(const BorderProperties &bp);
Modified: trunk/sources/ui/conductorpropertiesdialog.h
===================================================================
--- trunk/sources/ui/conductorpropertiesdialog.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/conductorpropertiesdialog.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -34,8 +34,8 @@
Q_OBJECT
public:
- explicit ConductorPropertiesDialog (Conductor *conductor, QWidget *parent = 0);
- static void PropertiesDialog (Conductor *conductor, QWidget *parent = 0);
+ explicit ConductorPropertiesDialog (Conductor *conductor, QWidget *parent = nullptr);
+ static void PropertiesDialog (Conductor *conductor, QWidget *parent = nullptr);
~ConductorPropertiesDialog();
ConductorProperties properties() const;
Modified: trunk/sources/ui/conductorpropertieswidget.h
===================================================================
--- trunk/sources/ui/conductorpropertieswidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/conductorpropertieswidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -33,8 +33,8 @@
Q_OBJECT
public:
- explicit ConductorPropertiesWidget(QWidget *parent = 0);
- explicit ConductorPropertiesWidget(const ConductorProperties &properties, QWidget *parent = 0);
+ explicit ConductorPropertiesWidget(QWidget *parent = nullptr);
+ explicit ConductorPropertiesWidget(const ConductorProperties &properties, QWidget *parent = nullptr);
~ConductorPropertiesWidget();
//METHODS
Modified: trunk/sources/ui/diagrampropertiesdialog.h
===================================================================
--- trunk/sources/ui/diagrampropertiesdialog.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/diagrampropertiesdialog.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -31,9 +31,9 @@
Q_OBJECT
public:
- DiagramPropertiesDialog(Diagram *diagram, QWidget *parent = 0);
+ DiagramPropertiesDialog(Diagram *diagram, QWidget *parent = nullptr);
- static void diagramPropertiesDialog(Diagram *diagram, QWidget *parent = 0);
+ static void diagramPropertiesDialog(Diagram *diagram, QWidget *parent = nullptr);
public slots:
void editAutonum ();
Modified: trunk/sources/ui/diagramselection.h
===================================================================
--- trunk/sources/ui/diagramselection.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/diagramselection.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -32,7 +32,7 @@
Q_OBJECT
public:
- explicit diagramselection(QETProject *prj, QWidget *parent = 0);
+ explicit diagramselection(QETProject *prj, QWidget *parent = nullptr);
~diagramselection();
QList<Diagram *> list_of_DiagramSelected();
Modified: trunk/sources/ui/dialogwaiting.h
===================================================================
--- trunk/sources/ui/dialogwaiting.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/dialogwaiting.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -30,7 +30,7 @@
Q_OBJECT
public:
- explicit DialogWaiting(QWidget *parent = 0);
+ explicit DialogWaiting(QWidget *parent = nullptr);
~DialogWaiting();
void setProgressBar(int val);
Modified: trunk/sources/ui/dynamicelementtextitemeditor.h
===================================================================
--- trunk/sources/ui/dynamicelementtextitemeditor.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/dynamicelementtextitemeditor.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -34,7 +34,7 @@
Q_OBJECT
public:
- explicit DynamicElementTextItemEditor(Element *element, QWidget *parent = 0);
+ explicit DynamicElementTextItemEditor(Element *element, QWidget *parent = nullptr);
~DynamicElementTextItemEditor();
virtual void setElement(Element *element);
Modified: trunk/sources/ui/elementinfopartwidget.h
===================================================================
--- trunk/sources/ui/elementinfopartwidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/elementinfopartwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -30,7 +30,7 @@
//METHODS
public:
- explicit ElementInfoPartWidget(QString key, QString translated_key, QWidget *parent = 0);
+ explicit ElementInfoPartWidget(QString key, QString translated_key, QWidget *parent = nullptr);
~ElementInfoPartWidget();
QString key () const {return key_;}
Modified: trunk/sources/ui/elementinfowidget.h
===================================================================
--- trunk/sources/ui/elementinfowidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/elementinfowidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -41,7 +41,7 @@
//METHODS
public:
- explicit ElementInfoWidget(Element *elmt, QWidget *parent = 0);
+ explicit ElementInfoWidget(Element *elmt, QWidget *parent = nullptr);
~ElementInfoWidget();
void setElement(Element *element);
Modified: trunk/sources/ui/elementpropertieswidget.h
===================================================================
--- trunk/sources/ui/elementpropertieswidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/elementpropertieswidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -31,7 +31,7 @@
Q_OBJECT
public:
- explicit ElementPropertiesWidget(Element *elmt, QWidget *parent = 0);
+ explicit ElementPropertiesWidget(Element *elmt, QWidget *parent = nullptr);
void setElement(Element *element);
void apply();
void reset();
Modified: trunk/sources/ui/formulaassistantdialog.h
===================================================================
--- trunk/sources/ui/formulaassistantdialog.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/formulaassistantdialog.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -30,7 +30,7 @@
Q_OBJECT
public:
- FormulaAssistantDialog(QWidget *parent = 0);
+ FormulaAssistantDialog(QWidget *parent = nullptr);
~FormulaAssistantDialog();
void setForbiddenVariables(QStringList list);
Modified: trunk/sources/ui/imagepropertieswidget.h
===================================================================
--- trunk/sources/ui/imagepropertieswidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/imagepropertieswidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -35,7 +35,7 @@
Q_OBJECT
public:
- explicit ImagePropertiesWidget(DiagramImageItem *image = nullptr, QWidget *parent = 0);
+ explicit ImagePropertiesWidget(DiagramImageItem *image = nullptr, QWidget *parent = nullptr);
~ImagePropertiesWidget();
void setImageItem (DiagramImageItem *image);
Modified: trunk/sources/ui/importelementdialog.h
===================================================================
--- trunk/sources/ui/importelementdialog.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/importelementdialog.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -30,7 +30,7 @@
Q_OBJECT
public:
- explicit ImportElementDialog(QWidget *parent = 0);
+ explicit ImportElementDialog(QWidget *parent = nullptr);
~ImportElementDialog();
QET::Action action() const;
Modified: trunk/sources/ui/linksingleelementwidget.h
===================================================================
--- trunk/sources/ui/linksingleelementwidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/linksingleelementwidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -43,7 +43,7 @@
///Methods
public:
- explicit LinkSingleElementWidget(Element *elmt, QWidget *parent = 0);
+ explicit LinkSingleElementWidget(Element *elmt, QWidget *parent = nullptr);
~LinkSingleElementWidget();
void setElement (Element *element);
Modified: trunk/sources/ui/masterpropertieswidget.h
===================================================================
--- trunk/sources/ui/masterpropertieswidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/masterpropertieswidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -45,7 +45,7 @@
Q_OBJECT
public:
- explicit MasterPropertiesWidget(Element *elmt, QWidget *parent = 0);
+ explicit MasterPropertiesWidget(Element *elmt, QWidget *parent = nullptr);
~MasterPropertiesWidget();
void setElement (Element *element);
Modified: trunk/sources/ui/projectpropertiesdialog.h
===================================================================
--- trunk/sources/ui/projectpropertiesdialog.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/projectpropertiesdialog.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -35,7 +35,7 @@
Autonum = 2
};
- ProjectPropertiesDialog(QETProject *project, QWidget *parent = 0);
+ ProjectPropertiesDialog(QETProject *project, QWidget *parent = nullptr);
~ProjectPropertiesDialog();
void exec();
void setCurrentPage(ProjectPropertiesDialog::Page);
Modified: trunk/sources/ui/reportpropertiewidget.h
===================================================================
--- trunk/sources/ui/reportpropertiewidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/reportpropertiewidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -31,7 +31,7 @@
Q_OBJECT
public:
- explicit ReportPropertieWidget(QString value, QWidget *parent = 0);
+ explicit ReportPropertieWidget(QString value, QWidget *parent = nullptr);
~ReportPropertieWidget();
void toSettings (QSettings &settings, const QString &prefix);
void setReportProperties (QString label);
Modified: trunk/sources/ui/shapegraphicsitempropertieswidget.h
===================================================================
--- trunk/sources/ui/shapegraphicsitempropertieswidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/shapegraphicsitempropertieswidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -35,7 +35,7 @@
Q_OBJECT
public:
- explicit ShapeGraphicsItemPropertiesWidget(QetShapeItem *item, QWidget *parent = 0);
+ explicit ShapeGraphicsItemPropertiesWidget(QetShapeItem *item, QWidget *parent = nullptr);
~ShapeGraphicsItemPropertiesWidget();
void setItem(QetShapeItem *shape);
Modified: trunk/sources/ui/titleblockpropertieswidget.cpp
===================================================================
--- trunk/sources/ui/titleblockpropertieswidget.cpp 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/titleblockpropertieswidget.cpp 2017-08-05 02:06:59 UTC (rev 5008)
@@ -305,10 +305,10 @@
connect(ui->m_tbt_cb, SIGNAL(currentIndexChanged(int)), this, SLOT(changeCurrentTitleBlockTemplate(int)));
- if (project!= NULL){
+ if (project!= nullptr){
keys_2 = project -> folioAutoNum().keys();
foreach (QString str, keys_2) { ui -> auto_page_cb -> addItem(str); }
- if (ui->auto_page_cb->currentText()==NULL)
+ if (ui->auto_page_cb->currentText()==nullptr)
ui->auto_page_cb->addItem(tr("Créer un Folio Numérotation Auto"));
}
else{
@@ -402,7 +402,7 @@
// get template
TitleBlockTemplate *tpl = collection -> getTemplate(ui -> m_tbt_cb -> currentText());
- if(tpl != 0) {
+ if(tpl != nullptr) {
// get all template fields
QStringList fields = tpl -> listOfVariables();
// set fields to additional_fields_ widget
Modified: trunk/sources/ui/titleblockpropertieswidget.h
===================================================================
--- trunk/sources/ui/titleblockpropertieswidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/titleblockpropertieswidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -39,9 +39,9 @@
Q_OBJECT
public:
- explicit TitleBlockPropertiesWidget(const TitleBlockProperties &titleblock = TitleBlockProperties(), bool current_date = false, QETProject *project = NULL, QWidget *parent = 0);
- explicit TitleBlockPropertiesWidget(TitleBlockTemplatesCollection *tbt_collection, const TitleBlockProperties &titleblock = TitleBlockProperties(), bool current_date = false, QETProject *project = NULL, QWidget *parent = 0);
- explicit TitleBlockPropertiesWidget(QList <TitleBlockTemplatesCollection *> tbt_collection, const TitleBlockProperties &titleblock = TitleBlockProperties(), bool current_date = false, QETProject *project = NULL, QWidget *parent = 0);
+ explicit TitleBlockPropertiesWidget(const TitleBlockProperties &titleblock = TitleBlockProperties(), bool current_date = false, QETProject *project = nullptr, QWidget *parent = nullptr);
+ explicit TitleBlockPropertiesWidget(TitleBlockTemplatesCollection *tbt_collection, const TitleBlockProperties &titleblock = TitleBlockProperties(), bool current_date = false, QETProject *project = nullptr, QWidget *parent = nullptr);
+ explicit TitleBlockPropertiesWidget(QList <TitleBlockTemplatesCollection *> tbt_collection, const TitleBlockProperties &titleblock = TitleBlockProperties(), bool current_date = false, QETProject *project = nullptr, QWidget *parent = nullptr);
~TitleBlockPropertiesWidget();
void setProperties(const TitleBlockProperties &properties);
Modified: trunk/sources/ui/xrefpropertieswidget.h
===================================================================
--- trunk/sources/ui/xrefpropertieswidget.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/ui/xrefpropertieswidget.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -34,7 +34,7 @@
Q_OBJECT
public:
- XRefPropertiesWidget(QHash <QString, XRefProperties> properties = QHash <QString, XRefProperties>(), QWidget *parent = 0);
+ XRefPropertiesWidget(QHash <QString, XRefProperties> properties = QHash <QString, XRefProperties>(), QWidget *parent = nullptr);
~XRefPropertiesWidget();
void setProperties (const QHash <QString, XRefProperties> &properties);
Modified: trunk/sources/undocommand/linkelementcommand.h
===================================================================
--- trunk/sources/undocommand/linkelementcommand.h 2017-08-04 13:36:57 UTC (rev 5007)
+++ trunk/sources/undocommand/linkelementcommand.h 2017-08-05 02:06:59 UTC (rev 5008)
@@ -31,7 +31,7 @@
class LinkElementCommand : public QUndoCommand
{
public:
- LinkElementCommand(Element *element_, QUndoCommand *parent = 0);
+ LinkElementCommand(Element *element_, QUndoCommand *parent = nullptr);
virtual int id() const {return 2;}
virtual bool mergeWith(const QUndoCommand *other);