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

List:       kde-commits
Subject:    [calligra] libs/flake: Only static const integral data members can be initialized within a class (Fi
From:       Andrius da Costa Ribas <andriusmao () gmail ! com>
Date:       2013-11-30 19:14:37
Message-ID: E1Vmpzx-0002Dv-AJ () scm ! kde ! org
[Download RAW message or body]

Git commit 333c266f05ca3b40608eecdf5d4d6b87ed8322bb by Andrius da Costa Ribas.
Committed on 30/11/2013 at 19:10.
Pushed by andriusr into branch 'master'.

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

M  +5    -0    libs/flake/KoAnnotationLayoutManager.cpp
M  +3    -3    libs/flake/KoAnnotationLayoutManager.h

http://commits.kde.org/calligra/333c266f05ca3b40608eecdf5d4d6b87ed8322bb

diff --git a/libs/flake/KoAnnotationLayoutManager.cpp \
b/libs/flake/KoAnnotationLayoutManager.cpp index 5117163..360e93a 100644
--- a/libs/flake/KoAnnotationLayoutManager.cpp
+++ b/libs/flake/KoAnnotationLayoutManager.cpp
@@ -201,3 +201,8 @@ void KoAnnotationLayoutManager::layoutAnnotationShapes()
         ++it;
     }
 }
+
+// only static const integral data members can be initialized within a class
+const qreal KoAnnotationLayoutManager::shapeSpace = 10.0; // Distance between \
annotation shapes. +const qreal KoAnnotationLayoutManager::shapeWidth = 200.0; // \
Annotation shapes width. +const qreal KoAnnotationLayoutManager::connectionPointLines \
= 50.0; //Connection point of lines from shape to this point and from this point to \
                refText psoition.
diff --git a/libs/flake/KoAnnotationLayoutManager.h \
b/libs/flake/KoAnnotationLayoutManager.h index f8413da..9248a5d 100644
--- a/libs/flake/KoAnnotationLayoutManager.h
+++ b/libs/flake/KoAnnotationLayoutManager.h
@@ -36,10 +36,10 @@ class FLAKE_EXPORT KoAnnotationLayoutManager: public QObject
 {
     Q_OBJECT
 public:
-    static const qreal shapeSpace = 10.0; // Distance between annotation shapes.
-    static const qreal shapeWidth = 200.0; // Annotation shapes width.
+    static const qreal shapeSpace; // Distance between annotation shapes.
+    static const qreal shapeWidth; // Annotation shapes width.
     //Connection point of lines from shape to this point and from this point to \
                refText psoition.
-    static const qreal connectionPointLines = 50.0;
+    static const qreal connectionPointLines;
 
     KoAnnotationLayoutManager(QObject *parent = 0);
     virtual ~KoAnnotationLayoutManager();


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