Skip to content

Commit

Permalink
Compiler warning fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
dxli committed May 12, 2024
1 parent 3112c12 commit 581dc21
Show file tree
Hide file tree
Showing 140 changed files with 403 additions and 419 deletions.
1 change: 0 additions & 1 deletion librecad/src/actions/lc_abstractactiondrawline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
**********************************************************************/

#include <rs_point.h>
#include "rs_preview.h"
#include "rs_math.h"
#include "rs_graphicview.h"
#include "lc_abstractactiondrawline.h"
Expand Down
8 changes: 4 additions & 4 deletions librecad/src/actions/lc_abstractactiondrawrectangle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
**********************************************************************/

#include <cmath>
#include "rs_arc.h"
#include "rs_polyline.h"

#include "lc_abstractactiondrawrectangle.h"
#include "lc_linemath.h"
#include "rs_graphicview.h"
#include "rs_math.h"
#include "lc_linemath.h"
#include "lc_abstractactiondrawrectangle.h"
#include "rs_polyline.h"


LC_AbstractActionDrawRectangle::LC_AbstractActionDrawRectangle(
Expand Down
4 changes: 1 addition & 3 deletions librecad/src/actions/lc_actionlayersexport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ bool isNotFrozen(RS_Layer* layer)
class ScopedLayerList
{
public:
ScopedLayerList(RS_LayerList* list) : m_list{list}{}
void add(RS_Layer* layer)
{
if (layer == nullptr)
Expand All @@ -128,7 +127,6 @@ class ScopedLayerList
}

private:
RS_LayerList* m_list=nullptr;
std::vector<std::unique_ptr<RS_Layer>> m_layers;
QHash<QString, RS_Layer*> m_lookUp;

Expand Down Expand Up @@ -209,7 +207,7 @@ void LC_ActionLayersExport::trigger()
documentDeepCopy->newDoc();
documentDeepCopy->setVariableDictObject(document->getGraphic()->getVariableDictObject());
// RAII style layer to hold duplicated layers: auto clean up at the end of its lifetime
ScopedLayerList duplicateLayersList = documentDeepCopy->getLayerList();
ScopedLayerList duplicateLayersList;

QString modifiedFilePath;
QString copiedLayers;
Expand Down
10 changes: 4 additions & 6 deletions librecad/src/actions/rs_actionblocksedit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,12 @@
**
**********************************************************************/

#include "rs_actionblocksedit.h"

#include <QAction>
#include "rs_graphic.h"
#include "rs_dialogfactory.h"
#include "rs_debug.h"


#include "rs_actionblocksedit.h"
#include "rs_debug.h"
#include "rs_dialogfactory.h"
#include "rs_graphic.h"

RS_ActionBlocksEdit::RS_ActionBlocksEdit(RS_EntityContainer& container,
RS_GraphicView& graphicView)
Expand Down
4 changes: 2 additions & 2 deletions librecad/src/actions/rs_actionblocksexplode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
**
**********************************************************************/

#include "rs_actionblocksexplode.h"

#include <QAction>

#include "rs_actionblocksexplode.h"
#include "rs_modification.h"

/**
Expand Down
10 changes: 4 additions & 6 deletions librecad/src/actions/rs_actionblocksfreezeall.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,12 @@
**
**********************************************************************/

#include "rs_actionblocksfreezeall.h"

#include <QAction>
#include "rs_graphicview.h"
#include "rs_graphic.h"
#include "rs_debug.h"


#include "rs_actionblocksfreezeall.h"
#include "rs_debug.h"
#include "rs_graphic.h"
#include "rs_graphicview.h"

RS_ActionBlocksFreezeAll::RS_ActionBlocksFreezeAll(bool freeze,
RS_EntityContainer& container,
Expand Down
10 changes: 5 additions & 5 deletions librecad/src/actions/rs_actionblocksinsert.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@

#include <QAction>
#include <QMouseEvent>

#include "rs_actionblocksinsert.h"
#include "rs_insert.h"
#include "rs_block.h"

#include "rs_graphic.h"
#include "rs_graphicview.h"
#include "rs_dialogfactory.h"
#include "rs_commandevent.h"
#include "rs_coordinateevent.h"
#include "rs_creation.h"
#include "rs_dialogfactory.h"
#include "rs_graphic.h"
#include "rs_graphicview.h"
#include "rs_insert.h"
#include "rs_math.h"
#include "rs_preview.h"

Expand Down
8 changes: 4 additions & 4 deletions librecad/src/actions/rs_actionblocksremove.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
**
**********************************************************************/

#include "rs_actionblocksremove.h"

#include <QAction>

#include "rs_actionblocksremove.h"
#include "rs_debug.h"
#include "rs_dialogfactory.h"
#include "rs_graphicview.h"
#include "rs_graphic.h"
#include "rs_graphicview.h"
#include "rs_insert.h"
#include "rs_debug.h"


RS_ActionBlocksRemove::RS_ActionBlocksRemove(RS_EntityContainer& container,
Expand Down
12 changes: 6 additions & 6 deletions librecad/src/actions/rs_actionblockssave.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
**********************************************************************/
#include "rs_actionblockssave.h"

#include <QAction>
#include <QApplication>

#include "qc_applicationwindow.h"
#include "qc_mdiwindow.h"
#include "qg_blockwidget.h"
#include "qg_filedialog.h"
#include "qc_applicationwindow.h"
#include "rs_graphic.h"
#include "rs_actionblockssave.h"
#include "rs_debug.h"
#include "rs_dialogfactory.h"
#include "rs_graphic.h"
#include "rs_insert.h"
#include "rs_coordinateevent.h"
#include "qc_mdiwindow.h"
#include "rs_debug.h"



Expand Down
10 changes: 4 additions & 6 deletions librecad/src/actions/rs_actionblockstoggleview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,13 @@
**
**********************************************************************/

#include "rs_actionblockstoggleview.h"

#include <QAction>
#include "rs_graphicview.h"
#include "rs_graphic.h"

#include "rs_actionblockstoggleview.h"
#include "rs_block.h"
#include "rs_debug.h"


#include "rs_graphic.h"
#include "rs_graphicview.h"

RS_ActionBlocksToggleView::RS_ActionBlocksToggleView(
RS_EntityContainer& container,
Expand Down
7 changes: 1 addition & 6 deletions librecad/src/actions/rs_actiondefault.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,14 @@
**
**********************************************************************/
#include <algorithm>
#include <cmath>
#include <iostream>

#include<QMouseEvent>

#include "qc_applicationwindow.h"
#include "rs_actiondefault.h"

#include "rs_commandevent.h"
#include "rs_coordinateevent.h"
#include "rs_debug.h"
#include "rs_dialogfactory.h"
#include "rs_graphic.h"
#include "rs_graphicview.h"
#include "rs_line.h"
#include "rs_modification.h"
Expand All @@ -44,7 +40,6 @@
#include "rs_selection.h"
#include "rs_settings.h"
#include "rs_units.h"
#include "qc_applicationwindow.h"

struct RS_ActionDefault::Points {
RS_Vector v1;
Expand Down
14 changes: 7 additions & 7 deletions librecad/src/actions/rs_actiondimaligned.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@
** This copyright notice MUST APPEAR in all copies of the script!
**
**********************************************************************/
#include<cmath>

#include <QAction>
#include <QMouseEvent>
#include "rs_actiondimaligned.h"
#include "rs_dimaligned.h"

#include "rs_dialogfactory.h"
#include "rs_line.h"
#include "rs_graphicview.h"
#include "rs_actiondimaligned.h"
#include "rs_commandevent.h"
#include "rs_constructionline.h"
#include "rs_coordinateevent.h"
#include "rs_preview.h"
#include "rs_debug.h"
#include "rs_dialogfactory.h"
#include "rs_dimaligned.h"
#include "rs_graphicview.h"
#include "rs_line.h"
#include "rs_preview.h"

RS_ActionDimAligned::RS_ActionDimAligned(RS_EntityContainer& container,
RS_GraphicView& graphicView)
Expand Down
14 changes: 7 additions & 7 deletions librecad/src/actions/rs_actiondimangular.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,20 @@
**
**********************************************************************/

#include <cmath>

#include <QAction>
#include <QMouseEvent>
#include "rs_actiondimangular.h"
#include "rs_dimangular.h"

#include "rs_dialogfactory.h"
#include "rs_graphicview.h"
#include "rs_actiondimangular.h"
#include "rs_commandevent.h"
#include "rs_information.h"
#include "rs_coordinateevent.h"
#include "rs_preview.h"
#include "rs_debug.h"
#include "rs_dialogfactory.h"
#include "rs_dimangular.h"
#include "rs_graphicview.h"
#include "rs_information.h"
#include "rs_math.h"
#include "rs_preview.h"

RS_ActionDimAngular::RS_ActionDimAngular(RS_EntityContainer& container,
RS_GraphicView& graphicView) :
Expand Down
4 changes: 1 addition & 3 deletions librecad/src/actions/rs_actiondimdiametric.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,11 @@
** This copyright notice MUST APPEAR in all copies of the script!
**
**********************************************************************/
#include "rs_actiondimdiametric.h"

#include<cmath>

#include <QAction>
#include <QMouseEvent>

#include "rs_actiondimdiametric.h"
#include "rs_arc.h"
#include "rs_circle.h"
#include "rs_commandevent.h"
Expand Down
1 change: 0 additions & 1 deletion librecad/src/actions/rs_actiondimension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
**********************************************************************/

#include "rs_actiondimension.h"

#include "rs_dialogfactory.h"
#include "rs_dimension.h"
#include "rs_graphicview.h"
Expand Down
3 changes: 2 additions & 1 deletion librecad/src/actions/rs_actiondimleader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@
**
**********************************************************************/
#include<vector>

#include <QAction>
#include <QMouseEvent>
#include "rs_actiondimleader.h"

#include "rs_actiondimleader.h"
#include "rs_commandevent.h"
#include "rs_coordinateevent.h"
#include "rs_debug.h"
Expand Down
13 changes: 6 additions & 7 deletions librecad/src/actions/rs_actiondimlinear.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,20 @@
** This copyright notice MUST APPEAR in all copies of the script!
**
**********************************************************************/
#include<cmath>
#include <QAction>
#include <QMouseEvent>
#include "rs_actiondimlinear.h"
#include "rs_dimlinear.h"

#include "rs_dialogfactory.h"
#include "rs_graphicview.h"
#include "rs_actiondimlinear.h"
#include "rs_commandevent.h"
#include "rs_constructionline.h"
#include "rs_line.h"
#include "rs_coordinateevent.h"
#include "rs_debug.h"
#include "rs_dialogfactory.h"
#include "rs_dimlinear.h"
#include "rs_graphicview.h"
#include "rs_line.h"
#include "rs_math.h"
#include "rs_preview.h"
#include "rs_debug.h"

/**
* Constructor.
Expand Down
12 changes: 6 additions & 6 deletions librecad/src/actions/rs_actiondimradial.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@

#include <QAction>
#include <QMouseEvent>
#include "rs_actiondimradial.h"

#include "rs_dimradial.h"
#include "rs_dialogfactory.h"
#include "rs_graphicview.h"
#include "rs_commandevent.h"
#include "rs_actiondimradial.h"
#include "rs_arc.h"
#include "rs_circle.h"
#include "rs_commandevent.h"
#include "rs_coordinateevent.h"
#include "rs_debug.h"
#include "rs_dialogfactory.h"
#include "rs_dimradial.h"
#include "rs_graphicview.h"
#include "rs_math.h"
#include "rs_preview.h"
#include "rs_debug.h"


RS_ActionDimRadial::RS_ActionDimRadial(
Expand Down
12 changes: 6 additions & 6 deletions librecad/src/actions/rs_actiondrawarc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@
** This copyright notice MUST APPEAR in all copies of the script!
**
**********************************************************************/
#include "rs_actiondrawarc.h"

#include<cmath>

#include <QAction>
#include <QMouseEvent>

#include "rs_dialogfactory.h"
#include "rs_graphicview.h"
#include "rs_commands.h"
#include "rs_commandevent.h"
#include "rs_actiondrawarc.h"
#include "rs_arc.h"
#include "rs_circle.h"
#include "rs_commandevent.h"
#include "rs_commands.h"
#include "rs_coordinateevent.h"
#include "rs_debug.h"
#include "rs_dialogfactory.h"
#include "rs_graphicview.h"
#include "rs_math.h"
#include "rs_preview.h"
#include "rs_debug.h"

RS_ActionDrawArc::RS_ActionDrawArc(RS_EntityContainer& container,
RS_GraphicView& graphicView)
Expand Down
Loading

0 comments on commit 581dc21

Please sign in to comment.