Merge branch 'master' of newton:/data1/x0-0-0/pwr

src/tools/bld/src/os_linux/hw_x86/variables.mk

@@ -199,27 +199,24 @@ mkdir		:= mkdir
 #   Set to /buildversion for frozen dbs versions
 wblflags	:= 
 
+warnings := -Wall -Wextra -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-unused-but-set-variable -Wno-sign-compare -Wno-missing-field-initializers
+
 ifeq ($(pwre_btype),rls)			 
-  cflags	:= $(cross_compile) -c -O3 -D_GNU_SOURCE -DPWR_NDEBUG -D_REENTRANT -fPIC -Wno-deprecated-declarations -Wno-unused-but-set-variable 
+  cflags	:= $(cross_compile) -c -O3 -D_GNU_SOURCE -DPWR_NDEBUG -D_REENTRANT -fPIC $(warnings)
   linkflags	:= $(cross_compile) -O3 -L$(lib_dir)
   elinkflags	:= $(cross_compile) -O3 -L$(lib_dir) -L$(elib_dir)
-  explinkflags	:= $(cross_compile) -g -L$(elib_dir)
-  cxxflags	:= $(cflags)
-  clis		= /lis=$(list)
-  dolist	= /lis=$(list)
-  domap		= -Xlinker -Map -Xlinker $(map)
 else
-  cflags	:= $(cross_compile) -c -g -Wall -D_GNU_SOURCE -D_REENTRANT -fPIC -Wno-deprecated-declarations -Wno-unused-but-set-variable 
-  mmflags	:= -Wno-deprecated
+  cflags	:= $(cross_compile) -c -g -D_GNU_SOURCE -D_REENTRANT -fPIC $(warnings)
   linkflags	:= $(cross_compile) -g -L$(lib_dir)
   elinkflags	:= $(cross_compile) -g -L$(lib_dir) -L$(elib_dir)
-  explinkflags	:= $(cross_compile) -g -L$(elib_dir)
-  cxxflags	:= $(cflags) -Wno-deprecated
-  dolist	= /lis=$(list)
-  clis		:= 
-  domap		= -Xlinker -Map -Xlinker $(map)
 endif
 
+explinkflags	:= $(cross_compile) -g -L$(elib_dir)
+cxxflags	:= $(cflags)
+clis		= /lis=$(list)
+dolist	= /lis=$(list)
+domap		= -Xlinker -Map -Xlinker $(map)
+
 log_h_h		= echo "Exporting $<"
 log_x_h		= echo "Exporting $< to $(notdir $@)"
 log_l_obj	= echo "Compiling $<"

src/tools/pwre/src/os_linux/pwre.pl

@@ -1460,8 +1460,8 @@ sub _build () # args: branch, subbranch, flavour, phase
           if ($hw eq "x86" && $real_hw eq "x86_64") {
             $ENV{"cross_compile"} = "-m32";
           }
-          if ($branch eq "wbl" || (($branch eq "lib" || $branch eq "exe") && ($flavour eq "gtk" || $flavour eq "qt")) || ($branch eq "lib" && $flavour eq "src")) {
-            # All libraries and GUI-exe files can be compiled in parallel
+          if (($branch eq "lib" && $subbranch ne "dtt") || $branch eq "wbl") {
+            # All libraries and wbl files can be compiled in parallel
             system("make -j @_") && exit 1;
           } else {
             system("make @_") && exit 1;

ssabox/lib/ssabox/src/ssabox_as_phasor_methods.c

@@ -1262,25 +1262,25 @@ const AS_shaper* AS_SetupIST(int mode)
 
   /* AS_ISTMAX = 5 currently */
 
-  const static AS_shaper no_antisway
+  static const AS_shaper no_antisway
       = { AS_NO_AS, 1, { 1.0, 0.0, 0.0, 0.0, 0.0 }, 1.0, 1.0, 1.0,
           { 0.0, 0.0, 0.0, 0.0, 0.0 }, M_PI };
-  const static AS_shaper d_pulse = { AS_DPULSE, 2, { 1.0, 1.0, 0.0, 0.0, 0.0 },
+  static const AS_shaper d_pulse = { AS_DPULSE, 2, { 1.0, 1.0, 0.0, 0.0, 0.0 },
     2.0, 1.0, 1.0, { 0.0, -M_PI, 0.0, 0.0, 0.0 }, M_PI };
-  const static AS_shaper dd_pulse
+  static const AS_shaper dd_pulse
       = { AS_DDPULSE, 3, { 0.5, 1.0, 0.5, 0.0, 0.0 }, 2.0, 0.5, 1.0,
           { 0.0, -M_PI, -2.0 * M_PI, 0.0, 0.0 }, M_PI };
-  const static AS_shaper um_zv = { AS_UMZV, 3, { 1.0, -1.0, 1.0, 0.0, 0.0 },
+  static const AS_shaper um_zv = { AS_UMZV, 3, { 1.0, -1.0, 1.0, 0.0, 0.0 },
     1.0, 1.0, 1.0, { 0.0, -M_PI / 3.0, -M_PI / 1.5, 0.0, 0.0 }, M_PI / 3.0 };
-  const static AS_shaper um_zvd = { AS_UMZVD, 5, { 1.0, -1.0, 1.0, -1.0, 1.0 },
+  static const AS_shaper um_zvd = { AS_UMZVD, 5, { 1.0, -1.0, 1.0, -1.0, 1.0 },
     1.0, 1.0, 1.0, { 0.0, -0.56242392468373, -2.30111498488178,
                        -4.03980604507982, -4.60222996976355 },
     0.56242392468373 };
-  const static AS_shaper zv_122 = {
+  static const AS_shaper zv_122 = {
     AS_ZV122, 3, { 1.0, -2.0, 2.0, 0.0, 0.0 }, 1.0, 1.0, 2.0,
     { 0.0, -1.31811607165282, -1.82347658193698, 0.0, 0.0 }, 0.505360510284160
   }; /* angles are 0, -M_PI/2+asin(1/4), -M_PI/2-asin(1/4) */
-  const static AS_shaper zvd_122
+  static const AS_shaper zvd_122
       = { AS_ZVD122, 5, { 1.0, -2.0, 2.0, -2.0, 2.0 }, 1.0, 1.0, 2.0,
           { 0.0, -0.95759740098188, -1.74292794797482, -3.96664437406570,
               -4.26595739903213 },

xtt/lib/cow/gtk/cow_wow_gtk.cpp

@@ -1108,28 +1108,26 @@ gboolean CoWowEntryGtk::event_cb(GtkWidget* w, GdkEvent* event, gpointer data)
   case GDK_KP_Enter:
   case GDK_Linefeed: {
     // Insert in recall buffer
-    en->m_re->push(text);
+    if (!streq(text, "")) {
+      en->m_re->push(text);
+    }
     break;
   }
   case GDK_Up: {
     const char *prev = en->m_re->popUp(text);
-    if (!streq(prev, "")) {
-      gint pos = 0;
-      gtk_editable_delete_text(GTK_EDITABLE(w), 0, -1);
-      gtk_editable_insert_text(GTK_EDITABLE(w), prev, strlen(prev), &pos);
-      gtk_editable_set_position(GTK_EDITABLE(w), -1);
-    }
+    gint pos = 0;
+    gtk_editable_delete_text(GTK_EDITABLE(w), 0, -1);
+    gtk_editable_insert_text(GTK_EDITABLE(w), prev, strlen(prev), &pos);
+    gtk_editable_set_position(GTK_EDITABLE(w), -1);
     sts = TRUE;
     break;
   }
   case GDK_Down: {
     const char *next = en->m_re->popDown(text);
-    if (!streq(next, "")) {
-      gint pos = 0;
-      gtk_editable_delete_text(GTK_EDITABLE(w), 0, -1);
-      gtk_editable_insert_text(GTK_EDITABLE(w), next, strlen(next), &pos);
-      gtk_editable_set_position(GTK_EDITABLE(w), -1);
-    }
+    gint pos = 0;
+    gtk_editable_delete_text(GTK_EDITABLE(w), 0, -1);
+    gtk_editable_insert_text(GTK_EDITABLE(w), next, strlen(next), &pos);
+    gtk_editable_set_position(GTK_EDITABLE(w), -1);
     sts = TRUE;
     break;
   }

xtt/lib/cow/qt/cow_wow_qt.cqt

@@ -656,22 +656,20 @@ void CoWowEntryQt::keyPressEvent(QKeyEvent* event)
   case Qt::Key_Return:
   case Qt::Key_Enter: {
     // Insert in recall buffer
-    m_re->push(qPrintable(text()));
+    if (!text().isEmpty()) {
+      m_re->push(qPrintable(text()));
+    }
     break;
   }
   case Qt::Key_Up: {
     const char* prev = m_re->popUp(qPrintable(text()));
-    if (!streq(prev, "")) {
-      setText(fl(prev));
-    }
+    setText(fl(prev));
     end(false);
     break;
   }
   case Qt::Key_Down: {
     const char* next = m_re->popDown(qPrintable(text()));
-    if (!streq(next, "")) {
-      setText(fl(next));
-    }
+    setText(fl(next));
     end(false);
     break;
   }

xtt/lib/cow/src/cow_wow.cpp

@@ -69,16 +69,18 @@ CoWowRecall::CoWowRecall() : m_current_recall_line(0), m_current_size(0)
 
 void CoWowRecall::push(const char* src)
 {
-  if (!streq(src, "") && !streq(src, m_recall[0])) {
-    for (int i = m_recall_size - 2; i >= 0; i--) {
-      strcpy(m_recall[i + 1], m_recall[i]);
+  if (!streq(src, m_recall[0])) {
+    if (m_current_size == 0 || !streq(m_recall[0], "")) {
+      for (int i = m_recall_size - 2; i >= 0; i--) {
+        strcpy(m_recall[i + 1], m_recall[i]);
+      }
+      m_current_size++;
+      if (m_current_size > m_recall_size) {
+        m_current_size = m_recall_size;
+      }
     }
     strncpy(m_recall[0], src, m_line_size);
     m_recall[0][m_line_size - 1] = 0;
-    m_current_size++;
-    if (m_current_size > m_recall_size) {
-      m_current_size = m_recall_size;
-    }
   }
   resetTmp();
 }