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

List:       kde-commits
Subject:    [calligra] words/part: 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:33
Message-ID: E1Vmpzt-0002Dv-3L () scm ! kde ! org
[Download RAW message or body]

Git commit 872b8b1c7f375a2a547bcea87493a5c19b4fb436 by Andrius da Costa Ribas.
Committed on 30/11/2013 at 18:01.
Pushed by andriusr into branch 'master'.

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

M  +1    -0    words/part/KWView.cpp
M  +1    -1    words/part/KWView.h

http://commits.kde.org/calligra/872b8b1c7f375a2a547bcea87493a5c19b4fb436

diff --git a/words/part/KWView.cpp b/words/part/KWView.cpp
index 6120150..ef7bdff 100644
--- a/words/part/KWView.cpp
+++ b/words/part/KWView.cpp
@@ -1055,3 +1055,4 @@ void KWView::addImages(const QList<QImage> &imageList, const \
QPoint &insertAt)  }
 }
 
+const qreal KWView::AnnotationAreaWidth = 200.0; // only static const integral data \
                members can be initialized within a class
diff --git a/words/part/KWView.h b/words/part/KWView.h
index 60c4094..b724076 100644
--- a/words/part/KWView.h
+++ b/words/part/KWView.h
@@ -61,7 +61,7 @@ class WORDS_EXPORT KWView : public KoView
     Q_OBJECT
 
 public:
-    static const qreal AnnotationAreaWidth = 200.0;
+    static const qreal AnnotationAreaWidth;
 
     /**
      * Construct a new view on the words document.


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