Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-07 08:00:14 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-10-07 08:48:46 (GMT) |
| commit | 138aa844b47b32ba1d3651e041ca11d8e3a12d6c (patch) | |
| tree | e7bcc478d0059860a623bd531e9dec44c62ede1c /Swift/QtUI | |
| parent | 113da29e2e29d24d863749d4d40e11f95e4f757d (diff) | |
| download | swift-contrib-138aa844b47b32ba1d3651e041ca11d8e3a12d6c.zip swift-contrib-138aa844b47b32ba1d3651e041ca11d8e3a12d6c.tar.bz2 | |
Fix clang compiler warning related to inititalization order of members in ctor.
Change-Id: I5cbbacce8dc75a38646ebfdc72e5a2c9aec184f6
Diffstat (limited to 'Swift/QtUI')
| -rw-r--r-- | Swift/QtUI/QtVCardWidget/QtVCardGeneralField.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardGeneralField.cpp b/Swift/QtUI/QtVCardWidget/QtVCardGeneralField.cpp index 74ebd47..74d9c59 100644 --- a/Swift/QtUI/QtVCardWidget/QtVCardGeneralField.cpp +++ b/Swift/QtUI/QtVCardWidget/QtVCardGeneralField.cpp @@ -1,57 +1,57 @@ /* * Copyright (c) 2012-2014 Tobias Markmann * Licensed under the simplified BSD license. * See Documentation/Licenses/BSD-simplified.txt for more information. */ /* * Copyright (c) 2014 Kevin Smith and Remko Tronçon * Licensed under the GNU General Public License v3. * See Documentation/Licenses/GPLv3.txt for more information. */ #include <Swift/QtUI/QtVCardWidget/QtVCardGeneralField.h> #include <cassert> #include <QHBoxLayout> namespace Swift { QtVCardGeneralField::QtVCardGeneralField(QWidget* parent, QGridLayout* layout, bool editable, int row, QString label, bool preferrable, bool taggable) : - QWidget(parent), editable(editable), preferrable(preferrable), taggable(taggable), starVisible(false), layout(layout), row(row), preferredCheckBox(0), label(0), labelText(label), + QWidget(parent), editable(editable), preferrable(preferrable), starVisible(false), taggable(taggable), layout(layout), row(row), preferredCheckBox(0), label(0), labelText(label), tagComboBox(0), tagLabel(NULL), closeButton(0) { } QtVCardGeneralField::~QtVCardGeneralField() { } void QtVCardGeneralField::initialize() { if (preferrable) { preferredCheckBox = new QCheckBox(this); preferredCheckBox->setToolTip(tr("Stars can be used to mark preferred contact details.")); preferredCheckBox->setStyleSheet( "QCheckBox::indicator { width: 18px; height: 18px; }" "QCheckBox::indicator:checked { image: url(:/icons/star-checked.png); }" "QCheckBox::indicator:unchecked { image: url(:/icons/star-unchecked); }" ); layout->addWidget(preferredCheckBox, row, 0, Qt::AlignVCenter); childWidgets << preferredCheckBox; } label = new QLabel(this); label->setText(labelText); layout->addWidget(label, row, 1, Qt::AlignVCenter | Qt::AlignRight); tagLabel = new QLabel(this); tagLabel->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard); tagComboBox = new QtTagComboBox(this); closeButton = new QtCloseButton(this); connect(closeButton, SIGNAL(clicked()), SLOT(handleCloseButtonClicked())); QHBoxLayout* tagLayout = new QHBoxLayout(); tagLayout->addWidget(tagLabel); tagLayout->addWidget(tagComboBox); setupContentWidgets(); |