[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra] /: Only static const integral data members can be initialized within a class (Fix for MSV
From:       Andrius da Costa Ribas <andriusmao () gmail ! com>
Date:       2013-11-30 21:23:27
Message-ID: E1Vms0d-0007gB-Fu () scm ! kde ! org
[Download RAW message or body]

Git commit 879a3e4fcc848d7d08cb2b3aabf11321b0be5656 by Andrius da Costa Ribas.
Committed on 30/11/2013 at 21:02.
Pushed by andriusr into branch 'master'.

Only static const integral data members can be initialized within a class (Fix for \
MSVC build) (again).

M  +3    -0    plugins/textshape/AnnotationTextShape.cpp
M  +2    -2    plugins/textshape/AnnotationTextShape.h
M  +2    -0    words/part/KWCanvasBase.cpp
M  +1    -1    words/part/KWCanvasBase.h

http://commits.kde.org/calligra/879a3e4fcc848d7d08cb2b3aabf11321b0be5656

diff --git a/plugins/textshape/AnnotationTextShape.cpp \
b/plugins/textshape/AnnotationTextShape.cpp index 9941260..311d6bf 100644
--- a/plugins/textshape/AnnotationTextShape.cpp
+++ b/plugins/textshape/AnnotationTextShape.cpp
@@ -169,3 +169,6 @@ QString AnnotationTextShape::dateString() const
 {
     return m_dateString;
 }
+
+const qreal AnnotationTextShape::HeaderSpace = 25.0; // The space needed for the \
annotation header. +const qreal AnnotationTextShape::HeaderFontSize = 6.0;
diff --git a/plugins/textshape/AnnotationTextShape.h \
b/plugins/textshape/AnnotationTextShape.h index 91e766e..91f8751 100644
--- a/plugins/textshape/AnnotationTextShape.h
+++ b/plugins/textshape/AnnotationTextShape.h
@@ -37,8 +37,8 @@ class AnnotationTextShape : public TextShape
 {
 public:
     // Some constants
-    static const qreal  HeaderSpace = 25.0; // The space needed for the annotation \
                header.
-    static const qreal  HeaderFontSize = 6.0;
+    static const qreal  HeaderSpace; // The space needed for the annotation header.
+    static const qreal  HeaderFontSize;
 
     // For now we should give these parameters for TextShape.
     AnnotationTextShape(KoInlineTextObjectManager *inlineTextObjectManager,
diff --git a/words/part/KWCanvasBase.cpp b/words/part/KWCanvasBase.cpp
index 6969c70..d01db66 100644
--- a/words/part/KWCanvasBase.cpp
+++ b/words/part/KWCanvasBase.cpp
@@ -797,3 +797,5 @@ QPoint KWCanvasBase::documentOffset() const
 {
     return m_documentOffset;
 }
+
+const qreal KWCanvasBase::AnnotationAreaWidth = 200.0; // only static const integral \
                data members can be initialized within a class
diff --git a/words/part/KWCanvasBase.h b/words/part/KWCanvasBase.h
index aaeba14..1d2ca3c 100644
--- a/words/part/KWCanvasBase.h
+++ b/words/part/KWCanvasBase.h
@@ -48,7 +48,7 @@ class KWPageCacheManager;
 class WORDS_EXPORT KWCanvasBase : public KoCanvasBase
 {
 public:
-    static const qreal AnnotationAreaWidth = 200.0;
+    static const qreal AnnotationAreaWidth;
 
     explicit KWCanvasBase(KWDocument *document, QObject *parent = 0);
     ~KWCanvasBase();


[prev in list] [next in list] [prev in thread] [next in thread]