← Back to branch summary

~dismine/valentina/valentina

« back to all changes in this revision

Viewing changes to src/libs/vmisc/def.h

  • Committer: Roman Telezhynskyi
  • Date: 2017-07-01 18:38:26 UTC
  • Revision ID: git-v1:c99364fc1931cdf0d35d698fffb4979116f140f0
Fixed issue #715. Build fails with Qt 5.9.1 / clang / macOS.
(grafted from d78ca13c4891ccf3542b0704a7d66af0f9b02938)

--HG--
branch : develop
extra : source : d78ca13c4891ccf3542b0704a7d66af0f9b02938
extra : amend_source : f364afa4d6a7043355ac928a4496e6cb07ec808a

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libs/vmisc/def.h
375
375
 
376
376
extern const qreal PrintDPI;
377
377
 
378
 
double ToPixel(double val, const Unit &unit) Q_REQUIRED_RESULT;
379
 
double FromPixel(double pix, const Unit &unit) Q_REQUIRED_RESULT;
 
378
Q_REQUIRED_RESULT double ToPixel(double val, const Unit &unit);
 
379
Q_REQUIRED_RESULT double FromPixel(double pix, const Unit &unit);
380
380
 
381
 
qreal UnitConvertor(qreal value, const Unit &from, const Unit &to) Q_REQUIRED_RESULT;
 
381
Q_REQUIRED_RESULT qreal UnitConvertor(qreal value, const Unit &from, const Unit &to);
382
382
 
383
383
void InitLanguages(QComboBox *combobox);
384
 
QStringList SupportedLocales() Q_REQUIRED_RESULT;
385
 
 
386
 
QString StrippedName(const QString &fullFileName) Q_REQUIRED_RESULT;
387
 
QString RelativeMPath(const QString &patternPath, const QString &absoluteMPath) Q_REQUIRED_RESULT;
388
 
QString AbsoluteMPath(const QString &patternPath, const QString &relativeMPath) Q_REQUIRED_RESULT;
389
 
 
390
 
QSharedPointer<QPrinter> PreparePrinter(const QPrinterInfo &info,
391
 
                                        QPrinter::PrinterMode mode = QPrinter::ScreenResolution) Q_REQUIRED_RESULT;
 
384
Q_REQUIRED_RESULT QStringList SupportedLocales();
 
385
 
 
386
Q_REQUIRED_RESULT QString StrippedName(const QString &fullFileName);
 
387
Q_REQUIRED_RESULT QString RelativeMPath(const QString &patternPath, const QString &absoluteMPath);
 
388
Q_REQUIRED_RESULT QString AbsoluteMPath(const QString &patternPath, const QString &relativeMPath);
 
389
 
 
390
Q_REQUIRED_RESULT QSharedPointer<QPrinter> PreparePrinter(const QPrinterInfo &info,
 
391
                                                          QPrinter::PrinterMode mode = QPrinter::ScreenResolution);
392
392
 
393
393
QMarginsF GetMinPrinterFields(const QSharedPointer<QPrinter> &printer);
394
394
QMarginsF GetPrinterFields(const QSharedPointer<QPrinter> &printer);
395
395
 
396
 
QPixmap darkenPixmap(const QPixmap &pixmap) Q_REQUIRED_RESULT;
 
396
Q_REQUIRED_RESULT QPixmap darkenPixmap(const QPixmap &pixmap);
397
397
 
398
398
void ShowInGraphicalShell(const QString &filePath);
399
399
 
400
 
static inline bool VFuzzyComparePossibleNulls(double p1, double p2) Q_REQUIRED_RESULT;
 
400
Q_REQUIRED_RESULT static inline bool VFuzzyComparePossibleNulls(double p1, double p2);
401
401
static inline bool VFuzzyComparePossibleNulls(double p1, double p2)
402
402
{
403
403
    if(qFuzzyIsNull(p1))