Msvc fixes

libs/libcanvas/src/baseobjectview.h

@@ -136,16 +136,16 @@ class __libcanvas BaseObjectView: public QObject, public QGraphicsItemGroup {
 		void fade(bool fd_in, int duration, int loop_cnt = 1, qreal final_opacity = 1);
 
 	public:
-		static constexpr double VertSpacing=2.0,
-		HorizSpacing=2.0,
-		DefaultFontSize=10.0,
-		ObjectBorderWidth=1.00,
-		MaxDpiFactor=1.4,
-		ObjectShadowXPos=8,
-		ObjectShadowYPos=8;
-
-		static constexpr int ObjectAlphaChannel=128,
-		ObjectShadowAlphaChannel=50;
+		static constexpr double VertSpacing=2.0;
+		static constexpr double HorizSpacing=2.0;
+		static constexpr double DefaultFontSize=10.0;
+		static constexpr double ObjectBorderWidth=1.00;
+		static constexpr double MaxDpiFactor=1.4;
+		static constexpr double ObjectShadowXPos=8;
+		static constexpr double ObjectShadowYPos=8;
+
+		static constexpr int ObjectAlphaChannel=128;
+		static constexpr int ObjectShadowAlphaChannel=50;
 
 		BaseObjectView(BaseObject *object=nullptr);
 		virtual ~BaseObjectView();

libs/libcanvas/src/basetableview.h

@@ -64,10 +64,10 @@ class __libcanvas BaseTableView: public BaseObjectView {
 		*ext_attribs;
 
 		//! brief Indicates if the extended attributes body should be hidden
-		static bool hide_ext_attribs,
+		static bool hide_ext_attribs;
 
 		//! brief Indicates if the tag object should be hidden
-		hide_tags;
+		static bool hide_tags;
 
 		//! brief Controls the maximum amount of attributes visible per page (columns/references + extended attributes)
 		static unsigned attribs_per_page[2];

libs/libcanvas/src/objectsscene.h

@@ -44,25 +44,25 @@ class __libcanvas ObjectsScene: public QGraphicsScene {
 		};
 
 		//! \brief Stores the default grid line color
-		static const QColor DefaultGridColor,
+		static const QColor DefaultGridColor;
 
 		//! \brief Stores the default grid line color
-		DefaultCanvasColor,
+		static const QColor DefaultCanvasColor;
 
 		//! \brief Stores the default page delimiter lines color
-		DefaultDelimitersColor;
+		static const QColor DefaultDelimitersColor;
 
 	private:
 		static GridPattern grid_pattern;
 
 		//! \brief Stores the grid line color
-		static QColor grid_color,
+		static QColor grid_color;
 
 		//! \brief Stores the canvas background color
-		canvas_color,
+		static QColor canvas_color;
 
 		//! \brief Stores the page delimiter lines color
-		delimiters_color;
+		static QColor delimiters_color;
 
 		//! \brief Holds the names of the layers on the scene used to separate in the objects on the canvas
 		QStringList layers,
@@ -83,9 +83,9 @@ class __libcanvas ObjectsScene: public QGraphicsScene {
 
 		show_scene_limits;
 
-		static constexpr int SceneMoveStep=20,
-		SceneMoveTimeout=20,
-		SceneMoveThreshold=100;
+		static constexpr int SceneMoveStep=20;
+		static constexpr int SceneMoveTimeout=20;
+		static constexpr int SceneMoveThreshold=100;
 
 		//! \brief Timer responsible to move the scene
 		QTimer scene_move_timer,
@@ -107,37 +107,36 @@ class __libcanvas ObjectsScene: public QGraphicsScene {
 		int scene_move_dx, scene_move_dy;
 
 		//! \brief Object alignemnt, grid showing, page delimiter showing options
-		static bool align_objs_grid,
+		static bool align_objs_grid;
+		static bool show_grid;
 
-		show_grid,
-
-		show_page_delim,
+		static bool show_page_delim;
 
 		//! \brief Indicates if the corner move is enabled for the scene
-		corner_move,
+		static bool corner_move;
 
 		/*! \brief Indicates that panning mode and range selection model are activate in inverse mode.
 		By default panning model is activated with a single left-click and range selection with SHIFT + left-click */
-		invert_rangesel_trigger,
+		static bool invert_rangesel_trigger;
 
-		lock_delim_scale;
+		static bool lock_delim_scale;
 
 		//! \brief Scene grid size
-		static unsigned grid_size,
+		static unsigned grid_size;
 
 		//! \brief The number of pages in which the scene rect is expanded
-		expansion_factor;
+		static unsigned expansion_factor;
 
 		//! \brief Used to store the canvas/printer page layout (size, orientation, margins)
 		static QPageLayout page_layout;
 
-		static double delimiter_scale,
+		static double delimiter_scale;
 
 		//! \brief The minimum scene width is defined to be width of the current page layout * 2
-		min_scene_width,
+		static double min_scene_width;
 
 		//! \brief The minimum scene height is defined to be height of the current page layout * 2
-		min_scene_height;
+		static double min_scene_height;
 
 		//! \brief Indicates that there are objects being moved and the signal s_objectsMoved must be emitted
 		bool moving_objs,
@@ -227,8 +226,8 @@ class __libcanvas ObjectsScene: public QGraphicsScene {
 			LayerRectColor
 		};
 
-		static constexpr double MinScaleFactor = 0.100000,
-		MaxScaleFactor = 5.000001;
+		static constexpr double MinScaleFactor = 0.100000;
+		static constexpr double MaxScaleFactor = 5.000001;
 
 		static constexpr unsigned DefaultLayer = 0;
 

libs/libcanvas/src/relationshipview.h

@@ -52,13 +52,13 @@ class __libcanvas RelationshipView: public BaseObjectView {
 		static constexpr double ConnLineLength=20.0;
 
 		//! \brief Indicates that the relationship labels must be hidden
-		static bool hide_name_label,
+		static bool hide_name_label;
 
 		//! \brief Indicates that the relationship lines should be curved
-		use_curved_lines,
+		static bool use_curved_lines;
 
 		//! \brief Indicates that the relationship should be drawn in Crow's foot notation
-		use_crows_foot;
+		static bool use_crows_foot;
 
 		/*! \brief Specify the type of connection used by the lines. The first (classical)
 		is to connect the line to tables through their central points. The second (better semantics)

libs/libcanvas/src/tableobjectview.h

@@ -63,16 +63,16 @@ class __libcanvas TableObjectView: public BaseObjectView {
 		QString formatUserTypeName(PgSqlType type);
 
 	public:
-		static const QString	TypeSeparator,
-		ConstrSeparator,
-		TextUnique,
-		TextExclude,
-		TextCheck,
-		TextPrimaryKey,
-		TextForeignKey,
-		TextNotNull,
-		ConstrDelimStart,
-		ConstrDelimEnd;
+		static const QString TypeSeparator;
+		static const QString ConstrSeparator;
+		static const QString TextUnique;
+		static const QString TextExclude;
+		static const QString TextCheck;
+		static const QString TextPrimaryKey;
+		static const QString TextForeignKey;
+		static const QString TextNotNull;
+		static const QString ConstrDelimStart;
+		static const QString ConstrDelimEnd;
 
 		enum ChildObjectId: unsigned {
 			ObjDescriptor,

libs/libcanvas/src/textboxview.h

@@ -53,7 +53,7 @@ class __libcanvas TextboxView: public BaseObjectView {
 	public:
 		TextboxView(Textbox *txtbox, bool override_style = false);
 
-	 virtual ~TextboxView();
+		virtual ~TextboxView();
 
 		/*! \brief Sets the fill and border color for the text box. This method has effect only when
 		 the style can be overriden (via constructor) */

libs/libcanvas/src/textpolygonitem.h

@@ -34,9 +34,9 @@
 class __libcanvas TextPolygonItem : public QGraphicsPolygonItem {
 	private:
 
-	 QGraphicsTextItem *text_item;
+		QGraphicsTextItem *text_item;
 
-	 bool word_wrap;
+		bool word_wrap;
 
 	public:
 		TextPolygonItem(QGraphicsItem *parent = nullptr);

libs/libcli/src/compat/view.cpp

@@ -18,7 +18,7 @@
 
 #include "view.h"
 
-using namespace CompatNs;
+namespace CompatNs {
 
 View::View() : BaseTable()
 {
@@ -608,3 +608,5 @@ QString View::getDropCode(bool cascade)
 	setSQLObjectAttribute();
 	return BaseObject::getDropCode(cascade);
 }
+
+}