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

GCC warnings.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-11-05 14:32:47 +02:00
parent 840a4a9d92
commit 7f065cac89
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/vmisc/vsettings.cpp
View File

@ -295,11 +295,11 @@ void VSettings::SetLayoutPaperWidth(qreal value)
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
quint32 VSettings::GetLayoutShift() const qreal VSettings::GetLayoutShift() const
{ {
const quint32 def = GetDefLayoutShift(); const qreal def = GetDefLayoutShift();
bool ok = false; bool ok = false;
const quint32 shift = value(SettingLayoutShift, def).toUInt(&ok); const qreal shift = value(SettingLayoutShift, def).toDouble(&ok);
if (ok) if (ok)
{ {
return shift; return shift;
@ -317,17 +317,17 @@ qreal VSettings::GetDefLayoutShift()
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VSettings::SetLayoutShift(quint32 value) void VSettings::SetLayoutShift(qreal value)
{ {
setValue(SettingLayoutShift, value); setValue(SettingLayoutShift, value);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
quint32 VSettings::GetLayoutWidth() const qreal VSettings::GetLayoutWidth() const
{ {
const quint32 def = GetDefLayoutWidth(); const qreal def = GetDefLayoutWidth();
bool ok = false; bool ok = false;
const quint32 lWidth = value(SettingLayoutWidth, def).toUInt(&ok); const qreal lWidth = value(SettingLayoutWidth, def).toDouble(&ok);
if (ok) if (ok)
{ {
return lWidth; return lWidth;
@ -345,7 +345,7 @@ qreal VSettings::GetDefLayoutWidth()
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VSettings::SetLayoutWidth(quint32 value) void VSettings::SetLayoutWidth(qreal value)
{ {
setValue(SettingLayoutWidth, value); setValue(SettingLayoutWidth, value);
} }

8
src/libs/vmisc/vsettings.h
View File

@ -89,13 +89,13 @@ public:
qreal GetLayoutPaperWidth() const; qreal GetLayoutPaperWidth() const;
void SetLayoutPaperWidth(qreal value); void SetLayoutPaperWidth(qreal value);
quint32 GetLayoutShift() const; qreal GetLayoutShift() const;
static qreal GetDefLayoutShift(); static qreal GetDefLayoutShift();
void SetLayoutShift(quint32 value); void SetLayoutShift(qreal value);
quint32 GetLayoutWidth() const; qreal GetLayoutWidth() const;
static qreal GetDefLayoutWidth(); static qreal GetDefLayoutWidth();
void SetLayoutWidth(quint32 value); void SetLayoutWidth(qreal value);
Cases GetLayoutGroup() const; Cases GetLayoutGroup() const;
static Cases GetDefLayoutGroup(); static Cases GetDefLayoutGroup();