From 778cbb2a70f55f898dd3ba33ee36dbddb833d7c6 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Thu, 9 Mar 2017 12:23:36 +0200
Subject: [PATCH] Cppcheck warnings.

--HG--
branch : develop
---
 src/libs/vdxf/dxflib/dl_dxf.cpp |  2 --
 src/libs/vlayout/vposter.h      |  1 +
 src/libs/vmisc/debugbreak.h     | 25 +++++++++++++++----------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/libs/vdxf/dxflib/dl_dxf.cpp b/src/libs/vdxf/dxflib/dl_dxf.cpp
index 75d5bef73..d45799b45 100644
--- a/src/libs/vdxf/dxflib/dl_dxf.cpp
+++ b/src/libs/vdxf/dxflib/dl_dxf.cpp
@@ -3170,7 +3170,6 @@ void DL_Dxf::writeMText(DL_WriterA& dw,
 
     // Creare text chunks of 250 characters each:
     int length = static_cast<int>(data.text.length());
-    // cppcheck-suppress arrayIndexOutOfBounds
     char chunk[251];
     int i;
     for (i=250; i<length; i+=250)
@@ -3186,7 +3185,6 @@ QT_WARNING_PUSH
 QT_WARNING_DISABLE_MSVC(4996)
     strncpy(chunk, &data.text.c_str()[i-250], 250);
 QT_WARNING_POP
-    // cppcheck-suppress arrayIndexOutOfBounds
     chunk[250]='\0';
     dw.dxfString(1, chunk);
 
diff --git a/src/libs/vlayout/vposter.h b/src/libs/vlayout/vposter.h
index 6a4da32e5..184126cbb 100644
--- a/src/libs/vlayout/vposter.h
+++ b/src/libs/vlayout/vposter.h
@@ -55,6 +55,7 @@ struct PosterData
     QRect rect; // rect section
 };
 
+// cppcheck-suppress noConstructor
 class VPoster
 {
     Q_DECLARE_TR_FUNCTIONS(VPoster)
diff --git a/src/libs/vmisc/debugbreak.h b/src/libs/vmisc/debugbreak.h
index 7391a5154..eba63febe 100644
--- a/src/libs/vmisc/debugbreak.h
+++ b/src/libs/vmisc/debugbreak.h
@@ -107,22 +107,27 @@ enum { HAVE_TRAP_INSTRUCTION = 0 };
 __attribute__((gnu_inline, always_inline))
 __inline__ static void debug_break(void)
 {
-    if (HAVE_TRAP_INSTRUCTION) {
+#if defined(_WIN32) || defined(_WIN64)
+    /* SIGTRAP available only on POSIX-compliant operating systems
+     * use builtin trap instead */
+    HAVE_TRAP_INSTRUCTIO ? trap_instruction() : __builtin_trap();
+#else
+    if (HAVE_TRAP_INSTRUCTION)
+    {
         trap_instruction();
-    } else if (DEBUG_BREAK_PREFER_BUILTIN_TRAP_TO_SIGTRAP) {
+    }
+    else if (DEBUG_BREAK_PREFER_BUILTIN_TRAP_TO_SIGTRAP)
+    {
          /* raises SIGILL on Linux x86{,-64}, to continue in gdb:
           * (gdb) handle SIGILL stop nopass
           * */
         __builtin_trap();
-    } else {
-        #if defined(_WIN32) || defined(_WIN64)
-        /* SIGTRAP available only on POSIX-compliant operating systems
-         * use builtin trap instead */
-            __builtin_trap();
-        #else
-            raise(SIGTRAP);
-        #endif
     }
+    else
+    {
+        raise(SIGTRAP);
+    }
+#endif
 }
 
 #ifdef __cplusplus