From e74b2d380e6862b77dc834b81f161aa7546b9401 Mon Sep 17 00:00:00 2001 From: ThomasZecha Date: Mon, 18 Dec 2023 13:46:01 +0100 Subject: [PATCH] Fix all build warnings/issues -Unconditional re-build of flex/bison parser by fixing wrong dependencies -Removed unused code causing compiler warnings -Removed unused function variables -Refactor switch-case statements to prevent compiler warnings Signed-off-by: ThomasZecha --- converter/CMakeLists.txt | 4 ++-- converter/parse_dataset.ypp | 2 +- converter/parse_vcd.ypp | 2 +- converter/real.cpp | 8 -------- converter/real.h | 1 - converter/strlist.cpp | 16 ---------------- converter/strlist.h | 1 - qucs-activefilter/qf_poly.cpp | 4 +--- qucs-activefilter/schcauer.cpp | 4 +--- qucs-attenuator/qucsattenuator.cpp | 1 + qucs-filter/qf_poly.cpp | 4 +--- qucs-filter/qucsfilter.cpp | 2 ++ qucs/mouseactions.cpp | 9 ++++++--- qucs/schematic_file.cpp | 3 ++- 14 files changed, 18 insertions(+), 43 deletions(-) diff --git a/converter/CMakeLists.txt b/converter/CMakeLists.txt index a3c19514..89a05a27 100644 --- a/converter/CMakeLists.txt +++ b/converter/CMakeLists.txt @@ -32,7 +32,7 @@ ENDIF() # This is a HACK to get arround a PATH issue with Qt Creator on OSX. # It seams impossible to pass a custom PATH to Qt Creator on OSX, ie, cannot prepend `/usr/local/bin/` for intance. # The FIND_PACKAGE fails. For now we provide a fallback with a custom FIND_PROGRAM. The variable BISON_DIR is also available. -FIND_PACKAGE(BISON 2.4 REQUIRED) +FIND_PACKAGE(BISON 3.0 REQUIRED) IF(BISON_FOUND) #MESSAGE(STATUS "Found bison: ${BISON_EXECUTABLE} / Version: ${BISON_VERSION}" ) ENDIF() @@ -96,7 +96,7 @@ FOREACH( type ${ParserTypes} ) # Create custom Bison SET(BO_${type} ${CMAKE_CURRENT_BINARY_DIR}/parse_${type}.cpp - ${CMAKE_CURRENT_BINARY_DIR}/tokens_${type}.h ) + ${CMAKE_CURRENT_BINARY_DIR}/parse_${type}.hpp ) ADD_CUSTOM_COMMAND( OUTPUT ${BO_${type}} COMMAND ${BISON_EXECUTABLE} diff --git a/converter/parse_dataset.ypp b/converter/parse_dataset.ypp index fef3b0c5..9f22efad 100644 --- a/converter/parse_dataset.ypp +++ b/converter/parse_dataset.ypp @@ -52,7 +52,7 @@ using namespace qucs; %} -%name-prefix "dataset_" +%define api.prefix {dataset_} %token InvalidCharacter %token Identifier diff --git a/converter/parse_vcd.ypp b/converter/parse_vcd.ypp index f5d76dc5..cdf1b9a1 100644 --- a/converter/parse_vcd.ypp +++ b/converter/parse_vcd.ypp @@ -43,7 +43,7 @@ %} -%name-prefix "vcd_" +%define api.prefix {vcd_} %token t_END %token t_COMMENT diff --git a/converter/real.cpp b/converter/real.cpp index cbbbfbfd..b7115fb2 100644 --- a/converter/real.cpp +++ b/converter/real.cpp @@ -252,14 +252,6 @@ nr_double_t floor( nr_double_t arg) { return std::floor(arg); } -nr_double_t fmod( nr_double_t arg) { -#ifdef HAVE_STD_TRUNC - return std::fmod(arg); -#else - return fmod(arg); -#endif -} - nr_double_t trunc( nr_double_t arg) { #ifdef HAVE_STD_TRUNC return std::trunc(arg); diff --git a/converter/real.h b/converter/real.h index 159770cb..9e41a46f 100644 --- a/converter/real.h +++ b/converter/real.h @@ -88,7 +88,6 @@ nr_double_t erf(const nr_double_t ); // nr_double_t ceil(const nr_double_t ); nr_double_t floor(const nr_double_t ); -nr_double_t fmod(const nr_double_t ); //FIXME nr_double_t trunc(const nr_double_t ); // c++11 nr_double_t round(const nr_double_t ); // c++11 diff --git a/converter/strlist.cpp b/converter/strlist.cpp index c1f38acb..b1fe5014 100644 --- a/converter/strlist.cpp +++ b/converter/strlist.cpp @@ -150,22 +150,6 @@ char * strlist::first (void) const { return s ? s->str : NULL; } -/* The function removes each occurrence of the given string list entry - from the string list object. */ -void strlist::del (strlist * cand) { - if (cand == NULL) return; - struct strlist_t * next; - strlist * res = new strlist (); - while (root) { - next = root->next; - if (cand->contains (root->str) == 0) res->append (root->str); - free (root->str); - free (root); - root = next; - } - *this = *res; -} - /* The function joins the given string lists to each other and returns the resulting list. */ strlist * strlist::join (strlist * pre, strlist * post) { diff --git a/converter/strlist.h b/converter/strlist.h index 9ba39d88..dd95b066 100644 --- a/converter/strlist.h +++ b/converter/strlist.h @@ -53,7 +53,6 @@ class strlist char * last (void) const; int index (char *); static strlist * join (strlist *, strlist *); - void del (strlist *); char * toString (const char * concat = " "); private: diff --git a/qucs-activefilter/qf_poly.cpp b/qucs-activefilter/qf_poly.cpp index bed9ed62..2ec0054a 100644 --- a/qucs-activefilter/qf_poly.cpp +++ b/qucs-activefilter/qf_poly.cpp @@ -1255,8 +1255,6 @@ void qf_poly::to_roots (void) { exit (-1); } - int status; - if ((rep == ROOTS) || (rep == BOTH)) return; // Nothing to do @@ -1275,7 +1273,7 @@ void qf_poly::to_roots (void) { qf_scm (m); qf_bcm (m); - status = qf_qrc (m, rts); + qf_qrc (m, rts); // root solving qr method failed to converge for (unsigned i = 0; i < 2 * d; i++) { diff --git a/qucs-activefilter/schcauer.cpp b/qucs-activefilter/schcauer.cpp index 3f153b7f..45a8f209 100644 --- a/qucs-activefilter/schcauer.cpp +++ b/qucs-activefilter/schcauer.cpp @@ -120,7 +120,7 @@ void SchCauer::calcHighPass() void SchCauer::calcBandPass() { - double R1,R2,R3,R4,R5,R6,R7,C1,C2; + double R1,R2,R3,R4,R5,R6,C1,C2; double W0 = 2*pi*F0; double Kv1 = pow(Kv,1.0/order); int cnt = 1; @@ -150,7 +150,6 @@ void SchCauer::calcBandPass() R5 = R3; R4 = (Kv1/mu)*sqrt(C/A)*R5; R6 = mu*R2/(mu-1); - R7 = mu*R2; RC_elements current_section; current_section.N = cnt; @@ -172,7 +171,6 @@ void SchCauer::calcBandPass() R5 = R3; R4 = (Kv1/mu)*sqrt(C/A)*R5; R6 = mu*R2/(mu-1); - R7 = mu*R2; current_section.N = cnt; current_section.R1 = 1000*R1; diff --git a/qucs-attenuator/qucsattenuator.cpp b/qucs-attenuator/qucsattenuator.cpp index e58c225d..3fba26cf 100644 --- a/qucs-attenuator/qucsattenuator.cpp +++ b/qucs-attenuator/qucsattenuator.cpp @@ -239,6 +239,7 @@ void QucsAttenuator::slotQuit() tmp = y(); tmp = width(); tmp = height(); + Q_UNUSED(tmp); qApp->quit(); } diff --git a/qucs-filter/qf_poly.cpp b/qucs-filter/qf_poly.cpp index f1d9da29..798b688f 100644 --- a/qucs-filter/qf_poly.cpp +++ b/qucs-filter/qf_poly.cpp @@ -1255,8 +1255,6 @@ void qf_poly::to_roots (void) { exit (-1); } - int status; - if ((rep == ROOTS) || (rep == BOTH)) return; // Nothing to do @@ -1275,7 +1273,7 @@ void qf_poly::to_roots (void) { qf_scm (m); qf_bcm (m); - status = qf_qrc (m, rts); + qf_qrc (m, rts); // root solving qr method failed to converge for (unsigned i = 0; i < 2 * d; i++) { diff --git a/qucs-filter/qucsfilter.cpp b/qucs-filter/qucsfilter.cpp index 9364e622..83a38457 100644 --- a/qucs-filter/qucsfilter.cpp +++ b/qucs-filter/qucsfilter.cpp @@ -307,6 +307,8 @@ QucsFilter::~QucsFilter() void QucsFilter::slotQuit() { int tmp; + Q_UNUSED(tmp); + tmp = x(); // call size and position function in order to ... tmp = y(); // ... set them correctly before closing the ... tmp = width(); // dialog !!! Otherwise the frame of the window ... diff --git a/qucs/mouseactions.cpp b/qucs/mouseactions.cpp index 9ce3b7a1..8732c2e4 100644 --- a/qucs/mouseactions.cpp +++ b/qucs/mouseactions.cpp @@ -1077,9 +1077,12 @@ void MouseActions::MPressSelect(Schematic *Doc, QMouseEvent *Event, float fX, fl return; case isDiagramHScroll: // scroll in tabular ? - MAy1 = MAx1; - case isDiagramVScroll: + if (focusElement->Type == isDiagramHScroll) + { + MAy1 = MAx1; + } + focusElement->Type = isDiagram; No = ((TabDiagram *) focusElement)->scroll(MAy1); @@ -1799,7 +1802,7 @@ void MouseActions::moveElements(Schematic *Doc, int &x1, int &y1) // ----------------------------------------------------------- void MouseActions::rotateElements(Schematic *Doc, int &x1, int &y1) { - int x2, y2; + int x2; Element *pe; Doc->setOnGrid(x1, y1); diff --git a/qucs/schematic_file.cpp b/qucs/schematic_file.cpp index 8b0f1e41..822ee466 100644 --- a/qucs/schematic_file.cpp +++ b/qucs/schematic_file.cpp @@ -1674,7 +1674,8 @@ void Schematic::createSubNetlistPlain(QTextStream *stream, QPlainTextEdit *ErrTe case 'o': // output ports need workaround Signals.insert(*it_name, DigSignal(*it_name, *it_type)); (*it_name) = "net_out" + (*it_name); - // no "break;" here !!! + (*it_name) += " : " + pc->Props.at(1)->Value; + break; default: (*it_name) += " : " + pc->Props.at(1)->Value; }