aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clazy warnings.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-02-13 12:24:26 +02:00
parent 0d3f073c92
commit 107af20c80
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/valentina/dialogs/vabstractlayoutdialog.cpp
View File

@ -31,11 +31,11 @@
//must be the same order as PaperSizeTemplate constants //must be the same order as PaperSizeTemplate constants
const VAbstractLayoutDialog::FormatsVector VAbstractLayoutDialog::pageFormatNames = const VAbstractLayoutDialog::FormatsVector VAbstractLayoutDialog::pageFormatNames =
VAbstractLayoutDialog::FormatsVector () << QLatin1String("A0") VAbstractLayoutDialog::FormatsVector () << QStringLiteral("A0")
<< QLatin1String("A1") << QStringLiteral("A1")
<< QLatin1String("A2") << QStringLiteral("A2")
<< QLatin1String("A3") << QStringLiteral("A3")
<< QLatin1String("A4") << QStringLiteral("A4")
<< QApplication::translate("VAbstractLayoutDialog", "Letter") << QApplication::translate("VAbstractLayoutDialog", "Letter")
<< QApplication::translate("VAbstractLayoutDialog", "Legal") << QApplication::translate("VAbstractLayoutDialog", "Legal")
<< QApplication::translate("VAbstractLayoutDialog", "Roll 24in") << QApplication::translate("VAbstractLayoutDialog", "Roll 24in")
@ -59,7 +59,7 @@ void VAbstractLayoutDialog::InitTemplates(QComboBox *comboBoxTemplates)
SCASSERT(comboBoxTemplates != nullptr) SCASSERT(comboBoxTemplates != nullptr)
const QIcon icoPaper("://icon/16x16/template.png"); const QIcon icoPaper("://icon/16x16/template.png");
const QIcon icoRoll("://icon/16x16/roll.png"); const QIcon icoRoll("://icon/16x16/roll.png");
const QString pdi = QString("(%1ppi)").arg(PrintDPI); const QString pdi = QStringLiteral("(%1ppi)").arg(PrintDPI);
auto cntr = static_cast<VIndexType>(PaperSizeTemplate::A0); auto cntr = static_cast<VIndexType>(PaperSizeTemplate::A0);
for(const auto& v : pageFormatNames) for(const auto& v : pageFormatNames)
@ -81,7 +81,7 @@ void VAbstractLayoutDialog::InitTemplates(QComboBox *comboBoxTemplates)
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QSizeF VAbstractLayoutDialog::GetTemplateSize(const PaperSizeTemplate &tmpl, const Unit &unit) const QSizeF VAbstractLayoutDialog::GetTemplateSize(PaperSizeTemplate tmpl, Unit unit) const
{ {
qreal width = 0; qreal width = 0;
qreal height = 0; qreal height = 0;

2
src/app/valentina/dialogs/vabstractlayoutdialog.h
View File

@ -55,13 +55,13 @@ public:
Custom = 15}; Custom = 15};
explicit VAbstractLayoutDialog(QWidget *parent = nullptr); explicit VAbstractLayoutDialog(QWidget *parent = nullptr);
QSizeF GetTemplateSize(PaperSizeTemplate tmpl, Unit unit) const;
protected: protected:
typedef QStringList FormatsVector; typedef QStringList FormatsVector;
const static FormatsVector pageFormatNames; const static FormatsVector pageFormatNames;
typedef int VIndexType; typedef int VIndexType;
QSizeF GetTemplateSize(const PaperSizeTemplate &tmpl, const Unit &unit) const;
QSizeF RoundTemplateSize(qreal width, qreal height, Unit unit) const; QSizeF RoundTemplateSize(qreal width, qreal height, Unit unit) const;
void InitTemplates(QComboBox *comboBoxTemplates); void InitTemplates(QComboBox *comboBoxTemplates);

2
src/libs/vlayout/vposter.h
View File

@ -57,6 +57,8 @@ struct PosterData
QRect rect; // rect section QRect rect; // rect section
}; };
Q_DECLARE_TYPEINFO(PosterData, Q_MOVABLE_TYPE);
// cppcheck-suppress noConstructor // cppcheck-suppress noConstructor
class VPoster class VPoster
{ {