From: Shamus Hammons Date: Thu, 9 Sep 2010 04:27:21 +0000 (+0000) Subject: Initial removal of unnecessary rs_ prefixes from files. X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas Initial removal of unnecessary rs_ prefixes from files. --- diff --git a/architektonas.pro b/architektonas.pro index a143343..3824c03 100644 --- a/architektonas.pro +++ b/architektonas.pro @@ -30,157 +30,157 @@ INCLUDEPATH += \ HEADERS = \ src/base/rs.h \ src/base/actioninterface.h \ - src/base/rs_arc.h \ - src/base/rs_atomicentity.h \ - src/base/rs_block.h \ - src/base/rs_blocklist.h \ - src/base/rs_circle.h \ - src/base/rs_clipboard.h \ - src/base/rs_color.h \ - src/base/rs_commandevent.h \ - src/base/rs_creation.h \ - src/base/rs_constructionline.h \ - src/base/rs_debug.h \ - src/base/rs_dialogfactory.h \ - src/base/rs_dialogfactoryinterface.h \ - src/base/rs_dialogfactoryadapter.h \ - src/base/rs_dimaligned.h \ - src/base/rs_dimangular.h \ - src/base/rs_dimdiametric.h \ - src/base/rs_dimension.h \ - src/base/rs_dimlinear.h \ - src/base/rs_dimradial.h \ - src/base/rs_document.h \ + src/base/arc.h \ + src/base/atomicentity.h \ + src/base/block.h \ + src/base/blocklist.h \ + src/base/circle.h \ + src/base/clipboard.h \ + src/base/color.h \ + src/base/commandevent.h \ + src/base/creation.h \ + src/base/constructionline.h \ + src/base/debug.h \ + src/base/dialogfactory.h \ + src/base/dialogfactoryinterface.h \ + src/base/dialogfactoryadapter.h \ + src/base/dimaligned.h \ + src/base/dimangular.h \ + src/base/dimdiametric.h \ + src/base/dimension.h \ + src/base/dimlinear.h \ + src/base/dimradial.h \ + src/base/document.h \ src/base/drawing.h \ - src/base/rs_ellipse.h \ - src/base/rs_entity.h \ - src/base/rs_entitycontainer.h \ - src/base/rs_eventhandler.h \ - src/base/rs_fileio.h \ - src/base/rs_filtercxf.h \ - src/base/rs_filterdxf.h \ - src/base/rs_filterdxf1.h \ - src/base/rs_filterinterface.h \ - src/base/rs_flags.h \ - src/base/rs_font.h \ - src/base/rs_fontchar.h \ - src/base/rs_fontlist.h \ - src/base/rs_grid.h \ - src/base/rs_hatch.h \ - src/base/rs_image.h \ - src/base/rs_information.h \ - src/base/rs_infoarea.h \ - src/base/rs_insert.h \ - src/base/rs_layer.h \ - src/base/rs_layerlist.h \ - src/base/rs_leader.h \ - src/base/rs_line.h \ - src/base/rs_linetypepattern.h \ - src/base/rs_mainwindowinterface.h \ - src/base/rs_math.h \ - src/base/rs_modification.h \ + src/base/ellipse.h \ + src/base/entity.h \ + src/base/entitycontainer.h \ + src/base/eventhandler.h \ + src/base/fileio.h \ + src/base/filtercxf.h \ + src/base/filterdxf.h \ + src/base/filterdxf1.h \ + src/base/filterinterface.h \ + src/base/flags.h \ + src/base/font.h \ + src/base/fontchar.h \ + src/base/fontlist.h \ + src/base/grid.h \ + src/base/hatch.h \ + src/base/image.h \ + src/base/information.h \ + src/base/infoarea.h \ + src/base/insert.h \ + src/base/layer.h \ + src/base/layerlist.h \ + src/base/leader.h \ + src/base/line.h \ + src/base/linetypepattern.h \ + src/base/mainwindowinterface.h \ + src/base/mathextra.h \ + src/base/modification.h \ src/base/paintinterface.h \ - src/base/rs_pattern.h \ - src/base/rs_patternlist.h \ - src/base/rs_pen.h \ - src/base/rs_point.h \ - src/base/rs_polyline.h \ - src/base/rs_preview.h \ - src/base/rs_python.h \ - src/base/rs_python_wrappers.h \ - src/base/rs_script.h \ - src/base/rs_scriptlist.h \ - src/base/rs_selection.h \ - src/base/rs_simplepython.h \ - src/base/rs_snapper.h \ - src/base/rs_solid.h \ - src/base/rs_spline.h \ - src/base/rs_staticgraphicview.h \ - src/base/rs_system.h \ - src/base/rs_text.h \ - src/base/rs_undo.h \ - src/base/rs_undoable.h \ - src/base/rs_undocycle.h \ - src/base/rs_units.h \ - src/base/rs_utility.h \ - src/base/rs_variable.h \ - src/base/rs_variabledict.h \ + src/base/pattern.h \ + src/base/patternlist.h \ + src/base/pen.h \ + src/base/point.h \ + src/base/polyline.h \ + src/base/preview.h \ + src/base/python.h \ + src/base/python_wrappers.h \ + src/base/script.h \ + src/base/scriptlist.h \ + src/base/selection.h \ + src/base/simplepython.h \ + src/base/snapper.h \ + src/base/solid.h \ + src/base/spline.h \ + src/base/staticgraphicview.h \ + src/base/system.h \ + src/base/text.h \ + src/base/undo.h \ + src/base/undoable.h \ + src/base/undocycle.h \ + src/base/units.h \ + src/base/utility.h \ + src/base/variable.h \ + src/base/variabledict.h \ src/base/vector.h \ src/base/vectorsolutions.h SOURCES = \ src/base/actioninterface.cpp \ - src/base/rs_arc.cpp \ - src/base/rs_atomicentity.cpp \ - src/base/rs_block.cpp \ - src/base/rs_blocklist.cpp \ - src/base/rs_clipboard.cpp \ - src/base/rs_circle.cpp \ - src/base/rs_color.cpp \ - src/base/rs_commandevent.cpp \ - src/base/rs_constructionline.cpp \ - src/base/rs_creation.cpp \ - src/base/rs_debug.cpp \ - src/base/rs_dialogfactory.cpp \ - src/base/rs_dimaligned.cpp \ - src/base/rs_dimangular.cpp \ - src/base/rs_dimdiametric.cpp \ - src/base/rs_dimension.cpp \ - src/base/rs_dimlinear.cpp \ - src/base/rs_dimradial.cpp \ - src/base/rs_document.cpp \ + src/base/arc.cpp \ + src/base/atomicentity.cpp \ + src/base/block.cpp \ + src/base/blocklist.cpp \ + src/base/clipboard.cpp \ + src/base/circle.cpp \ + src/base/color.cpp \ + src/base/commandevent.cpp \ + src/base/constructionline.cpp \ + src/base/creation.cpp \ + src/base/debug.cpp \ + src/base/dialogfactory.cpp \ + src/base/dimaligned.cpp \ + src/base/dimangular.cpp \ + src/base/dimdiametric.cpp \ + src/base/dimension.cpp \ + src/base/dimlinear.cpp \ + src/base/dimradial.cpp \ + src/base/document.cpp \ src/base/drawing.cpp \ - src/base/rs_ellipse.cpp \ - src/base/rs_entity.cpp \ - src/base/rs_entitycontainer.cpp \ - src/base/rs_eventhandler.cpp \ - src/base/rs_fileio.cpp \ - src/base/rs_filtercxf.cpp \ - src/base/rs_filterdxf.cpp \ - src/base/rs_filterdxf1.cpp \ - src/base/rs_filterinterface.cpp \ - src/base/rs_flags.cpp \ - src/base/rs_font.cpp \ - src/base/rs_fontlist.cpp \ - src/base/rs_grid.cpp \ - src/base/rs_hatch.cpp \ - src/base/rs_image.cpp \ - src/base/rs_information.cpp \ - src/base/rs_infoarea.cpp \ - src/base/rs_insert.cpp \ - src/base/rs_layer.cpp \ - src/base/rs_layerlist.cpp \ - src/base/rs_leader.cpp \ - src/base/rs_line.cpp \ - src/base/rs_linetypepattern.cpp \ - src/base/rs_math.cpp \ - src/base/rs_modification.cpp \ + src/base/ellipse.cpp \ + src/base/entity.cpp \ + src/base/entitycontainer.cpp \ + src/base/eventhandler.cpp \ + src/base/fileio.cpp \ + src/base/filtercxf.cpp \ + src/base/filterdxf.cpp \ + src/base/filterdxf1.cpp \ + src/base/filterinterface.cpp \ + src/base/flags.cpp \ + src/base/font.cpp \ + src/base/fontlist.cpp \ + src/base/grid.cpp \ + src/base/hatch.cpp \ + src/base/image.cpp \ + src/base/information.cpp \ + src/base/infoarea.cpp \ + src/base/insert.cpp \ + src/base/layer.cpp \ + src/base/layerlist.cpp \ + src/base/leader.cpp \ + src/base/line.cpp \ + src/base/linetypepattern.cpp \ + src/base/mathextra.cpp \ + src/base/modification.cpp \ src/base/paintinterface.cpp \ - src/base/rs_pattern.cpp \ - src/base/rs_patternlist.cpp \ - src/base/rs_pen.cpp \ - src/base/rs_point.cpp \ - src/base/rs_polyline.cpp \ - src/base/rs_preview.cpp \ - src/base/rs_python.cpp \ - src/base/rs_python_wrappers.cpp \ - src/base/rs_script.cpp \ - src/base/rs_scriptlist.cpp \ - src/base/rs_selection.cpp \ - src/base/rs_simplepython.cpp \ - src/base/rs_snapper.cpp \ - src/base/rs_solid.cpp \ - src/base/rs_spline.cpp \ - src/base/rs_staticgraphicview.cpp \ - src/base/rs_system.cpp \ - src/base/rs_text.cpp \ - src/base/rs_undo.cpp \ - src/base/rs_undoable.cpp \ - src/base/rs_undocycle.cpp \ - src/base/rs_units.cpp \ - src/base/rs_utility.cpp \ - src/base/rs_variable.cpp \ - src/base/rs_variabledict.cpp \ + src/base/pattern.cpp \ + src/base/patternlist.cpp \ + src/base/pen.cpp \ + src/base/point.cpp \ + src/base/polyline.cpp \ + src/base/preview.cpp \ + src/base/python.cpp \ + src/base/python_wrappers.cpp \ + src/base/script.cpp \ + src/base/scriptlist.cpp \ + src/base/selection.cpp \ + src/base/simplepython.cpp \ + src/base/snapper.cpp \ + src/base/solid.cpp \ + src/base/spline.cpp \ + src/base/staticgraphicview.cpp \ + src/base/system.cpp \ + src/base/text.cpp \ + src/base/undo.cpp \ + src/base/undoable.cpp \ + src/base/undocycle.cpp \ + src/base/units.cpp \ + src/base/utility.cpp \ + src/base/variable.cpp \ + src/base/variabledict.cpp \ src/base/vector.cpp \ src/base/vectorsolutions.cpp diff --git a/src/actions/actionblocksadd.cpp b/src/actions/actionblocksadd.cpp index 5e04f82..8817139 100644 --- a/src/actions/actionblocksadd.cpp +++ b/src/actions/actionblocksadd.cpp @@ -17,7 +17,7 @@ #include "actionblocksadd.h" #include "drawing.h" -#include "rs_dialogfactory.h" +#include "dialogfactory.h" ActionBlocksAdd::ActionBlocksAdd(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Add Block", container, graphicView) diff --git a/src/actions/actionblocksattributes.cpp b/src/actions/actionblocksattributes.cpp index 81c3980..b8f5082 100644 --- a/src/actions/actionblocksattributes.cpp +++ b/src/actions/actionblocksattributes.cpp @@ -17,7 +17,7 @@ #include "actionblocksattributes.h" #include "drawing.h" -#include "rs_dialogfactory.h" +#include "dialogfactory.h" ActionBlocksAttributes::ActionBlocksAttributes( RS_EntityContainer & container, GraphicView & graphicView): diff --git a/src/actions/actionblockscreate.cpp b/src/actions/actionblockscreate.cpp index aecaf39..172c071 100644 --- a/src/actions/actionblockscreate.cpp +++ b/src/actions/actionblockscreate.cpp @@ -17,11 +17,11 @@ #include "actionblockscreate.h" -#include "rs_creation.h" -#include "rs_dialogfactory.h" +#include "creation.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_insert.h" -#include "rs_modification.h" +#include "insert.h" +#include "modification.h" /** * Constructor. diff --git a/src/actions/actionblocksedit.cpp b/src/actions/actionblocksedit.cpp index 6c85e8a..46f549a 100644 --- a/src/actions/actionblocksedit.cpp +++ b/src/actions/actionblocksedit.cpp @@ -17,7 +17,7 @@ #include "actionblocksedit.h" #include "drawing.h" -#include "rs_dialogfactory.h" +#include "dialogfactory.h" ActionBlocksEdit::ActionBlocksEdit(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Edit Block", container, graphicView) diff --git a/src/actions/actionblocksexplode.cpp b/src/actions/actionblocksexplode.cpp index 3c394cc..3e29a70 100644 --- a/src/actions/actionblocksexplode.cpp +++ b/src/actions/actionblocksexplode.cpp @@ -16,7 +16,7 @@ #include "actionblocksexplode.h" -#include "rs_modification.h" +#include "modification.h" /** * Constructor. diff --git a/src/actions/actionblocksexplode.h b/src/actions/actionblocksexplode.h index f28603e..8ab8aa5 100644 --- a/src/actions/actionblocksexplode.h +++ b/src/actions/actionblocksexplode.h @@ -2,7 +2,7 @@ #define __ACTIONBLOCKSEXPLODE_H__ #include "actioninterface.h" -#include "rs_insert.h" +#include "insert.h" /** * This action class can handle user events for exploding blocks and diff --git a/src/actions/actionblocksinsert.cpp b/src/actions/actionblocksinsert.cpp index 22b09b5..09eae0f 100644 --- a/src/actions/actionblocksinsert.cpp +++ b/src/actions/actionblocksinsert.cpp @@ -18,11 +18,11 @@ #include "actionblocksinsert.h" #include "commands.h" -#include "rs_commandevent.h" -#include "rs_creation.h" -#include "rs_dialogfactory.h" -#include "rs_modification.h" -#include "rs_preview.h" +#include "commandevent.h" +#include "creation.h" +#include "dialogfactory.h" +#include "modification.h" +#include "preview.h" /** * Constructor. diff --git a/src/actions/actionblocksinsert.h b/src/actions/actionblocksinsert.h index 1bdf49d..7030302 100644 --- a/src/actions/actionblocksinsert.h +++ b/src/actions/actionblocksinsert.h @@ -2,7 +2,7 @@ #define __ACTIONBLOCKSINSERT_H__ #include "actioninterface.h" -#include "rs_insert.h" +#include "insert.h" /** * This action class can handle user events for inserting blocks into the diff --git a/src/actions/actionblocksremove.cpp b/src/actions/actionblocksremove.cpp index b6720fc..1eaf12b 100644 --- a/src/actions/actionblocksremove.cpp +++ b/src/actions/actionblocksremove.cpp @@ -16,11 +16,11 @@ #include "actionblocksremove.h" -#include "rs_block.h" -#include "rs_dialogfactory.h" +#include "block.h" +#include "dialogfactory.h" #include "drawing.h" #include "graphicview.h" -#include "rs_insert.h" +#include "insert.h" ActionBlocksRemove::ActionBlocksRemove(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Remove Block", container, graphicView) diff --git a/src/actions/actiondefault.cpp b/src/actions/actiondefault.cpp index 29940ba..bfbd45f 100644 --- a/src/actions/actiondefault.cpp +++ b/src/actions/actiondefault.cpp @@ -17,14 +17,14 @@ #include "actiondefault.h" #include "rs.h" -#include "rs_commandevent.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" -#include "rs_line.h" -#include "rs_modification.h" -#include "rs_preview.h" -#include "rs_snapper.h" -#include "rs_selection.h" +#include "commandevent.h" +#include "debug.h" +#include "dialogfactory.h" +#include "line.h" +#include "modification.h" +#include "preview.h" +#include "snapper.h" +#include "selection.h" /** * Constructor. diff --git a/src/actions/actiondimaligned.cpp b/src/actions/actiondimaligned.cpp index 278b2e3..5370670 100644 --- a/src/actions/actiondimaligned.cpp +++ b/src/actions/actiondimaligned.cpp @@ -16,13 +16,13 @@ #include "actiondimaligned.h" -#include "rs_commandevent.h" -#include "rs_constructionline.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "constructionline.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" -#include "rs_snapper.h" +#include "preview.h" +#include "snapper.h" ActionDimAligned::ActionDimAligned(RS_EntityContainer & container, GraphicView & graphicView): ActionDimension("Draw aligned dimensions", container, graphicView) diff --git a/src/actions/actiondimaligned.h b/src/actions/actiondimaligned.h index 731aab1..ba4900f 100644 --- a/src/actions/actiondimaligned.h +++ b/src/actions/actiondimaligned.h @@ -2,7 +2,7 @@ #define __ACTIONDIMALIGNED_H__ #include "actiondimension.h" -#include "rs_dimaligned.h" +#include "dimaligned.h" /** * This action class can handle user events to draw diff --git a/src/actions/actiondimangular.cpp b/src/actions/actiondimangular.cpp index dcac4a5..d2da018 100644 --- a/src/actions/actiondimangular.cpp +++ b/src/actions/actiondimangular.cpp @@ -16,12 +16,12 @@ #include "actiondimangular.h" -#include "rs_commandevent.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_information.h" -#include "rs_preview.h" +#include "information.h" +#include "preview.h" ActionDimAngular::ActionDimAngular(RS_EntityContainer & container, GraphicView & graphicView): ActionDimension("Draw Angular Dimensions", container, graphicView) diff --git a/src/actions/actiondimangular.h b/src/actions/actiondimangular.h index fa3643f..26e6b0e 100644 --- a/src/actions/actiondimangular.h +++ b/src/actions/actiondimangular.h @@ -2,7 +2,7 @@ #define __ACTIONDIMANGULAR_H__ #include "actiondimension.h" -#include "rs_dimangular.h" +#include "dimangular.h" #include "vector.h" class RS_Line; diff --git a/src/actions/actiondimdiametric.cpp b/src/actions/actiondimdiametric.cpp index 6de5c21..fad94bf 100644 --- a/src/actions/actiondimdiametric.cpp +++ b/src/actions/actiondimdiametric.cpp @@ -16,11 +16,11 @@ #include "actiondimdiametric.h" -#include "rs_commandevent.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDimDiametric::ActionDimDiametric(RS_EntityContainer & container, GraphicView & graphicView): ActionDimension("Draw Diametric Dimensions", diff --git a/src/actions/actiondimdiametric.h b/src/actions/actiondimdiametric.h index 43859d1..86c1182 100644 --- a/src/actions/actiondimdiametric.h +++ b/src/actions/actiondimdiametric.h @@ -2,7 +2,7 @@ #define __ACTIONDIMDIAMETRIC_H__ #include "actiondimension.h" -#include "rs_dimdiametric.h" +#include "dimdiametric.h" #include "vector.h" class RS_Entity; diff --git a/src/actions/actiondimension.cpp b/src/actions/actiondimension.cpp index b5b9fb8..2de2085 100644 --- a/src/actions/actiondimension.cpp +++ b/src/actions/actiondimension.cpp @@ -16,7 +16,7 @@ #include "actiondimension.h" -#include "rs_dialogfactory.h" +#include "dialogfactory.h" #include "graphicview.h" ActionDimension::ActionDimension(const char * name, RS_EntityContainer & container, GraphicView & graphicView): diff --git a/src/actions/actiondimension.h b/src/actions/actiondimension.h index e8f3b9d..23840ab 100644 --- a/src/actions/actiondimension.h +++ b/src/actions/actiondimension.h @@ -2,7 +2,7 @@ #define __ACTIONDIMENSION_H__ #include -#include "rs_dimension.h" +#include "dimension.h" #include "actioninterface.h" /** diff --git a/src/actions/actiondimleader.cpp b/src/actions/actiondimleader.cpp index 31cd29e..c0ef6f9 100644 --- a/src/actions/actiondimleader.cpp +++ b/src/actions/actiondimleader.cpp @@ -16,11 +16,11 @@ #include "actiondimleader.h" -#include "rs_commandevent.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDimLeader::ActionDimLeader(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw leaders", container, graphicView) diff --git a/src/actions/actiondimleader.h b/src/actions/actiondimleader.h index d014628..3db3b0a 100644 --- a/src/actions/actiondimleader.h +++ b/src/actions/actiondimleader.h @@ -3,7 +3,7 @@ #include #include "actioninterface.h" -#include "rs_leader.h" +#include "leader.h" class Vector; diff --git a/src/actions/actiondimlinear.cpp b/src/actions/actiondimlinear.cpp index 6603284..cc22e46 100644 --- a/src/actions/actiondimlinear.cpp +++ b/src/actions/actiondimlinear.cpp @@ -16,12 +16,12 @@ #include "actiondimlinear.h" -#include "rs_commandevent.h" -#include "rs_constructionline.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "constructionline.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" /** * Constructor. diff --git a/src/actions/actiondimlinear.h b/src/actions/actiondimlinear.h index bc0ae78..8b41e94 100644 --- a/src/actions/actiondimlinear.h +++ b/src/actions/actiondimlinear.h @@ -2,7 +2,7 @@ #define __ACTIONDIMLINEAR_H__ #include "actiondimension.h" -#include "rs_dimlinear.h" +#include "dimlinear.h" /** * This action class can handle user events to draw aligned dimensions. diff --git a/src/actions/actiondimradial.cpp b/src/actions/actiondimradial.cpp index 5cc5241..4fd12fe 100644 --- a/src/actions/actiondimradial.cpp +++ b/src/actions/actiondimradial.cpp @@ -16,11 +16,11 @@ #include "actiondimradial.h" -#include "rs_commandevent.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDimRadial::ActionDimRadial(RS_EntityContainer & container, GraphicView & graphicView): ActionDimension("Draw Radial Dimensions", container, graphicView) diff --git a/src/actions/actiondimradial.h b/src/actions/actiondimradial.h index e928f3a..d07772f 100644 --- a/src/actions/actiondimradial.h +++ b/src/actions/actiondimradial.h @@ -2,7 +2,7 @@ #define __ACTIONDIMRADIAL_H__ #include "actiondimension.h" -#include "rs_dimradial.h" +#include "dimradial.h" #include "vector.h" class RS_Entity; diff --git a/src/actions/actiondrawarc.cpp b/src/actions/actiondrawarc.cpp index 184781c..be608fe 100644 --- a/src/actions/actiondrawarc.cpp +++ b/src/actions/actiondrawarc.cpp @@ -16,12 +16,12 @@ #include "actiondrawarc.h" -#include "rs_commandevent.h" +#include "commandevent.h" #include "commands.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawArc::ActionDrawArc(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw arcs", container, graphicView) diff --git a/src/actions/actiondrawarc.h b/src/actions/actiondrawarc.h index a834a3a..adf4f09 100644 --- a/src/actions/actiondrawarc.h +++ b/src/actions/actiondrawarc.h @@ -2,7 +2,7 @@ #define __ACTIONDRAWARC_H__ #include "actioninterface.h" -#include "rs_arc.h" +#include "arc.h" /** * This action class can handle user events to draw simple arcs with the diff --git a/src/actions/actiondrawarc3p.cpp b/src/actions/actiondrawarc3p.cpp index d63dbe1..ce3d658 100644 --- a/src/actions/actiondrawarc3p.cpp +++ b/src/actions/actiondrawarc3p.cpp @@ -17,11 +17,11 @@ #include "actiondrawarc3p.h" #include "actiondrawarc.h" -#include "rs_commandevent.h" +#include "commandevent.h" #include "commands.h" -#include "rs_dialogfactory.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawArc3P::ActionDrawArc3P(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw arcs 3P", container, graphicView) diff --git a/src/actions/actiondrawarc3p.h b/src/actions/actiondrawarc3p.h index ffca07f..64f627b 100644 --- a/src/actions/actiondrawarc3p.h +++ b/src/actions/actiondrawarc3p.h @@ -1,7 +1,7 @@ #ifndef __ACTIONDRAWARC3P_H__ #define __ACTIONDRAWARC3P_H__ -#include "rs_arc.h" +#include "arc.h" #include "actioninterface.h" #include "vector.h" diff --git a/src/actions/actiondrawarctangential.cpp b/src/actions/actiondrawarctangential.cpp index 7cf9e11..7ad86a7 100644 --- a/src/actions/actiondrawarctangential.cpp +++ b/src/actions/actiondrawarctangential.cpp @@ -16,11 +16,11 @@ #include "actiondrawarctangential.h" -#include "rs_commandevent.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawArcTangential::ActionDrawArcTangential(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw arcs tangential", container, graphicView) diff --git a/src/actions/actiondrawarctangential.h b/src/actions/actiondrawarctangential.h index d1f3ac2..4e9ace4 100644 --- a/src/actions/actiondrawarctangential.h +++ b/src/actions/actiondrawarctangential.h @@ -2,7 +2,7 @@ #define __ACTIONDRAWARCTANGENTIAL_H__ #include "actioninterface.h" -#include "rs_arc.h" +#include "arc.h" #include "vector.h" class RS_AtomicEntity; diff --git a/src/actions/actiondrawcircle.cpp b/src/actions/actiondrawcircle.cpp index d00973f..84e0640 100644 --- a/src/actions/actiondrawcircle.cpp +++ b/src/actions/actiondrawcircle.cpp @@ -16,11 +16,11 @@ #include "actiondrawcircle.h" -#include "rs_commandevent.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawCircle::ActionDrawCircle(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw circles", container, graphicView) diff --git a/src/actions/actiondrawcircle.h b/src/actions/actiondrawcircle.h index 763d184..7357c21 100644 --- a/src/actions/actiondrawcircle.h +++ b/src/actions/actiondrawcircle.h @@ -1,7 +1,7 @@ #ifndef __ACTIONDRAWCIRCLE_H__ #define __ACTIONDRAWCIRCLE_H__ -#include "rs_circle.h" +#include "circle.h" #include "actioninterface.h" /** diff --git a/src/actions/actiondrawcircle2p.cpp b/src/actions/actiondrawcircle2p.cpp index f0719f3..33d5534 100644 --- a/src/actions/actiondrawcircle2p.cpp +++ b/src/actions/actiondrawcircle2p.cpp @@ -16,10 +16,10 @@ #include "actiondrawcircle2p.h" -#include "rs_commandevent.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawCircle2P::ActionDrawCircle2P(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw circles", container, graphicView) diff --git a/src/actions/actiondrawcircle2p.h b/src/actions/actiondrawcircle2p.h index 8f47cb7..86d343a 100644 --- a/src/actions/actiondrawcircle2p.h +++ b/src/actions/actiondrawcircle2p.h @@ -1,7 +1,7 @@ #ifndef __ACTIONDRAWCIRCLE2P_H__ #define __ACTIONDRAWCIRCLE2P_H__ -#include "rs_circle.h" +#include "circle.h" #include "actioninterface.h" #include "vector.h" diff --git a/src/actions/actiondrawcircle3p.cpp b/src/actions/actiondrawcircle3p.cpp index 674eedf..c836878 100644 --- a/src/actions/actiondrawcircle3p.cpp +++ b/src/actions/actiondrawcircle3p.cpp @@ -16,10 +16,10 @@ #include "actiondrawcircle3p.h" -#include "rs_commandevent.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawCircle3P::ActionDrawCircle3P(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw circles", diff --git a/src/actions/actiondrawcircle3p.h b/src/actions/actiondrawcircle3p.h index d2d64b4..a528813 100644 --- a/src/actions/actiondrawcircle3p.h +++ b/src/actions/actiondrawcircle3p.h @@ -1,7 +1,7 @@ #ifndef __ACTIONDRAWCIRCLE3P_H__ #define __ACTIONDRAWCIRCLE3P_H__ -#include "rs_circle.h" +#include "circle.h" #include "actioninterface.h" #include "vector.h" diff --git a/src/actions/actiondrawcirclecr.cpp b/src/actions/actiondrawcirclecr.cpp index a84a93d..4f41d81 100644 --- a/src/actions/actiondrawcirclecr.cpp +++ b/src/actions/actiondrawcirclecr.cpp @@ -16,11 +16,11 @@ #include "actiondrawcirclecr.h" -#include "rs_commandevent.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" /** * Constructor. diff --git a/src/actions/actiondrawcirclecr.h b/src/actions/actiondrawcirclecr.h index 6e50f44..e3406f0 100644 --- a/src/actions/actiondrawcirclecr.h +++ b/src/actions/actiondrawcirclecr.h @@ -1,7 +1,7 @@ #ifndef __ACTIONDRAWCIRCLECR_H__ #define __ACTIONDRAWCIRCLECR_H__ -#include "rs_circle.h" +#include "circle.h" #include "actioninterface.h" /** diff --git a/src/actions/actiondrawellipseaxis.cpp b/src/actions/actiondrawellipseaxis.cpp index 717fc37..e219649 100644 --- a/src/actions/actiondrawellipseaxis.cpp +++ b/src/actions/actiondrawellipseaxis.cpp @@ -16,11 +16,11 @@ #include "actiondrawellipseaxis.h" -#include "rs_commandevent.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" /** * Constructor. diff --git a/src/actions/actiondrawellipseaxis.h b/src/actions/actiondrawellipseaxis.h index 31e54e3..073b431 100644 --- a/src/actions/actiondrawellipseaxis.h +++ b/src/actions/actiondrawellipseaxis.h @@ -1,7 +1,7 @@ #ifndef __ACTIONDRAWELLIPSEAXIS_H__ #define __ACTIONDRAWELLIPSEAXIS_H__ -#include "rs_ellipse.h" +#include "ellipse.h" #include "actioninterface.h" /** diff --git a/src/actions/actiondrawhatch.cpp b/src/actions/actiondrawhatch.cpp index a12530e..aa4e3e8 100644 --- a/src/actions/actiondrawhatch.cpp +++ b/src/actions/actiondrawhatch.cpp @@ -16,10 +16,10 @@ #include "actiondrawhatch.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_information.h" +#include "information.h" ActionDrawHatch::ActionDrawHatch(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw Hatch", container, graphicView) diff --git a/src/actions/actiondrawhatch.h b/src/actions/actiondrawhatch.h index 20c2a0a..b04c79c 100644 --- a/src/actions/actiondrawhatch.h +++ b/src/actions/actiondrawhatch.h @@ -1,7 +1,7 @@ #ifndef __ACTIONDRAWHATCH_H__ #define __ACTIONDRAWHATCH_H__ -#include "rs_hatch.h" +#include "hatch.h" #include "actioninterface.h" /** diff --git a/src/actions/actiondrawimage.cpp b/src/actions/actiondrawimage.cpp index 51ef4d2..524663c 100644 --- a/src/actions/actiondrawimage.cpp +++ b/src/actions/actiondrawimage.cpp @@ -16,11 +16,11 @@ #include "actiondrawimage.h" -#include "rs_commandevent.h" -#include "rs_creation.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "creation.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" /** * Constructor. diff --git a/src/actions/actiondrawimage.h b/src/actions/actiondrawimage.h index 79b3e8f..af2aacf 100644 --- a/src/actions/actiondrawimage.h +++ b/src/actions/actiondrawimage.h @@ -2,7 +2,7 @@ #define __ACTIONDRAWIMAGE_H__ #include -#include "rs_image.h" +#include "image.h" #include "actioninterface.h" /** diff --git a/src/actions/actiondrawline.cpp b/src/actions/actiondrawline.cpp index b387ee9..50fb990 100644 --- a/src/actions/actiondrawline.cpp +++ b/src/actions/actiondrawline.cpp @@ -17,12 +17,12 @@ #include "actiondrawline.h" #include "actioneditundo.h" -#include "rs_commandevent.h" +#include "commandevent.h" #include "commands.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawLine::ActionDrawLine(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw lines", container, graphicView) diff --git a/src/actions/actiondrawline.h b/src/actions/actiondrawline.h index fde8b4f..672405b 100644 --- a/src/actions/actiondrawline.h +++ b/src/actions/actiondrawline.h @@ -3,7 +3,7 @@ #include #include "actioninterface.h" -#include "rs_line.h" +#include "line.h" /** * This action class can handle user events to draw diff --git a/src/actions/actiondrawlineangle.cpp b/src/actions/actiondrawlineangle.cpp index e0c1d68..36441b7 100644 --- a/src/actions/actiondrawlineangle.cpp +++ b/src/actions/actiondrawlineangle.cpp @@ -17,11 +17,11 @@ #include "actiondrawlineangle.h" -#include "rs_commandevent.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawLineAngle::ActionDrawLineAngle(RS_EntityContainer & container, GraphicView & graphicView, double a, bool fa): diff --git a/src/actions/actiondrawlineangle.h b/src/actions/actiondrawlineangle.h index 3d49a6a..2bc5a22 100644 --- a/src/actions/actiondrawlineangle.h +++ b/src/actions/actiondrawlineangle.h @@ -1,7 +1,7 @@ #ifndef __ACTIONDRAWLINEANGLE_H__ #define __ACTIONDRAWLINEANGLE_H__ -#include "rs_line.h" +#include "line.h" #include "actioninterface.h" #include "vector.h" diff --git a/src/actions/actiondrawlinebisector.cpp b/src/actions/actiondrawlinebisector.cpp index b7dab13..e4c8bdd 100644 --- a/src/actions/actiondrawlinebisector.cpp +++ b/src/actions/actiondrawlinebisector.cpp @@ -16,12 +16,12 @@ #include "actiondrawlinebisector.h" -#include "rs_commandevent.h" -#include "rs_creation.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "creation.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawLineBisector::ActionDrawLineBisector(RS_EntityContainer & container, GraphicView & graphicView): diff --git a/src/actions/actiondrawlinebisector.h b/src/actions/actiondrawlinebisector.h index b0b9b04..992ae03 100644 --- a/src/actions/actiondrawlinebisector.h +++ b/src/actions/actiondrawlinebisector.h @@ -1,7 +1,7 @@ #ifndef __ACTIONDRAWLINEBISECTOR_H__ #define __ACTIONDRAWLINEBISECTOR_H__ -#include "rs_line.h" +#include "line.h" #include "actioninterface.h" #include "vector.h" diff --git a/src/actions/actiondrawlinefree.cpp b/src/actions/actiondrawlinefree.cpp index a54c4c2..9537cbe 100644 --- a/src/actions/actiondrawlinefree.cpp +++ b/src/actions/actiondrawlinefree.cpp @@ -16,10 +16,10 @@ #include "actiondrawlinefree.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_polyline.h" +#include "polyline.h" ActionDrawLineFree::ActionDrawLineFree(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw freehand lines", diff --git a/src/actions/actiondrawlinehorvert.cpp b/src/actions/actiondrawlinehorvert.cpp index 7dad93c..e8707a2 100644 --- a/src/actions/actiondrawlinehorvert.cpp +++ b/src/actions/actiondrawlinehorvert.cpp @@ -16,10 +16,10 @@ #include "actiondrawlinehorvert.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawLineHorVert::ActionDrawLineHorVert(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw horizontal/vertical lines", container, graphicView) diff --git a/src/actions/actiondrawlinehorvert.h b/src/actions/actiondrawlinehorvert.h index 8c0fb45..41ae4b5 100644 --- a/src/actions/actiondrawlinehorvert.h +++ b/src/actions/actiondrawlinehorvert.h @@ -1,7 +1,7 @@ #ifndef __ACTIONDRAWLINEHORVERT_H__ #define __ACTIONDRAWLINEHORVERT_H__ -#include "rs_line.h" +#include "line.h" #include "actioninterface.h" #include "vector.h" diff --git a/src/actions/actiondrawlineparallel.cpp b/src/actions/actiondrawlineparallel.cpp index 5ed49a9..2ca3285 100644 --- a/src/actions/actiondrawlineparallel.cpp +++ b/src/actions/actiondrawlineparallel.cpp @@ -18,13 +18,13 @@ #include "actiondrawlineparallel.h" #include "actiondrawlineparallelthrough.h" -#include "rs_commandevent.h" +#include "commandevent.h" #include "commands.h" -#include "rs_creation.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "creation.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawLineParallel::ActionDrawLineParallel(RS_EntityContainer & container, GraphicView & graphicView): diff --git a/src/actions/actiondrawlineparallel.h b/src/actions/actiondrawlineparallel.h index cabe41f..a3252c3 100644 --- a/src/actions/actiondrawlineparallel.h +++ b/src/actions/actiondrawlineparallel.h @@ -1,7 +1,7 @@ #ifndef __ACTIONDRAWLINEPARALLEL_H__ #define __ACTIONDRAWLINEPARALLEL_H__ -#include "rs_line.h" +#include "line.h" #include "actioninterface.h" #include "vector.h" diff --git a/src/actions/actiondrawlineparallelthrough.cpp b/src/actions/actiondrawlineparallelthrough.cpp index a974edd..21cc7eb 100644 --- a/src/actions/actiondrawlineparallelthrough.cpp +++ b/src/actions/actiondrawlineparallelthrough.cpp @@ -16,12 +16,12 @@ #include "actiondrawlineparallelthrough.h" -#include "rs_commandevent.h" -#include "rs_creation.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "creation.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawLineParallelThrough::ActionDrawLineParallelThrough( RS_EntityContainer & container, GraphicView & graphicView): diff --git a/src/actions/actiondrawlineparallelthrough.h b/src/actions/actiondrawlineparallelthrough.h index ddf5492..a3205d7 100644 --- a/src/actions/actiondrawlineparallelthrough.h +++ b/src/actions/actiondrawlineparallelthrough.h @@ -1,7 +1,7 @@ #ifndef __ACTIONDRAWLINEPARALLELTHROUGH_H__ #define __ACTIONDRAWLINEPARALLELTHROUGH_H__ -#include "rs_line.h" +#include "line.h" #include "actioninterface.h" #include "vector.h" diff --git a/src/actions/actiondrawlinepolygon.cpp b/src/actions/actiondrawlinepolygon.cpp index 00d1e66..ea57975 100644 --- a/src/actions/actiondrawlinepolygon.cpp +++ b/src/actions/actiondrawlinepolygon.cpp @@ -16,12 +16,12 @@ #include "actiondrawlinepolygon.h" -#include "rs_commandevent.h" -#include "rs_creation.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "creation.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawLinePolygon::ActionDrawLinePolygon(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw Polygons", diff --git a/src/actions/actiondrawlinepolygon2.cpp b/src/actions/actiondrawlinepolygon2.cpp index c2c404f..3fb68be 100644 --- a/src/actions/actiondrawlinepolygon2.cpp +++ b/src/actions/actiondrawlinepolygon2.cpp @@ -16,12 +16,12 @@ #include "actiondrawlinepolygon2.h" -#include "rs_commandevent.h" -#include "rs_creation.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "creation.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawLinePolygon2::ActionDrawLinePolygon2(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw Polygons", container, graphicView) diff --git a/src/actions/actiondrawlinerectangle.cpp b/src/actions/actiondrawlinerectangle.cpp index 596f233..134a788 100644 --- a/src/actions/actiondrawlinerectangle.cpp +++ b/src/actions/actiondrawlinerectangle.cpp @@ -16,11 +16,11 @@ #include "actiondrawlinerectangle.h" -#include "rs_commandevent.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawLineRectangle::ActionDrawLineRectangle( RS_EntityContainer & container, GraphicView & graphicView): diff --git a/src/actions/actiondrawlinerectangle.h b/src/actions/actiondrawlinerectangle.h index 7e7fa92..93eebd1 100644 --- a/src/actions/actiondrawlinerectangle.h +++ b/src/actions/actiondrawlinerectangle.h @@ -1,7 +1,7 @@ #ifndef __ACTIONDRAWLINERECTANGLE_H__ #define __ACTIONDRAWLINERECTANGLE_H__ -#include "rs_line.h" +#include "line.h" #include "actioninterface.h" #include "vector.h" diff --git a/src/actions/actiondrawlinerelangle.cpp b/src/actions/actiondrawlinerelangle.cpp index e56e41d..6d3c2f6 100644 --- a/src/actions/actiondrawlinerelangle.cpp +++ b/src/actions/actiondrawlinerelangle.cpp @@ -16,12 +16,12 @@ #include "actiondrawlinerelangle.h" -#include "rs_commandevent.h" -#include "rs_creation.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "creation.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawLineRelAngle::ActionDrawLineRelAngle(RS_EntityContainer & container, GraphicView & graphicView, double angle, bool fixedAngle): diff --git a/src/actions/actiondrawlinerelangle.h b/src/actions/actiondrawlinerelangle.h index 6120006..8f8f27a 100644 --- a/src/actions/actiondrawlinerelangle.h +++ b/src/actions/actiondrawlinerelangle.h @@ -1,7 +1,7 @@ #ifndef __ACTIONDRAWLINERELANGLE_H__ #define __ACTIONDRAWLINERELANGLE_H__ -#include "rs_line.h" +#include "line.h" #include "actioninterface.h" #include "vector.h" diff --git a/src/actions/actiondrawlinetangent1.cpp b/src/actions/actiondrawlinetangent1.cpp index 426fc9f..28c1ea1 100644 --- a/src/actions/actiondrawlinetangent1.cpp +++ b/src/actions/actiondrawlinetangent1.cpp @@ -16,11 +16,11 @@ #include "actiondrawlinetangent1.h" -#include "rs_creation.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "creation.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawLineTangent1::ActionDrawLineTangent1(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw Tangents 1", container, graphicView) diff --git a/src/actions/actiondrawlinetangent1.h b/src/actions/actiondrawlinetangent1.h index 8d369c8..744291f 100644 --- a/src/actions/actiondrawlinetangent1.h +++ b/src/actions/actiondrawlinetangent1.h @@ -1,7 +1,7 @@ #ifndef __ACTIONDRAWLINETANGENT1_H__ #define __ACTIONDRAWLINETANGENT1_H__ -#include "rs_line.h" +#include "line.h" #include "actioninterface.h" #include "vector.h" diff --git a/src/actions/actiondrawlinetangent2.cpp b/src/actions/actiondrawlinetangent2.cpp index 0238dfa..7cf8586 100644 --- a/src/actions/actiondrawlinetangent2.cpp +++ b/src/actions/actiondrawlinetangent2.cpp @@ -16,11 +16,11 @@ #include "actiondrawlinetangent2.h" -#include "rs_creation.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "creation.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawLineTangent2::ActionDrawLineTangent2( RS_EntityContainer & container, GraphicView & graphicView): diff --git a/src/actions/actiondrawlinetangent2.h b/src/actions/actiondrawlinetangent2.h index 62e315d..7e04891 100644 --- a/src/actions/actiondrawlinetangent2.h +++ b/src/actions/actiondrawlinetangent2.h @@ -1,7 +1,7 @@ #ifndef __ACTIONDRAWLINETANGENT2_H__ #define __ACTIONDRAWLINETANGENT2_H__ -#include "rs_line.h" +#include "line.h" #include "actioninterface.h" class RS_Entity; diff --git a/src/actions/actiondrawpoint.cpp b/src/actions/actiondrawpoint.cpp index 0a1240e..f1ac978 100644 --- a/src/actions/actiondrawpoint.cpp +++ b/src/actions/actiondrawpoint.cpp @@ -16,10 +16,10 @@ #include "actiondrawpoint.h" -#include "rs_commandevent.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawPoint::ActionDrawPoint(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw Points", container, graphicView) diff --git a/src/actions/actiondrawspline.cpp b/src/actions/actiondrawspline.cpp index b509432..3ef5a18 100644 --- a/src/actions/actiondrawspline.cpp +++ b/src/actions/actiondrawspline.cpp @@ -16,12 +16,12 @@ #include "actiondrawspline.h" -#include "rs_commandevent.h" +#include "commandevent.h" #include "commands.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawSpline::ActionDrawSpline(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw splines", container, graphicView) diff --git a/src/actions/actiondrawspline.h b/src/actions/actiondrawspline.h index 02722d7..30b7943 100644 --- a/src/actions/actiondrawspline.h +++ b/src/actions/actiondrawspline.h @@ -3,7 +3,7 @@ #include #include "actioninterface.h" -#include "rs_spline.h" +#include "spline.h" /** * This action class can handle user events to draw splines. diff --git a/src/actions/actiondrawtext.cpp b/src/actions/actiondrawtext.cpp index 2de93f3..7e3d233 100644 --- a/src/actions/actiondrawtext.cpp +++ b/src/actions/actiondrawtext.cpp @@ -18,11 +18,11 @@ #include "actiondrawtext.h" -#include "rs_commandevent.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionDrawText::ActionDrawText(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw Text", container, graphicView) { diff --git a/src/actions/actiondrawtext.h b/src/actions/actiondrawtext.h index 92c3380..eaad7c0 100644 --- a/src/actions/actiondrawtext.h +++ b/src/actions/actiondrawtext.h @@ -2,7 +2,7 @@ #define __ACTIONDRAWTEXT_H__ #include "actioninterface.h" -#include "rs_text.h" +#include "text.h" /** * This action class can handle user events to draw texts. diff --git a/src/actions/actioneditcopy.cpp b/src/actions/actioneditcopy.cpp index 778d9e8..4710354 100644 --- a/src/actions/actioneditcopy.cpp +++ b/src/actions/actioneditcopy.cpp @@ -16,8 +16,8 @@ #include "actioneditcopy.h" -#include "rs_dialogfactory.h" -#include "rs_modification.h" +#include "dialogfactory.h" +#include "modification.h" /** * Constructor. diff --git a/src/actions/actioneditpaste.cpp b/src/actions/actioneditpaste.cpp index ddfcee5..5bc21fb 100644 --- a/src/actions/actioneditpaste.cpp +++ b/src/actions/actioneditpaste.cpp @@ -16,11 +16,11 @@ #include "actioneditpaste.h" -#include "rs_clipboard.h" -#include "rs_dialogfactory.h" -#include "rs_modification.h" -#include "rs_preview.h" -#include "rs_units.h" +#include "clipboard.h" +#include "dialogfactory.h" +#include "modification.h" +#include "preview.h" +#include "units.h" /** * Constructor. diff --git a/src/actions/actioneditundo.cpp b/src/actions/actioneditundo.cpp index 37c3419..98e7a21 100644 --- a/src/actions/actioneditundo.cpp +++ b/src/actions/actioneditundo.cpp @@ -16,7 +16,7 @@ #include "actioneditundo.h" -#include "rs_dialogfactory.h" +#include "dialogfactory.h" #include "graphicview.h" /** diff --git a/src/actions/actioninfoangle.cpp b/src/actions/actioninfoangle.cpp index e0dff35..34ad19a 100644 --- a/src/actions/actioninfoangle.cpp +++ b/src/actions/actioninfoangle.cpp @@ -16,10 +16,10 @@ #include "actioninfoangle.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_information.h" +#include "information.h" ActionInfoAngle::ActionInfoAngle(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Info Angle", container, graphicView) diff --git a/src/actions/actioninfoarea.cpp b/src/actions/actioninfoarea.cpp index 8d6af6d..ba3b6f3 100644 --- a/src/actions/actioninfoarea.cpp +++ b/src/actions/actioninfoarea.cpp @@ -16,10 +16,10 @@ #include "actioninfoarea.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionInfoArea::ActionInfoArea(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Info Area", container, graphicView) diff --git a/src/actions/actioninfoarea.h b/src/actions/actioninfoarea.h index 0527155..9ba718d 100644 --- a/src/actions/actioninfoarea.h +++ b/src/actions/actioninfoarea.h @@ -1,7 +1,7 @@ #ifndef __ACTIONINFOAREA_H__ #define __ACTIONINFOAREA_H__ -#include "rs_infoarea.h" +#include "infoarea.h" #include "actioninterface.h" #include "vector.h" diff --git a/src/actions/actioninfodist.cpp b/src/actions/actioninfodist.cpp index a9bb31b..9cc40fa 100644 --- a/src/actions/actioninfodist.cpp +++ b/src/actions/actioninfodist.cpp @@ -16,10 +16,10 @@ #include "actioninfodist.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionInfoDist::ActionInfoDist(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Info Dist", container, graphicView) diff --git a/src/actions/actioninfodist2.cpp b/src/actions/actioninfodist2.cpp index ed462d7..c215e31 100644 --- a/src/actions/actioninfodist2.cpp +++ b/src/actions/actioninfodist2.cpp @@ -16,10 +16,10 @@ #include "actioninfodist2.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" ActionInfoDist2::ActionInfoDist2(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Info Dist2", container, graphicView) diff --git a/src/actions/actioninfoinside.cpp b/src/actions/actioninfoinside.cpp index c6b2fe3..b31958d 100644 --- a/src/actions/actioninfoinside.cpp +++ b/src/actions/actioninfoinside.cpp @@ -16,9 +16,9 @@ #include "actioninfoinside.h" -#include "rs_dialogfactory.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_information.h" +#include "information.h" ActionInfoInside::ActionInfoInside(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Info Inside", container, graphicView) diff --git a/src/actions/actioninfototallength.cpp b/src/actions/actioninfototallength.cpp index deee369..5abe644 100644 --- a/src/actions/actioninfototallength.cpp +++ b/src/actions/actioninfototallength.cpp @@ -16,8 +16,8 @@ #include "actioninfototallength.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" ActionInfoTotalLength::ActionInfoTotalLength(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Info Total Length", container, graphicView) diff --git a/src/actions/actionlayersadd.cpp b/src/actions/actionlayersadd.cpp index 44575e3..199b844 100644 --- a/src/actions/actionlayersadd.cpp +++ b/src/actions/actionlayersadd.cpp @@ -16,7 +16,7 @@ #include "actionlayersadd.h" -#include "rs_dialogfactory.h" +#include "dialogfactory.h" #include "drawing.h" ActionLayersAdd::ActionLayersAdd(RS_EntityContainer & container, GraphicView & graphicView): diff --git a/src/actions/actionlayersedit.cpp b/src/actions/actionlayersedit.cpp index 864ef12..c4a46b9 100644 --- a/src/actions/actionlayersedit.cpp +++ b/src/actions/actionlayersedit.cpp @@ -16,7 +16,7 @@ #include "actionlayersedit.h" -#include "rs_dialogfactory.h" +#include "dialogfactory.h" #include "graphicview.h" #include "drawing.h" diff --git a/src/actions/actionlayersremove.cpp b/src/actions/actionlayersremove.cpp index 2d756b9..ef2c870 100644 --- a/src/actions/actionlayersremove.cpp +++ b/src/actions/actionlayersremove.cpp @@ -16,7 +16,7 @@ #include "actionlayersremove.h" -#include "rs_dialogfactory.h" +#include "dialogfactory.h" #include "drawing.h" ActionLayersRemove::ActionLayersRemove(RS_EntityContainer & container, diff --git a/src/actions/actionlibraryinsert.cpp b/src/actions/actionlibraryinsert.cpp index 91d43a1..eee135b 100644 --- a/src/actions/actionlibraryinsert.cpp +++ b/src/actions/actionlibraryinsert.cpp @@ -16,11 +16,11 @@ #include "actionlibraryinsert.h" -#include "rs_commandevent.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" -#include "rs_units.h" +#include "preview.h" +#include "units.h" /** * Constructor. diff --git a/src/actions/actionlibraryinsert.h b/src/actions/actionlibraryinsert.h index f69576d..1b0b72f 100644 --- a/src/actions/actionlibraryinsert.h +++ b/src/actions/actionlibraryinsert.h @@ -1,7 +1,7 @@ #ifndef __ACTIONLIBRARYINSERT_H__ #define __ACTIONLIBRARYINSERT_H__ -#include "rs_creation.h" +#include "creation.h" #include "drawing.h" #include "actioninterface.h" diff --git a/src/actions/actionmodifyattributes.cpp b/src/actions/actionmodifyattributes.cpp index f3cbd7e..dbc6451 100644 --- a/src/actions/actionmodifyattributes.cpp +++ b/src/actions/actionmodifyattributes.cpp @@ -16,10 +16,10 @@ #include "actionmodifyattributes.h" -#include "rs_dialogfactory.h" +#include "dialogfactory.h" #include "drawing.h" #include "graphicview.h" -#include "rs_modification.h" +#include "modification.h" ActionModifyAttributes::ActionModifyAttributes( RS_EntityContainer & container, GraphicView & graphicView): diff --git a/src/actions/actionmodifybevel.cpp b/src/actions/actionmodifybevel.cpp index 4c0a6f3..9204272 100644 --- a/src/actions/actionmodifybevel.cpp +++ b/src/actions/actionmodifybevel.cpp @@ -16,10 +16,10 @@ #include "actionmodifybevel.h" -#include "rs_commandevent.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" -#include "rs_information.h" +#include "commandevent.h" +#include "debug.h" +#include "dialogfactory.h" +#include "information.h" ActionModifyBevel::ActionModifyBevel(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Bevel Entities", container, graphicView) diff --git a/src/actions/actionmodifybevel.h b/src/actions/actionmodifybevel.h index 2718dfd..d30a33e 100644 --- a/src/actions/actionmodifybevel.h +++ b/src/actions/actionmodifybevel.h @@ -2,7 +2,7 @@ #define __ACTIONMODIFYBEVEL_H__ #include "actioninterface.h" -#include "rs_modification.h" +#include "modification.h" /** * This action class can handle user events to bevel corners. diff --git a/src/actions/actionmodifycut.cpp b/src/actions/actionmodifycut.cpp index bcfceb5..b5ff8ce 100644 --- a/src/actions/actionmodifycut.cpp +++ b/src/actions/actionmodifycut.cpp @@ -16,10 +16,10 @@ #include "actionmodifycut.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_modification.h" +#include "modification.h" ActionModifyCut::ActionModifyCut(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Cut Entity", diff --git a/src/actions/actionmodifydelete.cpp b/src/actions/actionmodifydelete.cpp index dfe2251..94ea10b 100644 --- a/src/actions/actionmodifydelete.cpp +++ b/src/actions/actionmodifydelete.cpp @@ -16,10 +16,10 @@ #include "actionmodifydelete.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_modification.h" +#include "modification.h" ActionModifyDelete::ActionModifyDelete(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Delete Entities", diff --git a/src/actions/actionmodifydeletefree.cpp b/src/actions/actionmodifydeletefree.cpp index 3a76165..c372078 100644 --- a/src/actions/actionmodifydeletefree.cpp +++ b/src/actions/actionmodifydeletefree.cpp @@ -16,11 +16,11 @@ #include "actionmodifydeletefree.h" -#include "rs_dialogfactory.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_modification.h" -#include "rs_polyline.h" -#include "rs_undo.h" +#include "modification.h" +#include "polyline.h" +#include "undo.h" ActionModifyDeleteFree::ActionModifyDeleteFree(RS_EntityContainer & container, GraphicView & graphicView): diff --git a/src/actions/actionmodifydeletequick.cpp b/src/actions/actionmodifydeletequick.cpp index df151cc..5aa67c3 100644 --- a/src/actions/actionmodifydeletequick.cpp +++ b/src/actions/actionmodifydeletequick.cpp @@ -16,8 +16,8 @@ #include "actionmodifydeletequick.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" ActionModifyDeleteQuick::ActionModifyDeleteQuick( diff --git a/src/actions/actionmodifyentity.cpp b/src/actions/actionmodifyentity.cpp index 2dbe66a..e4ca1bc 100644 --- a/src/actions/actionmodifyentity.cpp +++ b/src/actions/actionmodifyentity.cpp @@ -56,8 +56,8 @@ Program received signal SIGSEGV, Segmentation fault. #include "actionmodifyentity.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" ActionModifyEntity::ActionModifyEntity(RS_EntityContainer & container, diff --git a/src/actions/actionmodifyexplodetext.cpp b/src/actions/actionmodifyexplodetext.cpp index 3fb6e35..bddf018 100644 --- a/src/actions/actionmodifyexplodetext.cpp +++ b/src/actions/actionmodifyexplodetext.cpp @@ -16,7 +16,7 @@ #include "actionmodifyexplodetext.h" -#include "rs_modification.h" +#include "modification.h" /** * Constructor. diff --git a/src/actions/actionmodifymirror.cpp b/src/actions/actionmodifymirror.cpp index 44cc340..7c07178 100644 --- a/src/actions/actionmodifymirror.cpp +++ b/src/actions/actionmodifymirror.cpp @@ -16,9 +16,9 @@ #include "actionmodifymirror.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" -#include "rs_preview.h" +#include "debug.h" +#include "dialogfactory.h" +#include "preview.h" ActionModifyMirror::ActionModifyMirror(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Mirror Entities", container, graphicView) diff --git a/src/actions/actionmodifymirror.h b/src/actions/actionmodifymirror.h index 4c74872..12c11b4 100644 --- a/src/actions/actionmodifymirror.h +++ b/src/actions/actionmodifymirror.h @@ -1,7 +1,7 @@ #ifndef __ACTIONMODIFYMIRROR_H__ #define __ACTIONMODIFYMIRROR_H__ -#include "rs_modification.h" +#include "modification.h" #include "actioninterface.h" #include "vector.h" diff --git a/src/actions/actionmodifymove.cpp b/src/actions/actionmodifymove.cpp index aaf0251..9943bcf 100644 --- a/src/actions/actionmodifymove.cpp +++ b/src/actions/actionmodifymove.cpp @@ -16,9 +16,9 @@ #include "actionmodifymove.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" -#include "rs_preview.h" +#include "debug.h" +#include "dialogfactory.h" +#include "preview.h" ActionModifyMove::ActionModifyMove(RS_EntityContainer & container, GraphicView & graphicView): diff --git a/src/actions/actionmodifymove.h b/src/actions/actionmodifymove.h index 7f93a39..87396bf 100644 --- a/src/actions/actionmodifymove.h +++ b/src/actions/actionmodifymove.h @@ -1,7 +1,7 @@ #ifndef __ACTIONMODIFYMOVE_H__ #define __ACTIONMODIFYMOVE_H__ -#include "rs_modification.h" +#include "modification.h" #include "actioninterface.h" #include "vector.h" diff --git a/src/actions/actionmodifymoverotate.cpp b/src/actions/actionmodifymoverotate.cpp index 961ab2a..b8dce06 100644 --- a/src/actions/actionmodifymoverotate.cpp +++ b/src/actions/actionmodifymoverotate.cpp @@ -16,10 +16,10 @@ #include "actionmodifymoverotate.h" -#include "rs_commandevent.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" -#include "rs_preview.h" +#include "commandevent.h" +#include "debug.h" +#include "dialogfactory.h" +#include "preview.h" ActionModifyMoveRotate::ActionModifyMoveRotate( RS_EntityContainer & container, GraphicView & graphicView): diff --git a/src/actions/actionmodifymoverotate.h b/src/actions/actionmodifymoverotate.h index ca9c67a..2fc2c9d 100644 --- a/src/actions/actionmodifymoverotate.h +++ b/src/actions/actionmodifymoverotate.h @@ -1,7 +1,7 @@ #ifndef __ACTIONMODIFYMOVEROTATE_H__ #define __ACTIONMODIFYMOVEROTATE_H__ -#include "rs_modification.h" +#include "modification.h" #include "actioninterface.h" #include "vector.h" diff --git a/src/actions/actionmodifyrotate.cpp b/src/actions/actionmodifyrotate.cpp index 70b4ae5..d784c2b 100644 --- a/src/actions/actionmodifyrotate.cpp +++ b/src/actions/actionmodifyrotate.cpp @@ -16,8 +16,8 @@ #include "actionmodifyrotate.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" ActionModifyRotate::ActionModifyRotate(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Rotate Entities", diff --git a/src/actions/actionmodifyrotate.h b/src/actions/actionmodifyrotate.h index be88a0e..a3e2a21 100644 --- a/src/actions/actionmodifyrotate.h +++ b/src/actions/actionmodifyrotate.h @@ -1,7 +1,7 @@ #ifndef __ACTIONMODIFYROTATE_H__ #define __ACTIONMODIFYROTATE_H__ -#include "rs_modification.h" +#include "modification.h" #include "actioninterface.h" #include "vector.h" diff --git a/src/actions/actionmodifyrotate2.cpp b/src/actions/actionmodifyrotate2.cpp index d859214..892aa23 100644 --- a/src/actions/actionmodifyrotate2.cpp +++ b/src/actions/actionmodifyrotate2.cpp @@ -16,8 +16,8 @@ #include "actionmodifyrotate2.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" ActionModifyRotate2::ActionModifyRotate2( RS_EntityContainer & container, GraphicView & graphicView): diff --git a/src/actions/actionmodifyrotate2.h b/src/actions/actionmodifyrotate2.h index 673f255..94306af 100644 --- a/src/actions/actionmodifyrotate2.h +++ b/src/actions/actionmodifyrotate2.h @@ -1,7 +1,7 @@ #ifndef __ACTIONMODIFYROTATE2_H__ #define __ACTIONMODIFYROTATE2_H__ -#include "rs_modification.h" +#include "modification.h" #include "actioninterface.h" /** diff --git a/src/actions/actionmodifyround.cpp b/src/actions/actionmodifyround.cpp index 87d2ddc..1ed1a79 100644 --- a/src/actions/actionmodifyround.cpp +++ b/src/actions/actionmodifyround.cpp @@ -16,11 +16,11 @@ #include "actionmodifyround.h" -#include "rs_commandevent.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" -#include "rs_information.h" -#include "rs_preview.h" +#include "commandevent.h" +#include "debug.h" +#include "dialogfactory.h" +#include "information.h" +#include "preview.h" ActionModifyRound::ActionModifyRound(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Round Entities", container, graphicView) diff --git a/src/actions/actionmodifyround.h b/src/actions/actionmodifyround.h index fab4bed..1c95482 100644 --- a/src/actions/actionmodifyround.h +++ b/src/actions/actionmodifyround.h @@ -1,7 +1,7 @@ #ifndef __ACTIONMODIFYROUND_H__ #define __ACTIONMODIFYROUND_H__ -#include "rs_modification.h" +#include "modification.h" #include "actioninterface.h" #include "vector.h" diff --git a/src/actions/actionmodifyscale.cpp b/src/actions/actionmodifyscale.cpp index 8e2aa38..8f04c5a 100644 --- a/src/actions/actionmodifyscale.cpp +++ b/src/actions/actionmodifyscale.cpp @@ -16,8 +16,8 @@ #include "actionmodifyscale.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" ActionModifyScale::ActionModifyScale(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Scale Entities", container, graphicView) diff --git a/src/actions/actionmodifyscale.h b/src/actions/actionmodifyscale.h index 3a070cb..0241abf 100644 --- a/src/actions/actionmodifyscale.h +++ b/src/actions/actionmodifyscale.h @@ -1,7 +1,7 @@ #ifndef __ACTIONMODIFYSCALE_H__ #define __ACTIONMODIFYSCALE_H__ -#include "rs_modification.h" +#include "modification.h" #include "actioninterface.h" #include "vector.h" diff --git a/src/actions/actionmodifystretch.cpp b/src/actions/actionmodifystretch.cpp index a61f07c..3dff16a 100644 --- a/src/actions/actionmodifystretch.cpp +++ b/src/actions/actionmodifystretch.cpp @@ -16,10 +16,10 @@ #include "actionmodifystretch.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" -#include "rs_modification.h" -#include "rs_preview.h" +#include "debug.h" +#include "dialogfactory.h" +#include "modification.h" +#include "preview.h" ActionModifyStretch::ActionModifyStretch(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Stretch Entities", diff --git a/src/actions/actionmodifytrim.cpp b/src/actions/actionmodifytrim.cpp index 884aea5..0e66a71 100644 --- a/src/actions/actionmodifytrim.cpp +++ b/src/actions/actionmodifytrim.cpp @@ -16,9 +16,9 @@ #include "actionmodifytrim.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" -#include "rs_modification.h" +#include "debug.h" +#include "dialogfactory.h" +#include "modification.h" /** * @param both Trim both entities. diff --git a/src/actions/actionmodifytrimamount.cpp b/src/actions/actionmodifytrimamount.cpp index 21f2aca..a343678 100644 --- a/src/actions/actionmodifytrimamount.cpp +++ b/src/actions/actionmodifytrimamount.cpp @@ -16,10 +16,10 @@ #include "actionmodifytrimamount.h" -#include "rs_commandevent.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" -#include "rs_modification.h" +#include "commandevent.h" +#include "debug.h" +#include "dialogfactory.h" +#include "modification.h" ActionModifyTrimAmount::ActionModifyTrimAmount( RS_EntityContainer & container, GraphicView & graphicView): diff --git a/src/actions/actionoptionsdrawing.cpp b/src/actions/actionoptionsdrawing.cpp index 4e48b5a..ec39d03 100644 --- a/src/actions/actionoptionsdrawing.cpp +++ b/src/actions/actionoptionsdrawing.cpp @@ -16,7 +16,7 @@ #include "actionoptionsdrawing.h" -#include "rs_dialogfactory.h" +#include "dialogfactory.h" #include "graphicview.h" ActionOptionsDrawing::ActionOptionsDrawing(RS_EntityContainer & container, GraphicView & graphicView): diff --git a/src/actions/actionprintpreview.cpp b/src/actions/actionprintpreview.cpp index a253f22..d43e891 100644 --- a/src/actions/actionprintpreview.cpp +++ b/src/actions/actionprintpreview.cpp @@ -16,7 +16,7 @@ #include "actionprintpreview.h" -#include "rs_dialogfactory.h" +#include "dialogfactory.h" #include "drawing.h" #include "graphicview.h" diff --git a/src/actions/actionselect.cpp b/src/actions/actionselect.cpp index bea5f37..bd96b43 100644 --- a/src/actions/actionselect.cpp +++ b/src/actions/actionselect.cpp @@ -17,7 +17,7 @@ #include "actionselect.h" #include "actionselectsingle.h" -#include "rs_dialogfactory.h" +#include "dialogfactory.h" #include "graphicview.h" ActionSelect::ActionSelect(RS_EntityContainer & container, GraphicView & graphicView, diff --git a/src/actions/actionselectall.cpp b/src/actions/actionselectall.cpp index 561fac7..a54df0b 100644 --- a/src/actions/actionselectall.cpp +++ b/src/actions/actionselectall.cpp @@ -16,8 +16,8 @@ #include "actionselectall.h" -#include "rs_dialogfactory.h" -#include "rs_selection.h" +#include "dialogfactory.h" +#include "selection.h" ActionSelectAll::ActionSelectAll(RS_EntityContainer & container, GraphicView & graphicView, bool select): diff --git a/src/actions/actionselectcontour.cpp b/src/actions/actionselectcontour.cpp index 51477af..648a1f2 100644 --- a/src/actions/actionselectcontour.cpp +++ b/src/actions/actionselectcontour.cpp @@ -16,10 +16,10 @@ #include "actionselectcontour.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_selection.h" +#include "selection.h" ActionSelectContour::ActionSelectContour(RS_EntityContainer & container, GraphicView & graphicView): diff --git a/src/actions/actionselectintersected.cpp b/src/actions/actionselectintersected.cpp index b571d2b..122f1f0 100644 --- a/src/actions/actionselectintersected.cpp +++ b/src/actions/actionselectintersected.cpp @@ -16,11 +16,11 @@ #include "actionselectintersected.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_selection.h" -#include "rs_preview.h" +#include "selection.h" +#include "preview.h" /** * Constructor. diff --git a/src/actions/actionselectinvert.cpp b/src/actions/actionselectinvert.cpp index 544f1aa..eac8098 100644 --- a/src/actions/actionselectinvert.cpp +++ b/src/actions/actionselectinvert.cpp @@ -16,8 +16,8 @@ #include "actionselectinvert.h" -#include "rs_dialogfactory.h" -#include "rs_selection.h" +#include "dialogfactory.h" +#include "selection.h" ActionSelectInvert::ActionSelectInvert(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Invert Selection", diff --git a/src/actions/actionselectlayer.cpp b/src/actions/actionselectlayer.cpp index 0418156..e89f0bd 100644 --- a/src/actions/actionselectlayer.cpp +++ b/src/actions/actionselectlayer.cpp @@ -16,10 +16,10 @@ #include "actionselectlayer.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_selection.h" +#include "selection.h" ActionSelectLayer::ActionSelectLayer(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Select Layers", container, graphicView) diff --git a/src/actions/actionselectsingle.cpp b/src/actions/actionselectsingle.cpp index daffbf0..f994d5d 100644 --- a/src/actions/actionselectsingle.cpp +++ b/src/actions/actionselectsingle.cpp @@ -16,10 +16,10 @@ #include "actionselectsingle.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_selection.h" +#include "selection.h" ActionSelectSingle::ActionSelectSingle(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Select Entities", container, graphicView) diff --git a/src/actions/actionselectwindow.cpp b/src/actions/actionselectwindow.cpp index 06d0ba1..5133693 100644 --- a/src/actions/actionselectwindow.cpp +++ b/src/actions/actionselectwindow.cpp @@ -16,11 +16,11 @@ #include "actionselectwindow.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_selection.h" -#include "rs_preview.h" +#include "selection.h" +#include "preview.h" /** * Constructor. diff --git a/src/actions/actionsetrelativezero.cpp b/src/actions/actionsetrelativezero.cpp index ef69b13..5e1fc09 100644 --- a/src/actions/actionsetrelativezero.cpp +++ b/src/actions/actionsetrelativezero.cpp @@ -16,7 +16,7 @@ #include "actionsetrelativezero.h" -#include "rs_dialogfactory.h" +#include "dialogfactory.h" #include "graphicview.h" ActionSetRelativeZero::ActionSetRelativeZero(RS_EntityContainer & container, diff --git a/src/actions/actionsnapintersectionmanual.cpp b/src/actions/actionsnapintersectionmanual.cpp index df4e13b..72b65f4 100644 --- a/src/actions/actionsnapintersectionmanual.cpp +++ b/src/actions/actionsnapintersectionmanual.cpp @@ -16,11 +16,11 @@ #include "actionsnapintersectionmanual.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_information.h" -#include "rs_preview.h" +#include "information.h" +#include "preview.h" /** * @param both Trim both entities. diff --git a/src/actions/actionzoomwindow.cpp b/src/actions/actionzoomwindow.cpp index c204847..4913c31 100644 --- a/src/actions/actionzoomwindow.cpp +++ b/src/actions/actionzoomwindow.cpp @@ -16,10 +16,10 @@ #include "actionzoomwindow.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_preview.h" +#include "preview.h" /** * Default constructor. diff --git a/src/base/actioninterface.cpp b/src/base/actioninterface.cpp index 10f4524..f4265e7 100644 --- a/src/base/actioninterface.cpp +++ b/src/base/actioninterface.cpp @@ -19,8 +19,8 @@ #include "actioninterface.h" #include "commands.h" -#include "rs_debug.h" -#include "rs_entitycontainer.h" +#include "debug.h" +#include "entitycontainer.h" #include "graphicview.h" /** diff --git a/src/base/rs_arc.cpp b/src/base/arc.cpp similarity index 99% rename from src/base/rs_arc.cpp rename to src/base/arc.cpp index 5fac581..e21a998 100644 --- a/src/base/rs_arc.cpp +++ b/src/base/arc.cpp @@ -1,4 +1,4 @@ -// rs_arc.cpp +// arc.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -15,14 +15,14 @@ // JLH 06/16/2010 Moved implementation from header file to this file // -#include "rs_arc.h" +#include "arc.h" -#include "rs_constructionline.h" -#include "rs_debug.h" +#include "constructionline.h" +#include "debug.h" #include "graphicview.h" -#include "rs_linetypepattern.h" -#include "rs_information.h" -#include "rs_math.h" +#include "linetypepattern.h" +#include "information.h" +#include "mathextra.h" #include "paintinterface.h" /** diff --git a/src/base/rs_arc.h b/src/base/arc.h similarity index 98% rename from src/base/rs_arc.h rename to src/base/arc.h index 974d97e..1db003a 100644 --- a/src/base/rs_arc.h +++ b/src/base/arc.h @@ -1,7 +1,7 @@ -#ifndef RS_ARC_H -#define RS_ARC_H +#ifndef __ARC_H__ +#define __ARC_H__ -#include "rs_atomicentity.h" +#include "atomicentity.h" class PaintInterface; class GraphicView; @@ -141,4 +141,4 @@ class RS_Arc: public RS_AtomicEntity Vector endpoint; }; -#endif +#endif // __ARC_H__ diff --git a/src/base/rs_atomicentity.cpp b/src/base/atomicentity.cpp similarity index 98% rename from src/base/rs_atomicentity.cpp rename to src/base/atomicentity.cpp index 0b70917..7e215d2 100644 --- a/src/base/rs_atomicentity.cpp +++ b/src/base/atomicentity.cpp @@ -1,4 +1,4 @@ -// rs_atomicentity.cpp +// atomicentity.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,7 +14,7 @@ // JLH 05/08/2010 Moved implementation from header to this file. :-) // -#include "rs_atomicentity.h" +#include "atomicentity.h" /** * Construtor. diff --git a/src/base/rs_atomicentity.h b/src/base/atomicentity.h similarity index 91% rename from src/base/rs_atomicentity.h rename to src/base/atomicentity.h index 89a307c..fb5000a 100644 --- a/src/base/rs_atomicentity.h +++ b/src/base/atomicentity.h @@ -1,7 +1,7 @@ -#ifndef RS_ATOMICENTITY_H -#define RS_ATOMICENTITY_H +#ifndef __ATOMICENTITY_H__ +#define __ATOMICENTITY_H__ -#include "rs_entity.h" +#include "entity.h" /** * Class representing a tree of entities. @@ -35,4 +35,4 @@ class RS_AtomicEntity: public RS_Entity virtual void moveSelectedRef(const Vector & ref, const Vector & offset); }; -#endif +#endif // __ATOMICENTITY_H__ diff --git a/src/base/rs_block.cpp b/src/base/block.cpp similarity index 98% rename from src/base/rs_block.cpp rename to src/base/block.cpp index e817031..9d520fb 100644 --- a/src/base/rs_block.cpp +++ b/src/base/block.cpp @@ -1,4 +1,4 @@ -// rs_block.cpp +// block.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,7 +14,7 @@ // JLH 05/21/2010 Added this text. :-) // -#include "rs_block.h" +#include "block.h" #include #include "drawing.h" diff --git a/src/base/rs_block.h b/src/base/block.h similarity index 97% rename from src/base/rs_block.h rename to src/base/block.h index 63b3254..ceed443 100644 --- a/src/base/rs_block.h +++ b/src/base/block.h @@ -1,8 +1,8 @@ -#ifndef RS_BLOCK_H -#define RS_BLOCK_H +#ifndef __BLOCK_H__ +#define __BLOCK_H__ #include -#include "rs_document.h" +#include "document.h" /** * Holds the data that defines a block. diff --git a/src/base/rs_blocklist.cpp b/src/base/blocklist.cpp similarity index 99% rename from src/base/rs_blocklist.cpp rename to src/base/blocklist.cpp index 76e78e9..9804547 100644 --- a/src/base/rs_blocklist.cpp +++ b/src/base/blocklist.cpp @@ -1,4 +1,4 @@ -// rs_blocklist.cpp +// blocklist.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,9 +14,9 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_blocklist.h" +#include "blocklist.h" -#include "rs_debug.h" +#include "debug.h" /** * Constructor. diff --git a/src/base/rs_blocklist.h b/src/base/blocklist.h similarity index 91% rename from src/base/rs_blocklist.h rename to src/base/blocklist.h index ed1dc8c..6b1c630 100644 --- a/src/base/rs_blocklist.h +++ b/src/base/blocklist.h @@ -1,10 +1,10 @@ -#ifndef RS_BLOCKLIST_H -#define RS_BLOCKLIST_H +#ifndef __BLOCKLIST_H__ +#define __BLOCKLIST_H__ #include -#include "rs_block.h" -//#include "rs_blocklistlistener.h" -#include "rs_entity.h" +#include "block.h" +//#include "blocklistlistener.h" +#include "entity.h" /** * List of blocks. diff --git a/src/base/rs_circle.cpp b/src/base/circle.cpp similarity index 98% rename from src/base/rs_circle.cpp rename to src/base/circle.cpp index 563c42a..dc66e34 100644 --- a/src/base/rs_circle.cpp +++ b/src/base/circle.cpp @@ -1,4 +1,4 @@ -// rs_circle.cpp +// circle.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,13 +14,13 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_circle.h" +#include "circle.h" -#include "rs_constructionline.h" -#include "rs_debug.h" +#include "constructionline.h" +#include "debug.h" #include "graphicview.h" -#include "rs_information.h" -#include "rs_linetypepattern.h" +#include "information.h" +#include "linetypepattern.h" #include "paintinterface.h" /** diff --git a/src/base/rs_circle.h b/src/base/circle.h similarity index 95% rename from src/base/rs_circle.h rename to src/base/circle.h index d272ad8..8edd3ea 100644 --- a/src/base/rs_circle.h +++ b/src/base/circle.h @@ -1,7 +1,7 @@ -#ifndef RS_CIRCLE_H -#define RS_CIRCLE_H +#ifndef __CIRCLE_H__ +#define __CIRCLE_H__ -#include "rs_atomicentity.h" +#include "atomicentity.h" /** * Holds the data that defines a circle. @@ -51,7 +51,7 @@ class RS_CircleData class RS_Circle: public RS_AtomicEntity { public: - RS_Circle (RS_EntityContainer * parent, const RS_CircleData & d); + RS_Circle(RS_EntityContainer * parent, const RS_CircleData & d); virtual ~RS_Circle(); virtual RS_Entity * clone(); diff --git a/src/base/rs_clipboard.cpp b/src/base/clipboard.cpp similarity index 92% rename from src/base/rs_clipboard.cpp rename to src/base/clipboard.cpp index 46aaf82..783951e 100644 --- a/src/base/rs_clipboard.cpp +++ b/src/base/clipboard.cpp @@ -1,4 +1,4 @@ -// rs_clipboard.cpp +// clipboard.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,10 +14,10 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_clipboard.h" -#include "rs_block.h" -#include "rs_layer.h" -#include "rs_entity.h" +#include "clipboard.h" +#include "block.h" +#include "layer.h" +#include "entity.h" RS_Clipboard* RS_Clipboard::uniqueInstance = NULL; diff --git a/src/base/rs_clipboard.h b/src/base/clipboard.h similarity index 96% rename from src/base/rs_clipboard.h rename to src/base/clipboard.h index 5e8c270..247d07b 100644 --- a/src/base/rs_clipboard.h +++ b/src/base/clipboard.h @@ -1,5 +1,5 @@ -#ifndef RS_CLIPBOARD_H -#define RS_CLIPBOARD_H +#ifndef __CLIPBOARD_H__ +#define __CLIPBOARD_H__ #include #include "drawing.h" diff --git a/src/base/rs_color.cpp b/src/base/color.cpp similarity index 98% rename from src/base/rs_color.cpp rename to src/base/color.cpp index 14d7961..82d8a1f 100644 --- a/src/base/rs_color.cpp +++ b/src/base/color.cpp @@ -1,4 +1,4 @@ -// rs_color.cpp +// color.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,7 +14,7 @@ // JLH 05/05/2010 Moved implementation from header to this file. :-) // -#include "rs_color.h" +#include "color.h" #include "rs.h" diff --git a/src/base/rs_color.h b/src/base/color.h similarity index 92% rename from src/base/rs_color.h rename to src/base/color.h index 5420f45..d07f48d 100644 --- a/src/base/rs_color.h +++ b/src/base/color.h @@ -1,8 +1,8 @@ -#ifndef RS_COLOR_H -#define RS_COLOR_H +#ifndef __COLOR_H__ +#define __COLOR_H__ #include -#include "rs_flags.h" +#include "flags.h" //! Color defined by layer not entity //#define C_BY_LAYER 0x00000001 diff --git a/src/base/rs_commandevent.cpp b/src/base/commandevent.cpp similarity index 95% rename from src/base/rs_commandevent.cpp rename to src/base/commandevent.cpp index 724a7a1..c1b33b3 100644 --- a/src/base/rs_commandevent.cpp +++ b/src/base/commandevent.cpp @@ -1,4 +1,4 @@ -// rs_commandevent.cpp +// commandevent.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -15,7 +15,7 @@ // JLH 06/02/2010 Moved implementation from header to here WHERE IT BELONGS. // -#include "rs_commandevent.h" +#include "commandevent.h" /** * Creates a new command event that is not yet accepted. diff --git a/src/base/rs_commandevent.h b/src/base/commandevent.h similarity index 81% rename from src/base/rs_commandevent.h rename to src/base/commandevent.h index d766588..0eaefd5 100644 --- a/src/base/rs_commandevent.h +++ b/src/base/commandevent.h @@ -1,5 +1,5 @@ -#ifndef RS_COMMANDEVENT_H -#define RS_COMMANDEVENT_H +#ifndef __COMMANDEVENT_H__ +#define __COMMANDEVENT_H__ #include diff --git a/src/base/rs_constructionline.cpp b/src/base/constructionline.cpp similarity index 98% rename from src/base/rs_constructionline.cpp rename to src/base/constructionline.cpp index 20b9ccd..877a64d 100644 --- a/src/base/rs_constructionline.cpp +++ b/src/base/constructionline.cpp @@ -1,4 +1,4 @@ -// rs_constructionline.cpp +// constructionline.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -15,9 +15,9 @@ // JLH 06/02/2010 Moved implementation from header to here WHERE IT BELONGS. // -#include "rs_constructionline.h" +#include "constructionline.h" -#include "rs_debug.h" +#include "debug.h" /** * Constructor. diff --git a/src/base/rs_constructionline.h b/src/base/constructionline.h similarity index 96% rename from src/base/rs_constructionline.h rename to src/base/constructionline.h index c5d797e..e51a693 100644 --- a/src/base/rs_constructionline.h +++ b/src/base/constructionline.h @@ -1,7 +1,7 @@ -#ifndef RS_CONSTRUCTIONLINE_H -#define RS_CONSTRUCTIONLINE_H +#ifndef __CONSTRUCTIONLINE_H__ +#define __CONSTRUCTIONLINE_H__ -#include "rs_atomicentity.h" +#include "atomicentity.h" #include "vector.h" /** diff --git a/src/base/rs_creation.cpp b/src/base/creation.cpp similarity index 99% rename from src/base/rs_creation.cpp rename to src/base/creation.cpp index be969ef..b6f9d79 100644 --- a/src/base/rs_creation.cpp +++ b/src/base/creation.cpp @@ -1,4 +1,4 @@ -// rs_creation.cpp +// creation.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,16 +14,16 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_creation.h" +#include "creation.h" -#include "rs_constructionline.h" +#include "constructionline.h" #include "drawing.h" #include "graphicview.h" -#include "rs_image.h" -#include "rs_information.h" -#include "rs_insert.h" -#include "rs_modification.h" -#include "rs_units.h" +#include "image.h" +#include "information.h" +#include "insert.h" +#include "modification.h" +#include "units.h" /** * Default constructor. diff --git a/src/base/rs_creation.h b/src/base/creation.h similarity index 98% rename from src/base/rs_creation.h rename to src/base/creation.h index 4e8cab8..35c8d30 100644 --- a/src/base/rs_creation.h +++ b/src/base/creation.h @@ -1,5 +1,5 @@ -#ifndef RS_CREATION_H -#define RS_CREATION_H +#ifndef __CREATION_H__ +#define __CREATION_H__ #include #include "vector.h" diff --git a/src/base/rs_debug.cpp b/src/base/debug.cpp similarity index 98% rename from src/base/rs_debug.cpp rename to src/base/debug.cpp index 5d0cdde..acfafac 100644 --- a/src/base/rs_debug.cpp +++ b/src/base/debug.cpp @@ -1,4 +1,4 @@ -// rs_debug.cpp +// debug.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,10 +14,10 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_debug.h" +#include "debug.h" #include -#include "rs_system.h" +#include "system.h" RS_Debug * RS_Debug::uniqueInstance = NULL; diff --git a/src/base/rs_debug.h b/src/base/debug.h similarity index 92% rename from src/base/rs_debug.h rename to src/base/debug.h index 78da213..771719b 100644 --- a/src/base/rs_debug.h +++ b/src/base/debug.h @@ -1,7 +1,7 @@ -#ifndef RS_DEBUG_H -#define RS_DEBUG_H +#ifndef __DEBUG_H__ +#define __DEBUG_H__ -#ifdef __hpux +#ifdef hpux #include #endif @@ -14,6 +14,7 @@ /** * Debugging facilities. * + * @author James Hammons * @author Andrew Mustun */ class RS_Debug @@ -62,4 +63,4 @@ class RS_Debug FILE * stream; }; -#endif +#endif // __DEBUG_H__ diff --git a/src/base/rs_dialogfactory.cpp b/src/base/dialogfactory.cpp similarity index 96% rename from src/base/rs_dialogfactory.cpp rename to src/base/dialogfactory.cpp index 12c0d4c..5fca3cb 100644 --- a/src/base/rs_dialogfactory.cpp +++ b/src/base/dialogfactory.cpp @@ -1,4 +1,4 @@ -// rs_dialogfactory.cpp +// dialogfactory.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,9 +14,9 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_dialogfactory.h" +#include "dialogfactory.h" -#include "rs_debug.h" +#include "debug.h" RS_DialogFactory * RS_DialogFactory::uniqueInstance = NULL; diff --git a/src/base/rs_dialogfactory.h b/src/base/dialogfactory.h similarity index 83% rename from src/base/rs_dialogfactory.h rename to src/base/dialogfactory.h index 128aa56..b0f580a 100644 --- a/src/base/rs_dialogfactory.h +++ b/src/base/dialogfactory.h @@ -1,7 +1,7 @@ -#ifndef RS_DIALOGFACTORY_H -#define RS_DIALOGFACTORY_H +#ifndef __DIALOGFACTORY_H__ +#define __DIALOGFACTORY_H__ -#include "rs_dialogfactoryadapter.h" +#include "dialogfactoryadapter.h" #define RS_DIALOGFACTORY RS_DialogFactory::instance()->getFactoryObject() @@ -30,4 +30,4 @@ class RS_DialogFactory static RS_DialogFactory * uniqueInstance; }; -#endif +#endif // __DIALOGFACTORY_H__ diff --git a/src/base/rs_dialogfactoryadapter.h b/src/base/dialogfactoryadapter.h similarity index 93% rename from src/base/rs_dialogfactoryadapter.h rename to src/base/dialogfactoryadapter.h index 8ddb17f..d36e450 100644 --- a/src/base/rs_dialogfactoryadapter.h +++ b/src/base/dialogfactoryadapter.h @@ -1,9 +1,9 @@ -#ifndef RS_DIALOGFACTORYADAPTER_H -#define RS_DIALOGFACTORYADAPTER_H +#ifndef __DIALOGFACTORYADAPTER_H__ +#define __DIALOGFACTORYADAPTER_H__ -#include "rs_dialogfactoryinterface.h" -#include "rs_block.h" -#include "rs_layer.h" +#include "dialogfactoryinterface.h" +#include "block.h" +#include "layer.h" class RS_BlockList; class RS_LayerList; @@ -57,4 +57,4 @@ class RS_DialogFactoryAdapter: public RS_DialogFactoryInterface virtual bool isAdapter() { return true; } }; -#endif +#endif // __DIALOGFACTORYADAPTER_H__ diff --git a/src/base/rs_dialogfactoryinterface.h b/src/base/dialogfactoryinterface.h similarity index 99% rename from src/base/rs_dialogfactoryinterface.h rename to src/base/dialogfactoryinterface.h index 9df40de..c12ee70 100644 --- a/src/base/rs_dialogfactoryinterface.h +++ b/src/base/dialogfactoryinterface.h @@ -1,5 +1,5 @@ -#ifndef RS_DIALOGFACTORYINTERFACE_H -#define RS_DIALOGFACTORYINTERFACE_H +#ifndef __DIALOGFACTORYINTERFACE_H__ +#define __DIALOGFACTORYINTERFACE_H__ #include #include "rs.h" @@ -378,4 +378,4 @@ public: virtual bool isAdapter() = 0; }; -#endif +#endif // __DIALOGFACTORYINTERFACE_H__ diff --git a/src/base/rs_dimaligned.cpp b/src/base/dimaligned.cpp similarity index 98% rename from src/base/rs_dimaligned.cpp rename to src/base/dimaligned.cpp index 7a6554a..cc9fc23 100644 --- a/src/base/rs_dimaligned.cpp +++ b/src/base/dimaligned.cpp @@ -1,4 +1,4 @@ -// rs_dimaligned.cpp +// dimaligned.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,11 +14,11 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_dimaligned.h" +#include "dimaligned.h" #include "drawing.h" -#include "rs_units.h" -#include "rs_constructionline.h" +#include "units.h" +#include "constructionline.h" /** * Constructor. diff --git a/src/base/rs_dimaligned.h b/src/base/dimaligned.h similarity index 96% rename from src/base/rs_dimaligned.h rename to src/base/dimaligned.h index c7a260b..a8a7e4f 100644 --- a/src/base/rs_dimaligned.h +++ b/src/base/dimaligned.h @@ -1,7 +1,7 @@ -#ifndef RS_DIMALIGNED_H -#define RS_DIMALIGNED_H +#ifndef __DIMALIGNED_H__ +#define __DIMALIGNED_H__ -#include "rs_dimension.h" +#include "dimension.h" /** * Holds the data that defines an aligned dimension entity. diff --git a/src/base/rs_dimangular.cpp b/src/base/dimangular.cpp similarity index 98% rename from src/base/rs_dimangular.cpp rename to src/base/dimangular.cpp index 4477652..511a570 100644 --- a/src/base/rs_dimangular.cpp +++ b/src/base/dimangular.cpp @@ -1,4 +1,4 @@ -// rs_dimangular.cpp +// dimangular.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,15 +14,15 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_dimangular.h" +#include "dimangular.h" -#include "rs_constructionline.h" -#include "rs_filterdxf.h" +#include "constructionline.h" +#include "filterdxf.h" #include "drawing.h" -#include "rs_information.h" -#include "rs_solid.h" -#include "rs_text.h" -#include "rs_units.h" +#include "information.h" +#include "solid.h" +#include "text.h" +#include "units.h" /** * Constructor. diff --git a/src/base/rs_dimangular.h b/src/base/dimangular.h similarity index 96% rename from src/base/rs_dimangular.h rename to src/base/dimangular.h index 7c7aeef..4c3f71e 100644 --- a/src/base/rs_dimangular.h +++ b/src/base/dimangular.h @@ -1,7 +1,7 @@ -#ifndef RS_DIMANGULAR_H -#define RS_DIMANGULAR_H +#ifndef __DIMANGULAR_H__ +#define __DIMANGULAR_H__ -#include "rs_dimension.h" +#include "dimension.h" /** * Holds the data that defines a angular dimension entity. diff --git a/src/base/rs_dimdiametric.cpp b/src/base/dimdiametric.cpp similarity index 97% rename from src/base/rs_dimdiametric.cpp rename to src/base/dimdiametric.cpp index 68a0727..811115d 100644 --- a/src/base/rs_dimdiametric.cpp +++ b/src/base/dimdiametric.cpp @@ -1,4 +1,4 @@ -// rs_dimdiametric.cpp +// dimdiametric.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,12 +14,12 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_dimdiametric.h" +#include "dimdiametric.h" -#include "rs_text.h" -#include "rs_solid.h" +#include "text.h" +#include "solid.h" #include "drawing.h" -#include "rs_units.h" +#include "units.h" /** * Constructor. diff --git a/src/base/rs_dimdiametric.h b/src/base/dimdiametric.h similarity index 96% rename from src/base/rs_dimdiametric.h rename to src/base/dimdiametric.h index 64d6176..d3ea959 100644 --- a/src/base/rs_dimdiametric.h +++ b/src/base/dimdiametric.h @@ -1,7 +1,7 @@ -#ifndef RS_DIMDIAMETER_H -#define RS_DIMDIAMETER_H +#ifndef __DIMDIAMETER_H__ +#define __DIMDIAMETER_H__ -#include "rs_dimension.h" +#include "dimension.h" /** * Holds the data that defines a diametric dimension entity. diff --git a/src/base/rs_dimension.cpp b/src/base/dimension.cpp similarity index 98% rename from src/base/rs_dimension.cpp rename to src/base/dimension.cpp index 7537841..56f73bd 100644 --- a/src/base/rs_dimension.cpp +++ b/src/base/dimension.cpp @@ -1,4 +1,4 @@ -// rs_dimension.cpp +// dimension.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,11 +14,11 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_dimension.h" +#include "dimension.h" -#include "rs_solid.h" -#include "rs_text.h" -#include "rs_units.h" +#include "solid.h" +#include "text.h" +#include "units.h" /** * Constructor. diff --git a/src/base/rs_dimension.h b/src/base/dimension.h similarity index 98% rename from src/base/rs_dimension.h rename to src/base/dimension.h index 7477a45..fadc601 100644 --- a/src/base/rs_dimension.h +++ b/src/base/dimension.h @@ -1,7 +1,7 @@ -#ifndef RS_DIMENSION_H -#define RS_DIMENSION_H +#ifndef __DIMENSION_H__ +#define __DIMENSION_H__ -#include "rs_entitycontainer.h" +#include "entitycontainer.h" /** * Holds the data that is common to all dimension entities. diff --git a/src/base/rs_dimlinear.cpp b/src/base/dimlinear.cpp similarity index 98% rename from src/base/rs_dimlinear.cpp rename to src/base/dimlinear.cpp index d64f505..9ce80df 100644 --- a/src/base/rs_dimlinear.cpp +++ b/src/base/dimlinear.cpp @@ -1,4 +1,4 @@ -// rs_dimlinear.cpp +// dimlinear.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,13 +14,13 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_dimlinear.h" +#include "dimlinear.h" -#include "rs_constructionline.h" -#include "rs_text.h" -#include "rs_solid.h" +#include "constructionline.h" +#include "text.h" +#include "solid.h" #include "drawing.h" -#include "rs_units.h" +#include "units.h" /** * Constructor. diff --git a/src/base/rs_dimlinear.h b/src/base/dimlinear.h similarity index 97% rename from src/base/rs_dimlinear.h rename to src/base/dimlinear.h index b8c761c..80ed0b1 100644 --- a/src/base/rs_dimlinear.h +++ b/src/base/dimlinear.h @@ -1,7 +1,7 @@ -#ifndef RS_DIMLINEAR_H -#define RS_DIMLINEAR_H +#ifndef __DIMLINEAR_H__ +#define __DIMLINEAR_H__ -#include "rs_dimension.h" +#include "dimension.h" /** * Holds the data that defines a linear dimension entity. diff --git a/src/base/rs_dimradial.cpp b/src/base/dimradial.cpp similarity index 98% rename from src/base/rs_dimradial.cpp rename to src/base/dimradial.cpp index aa00064..d2d48dc 100644 --- a/src/base/rs_dimradial.cpp +++ b/src/base/dimradial.cpp @@ -1,4 +1,4 @@ -// rs_dimradial.cpp +// dimradial.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,12 +14,12 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_dimradial.h" +#include "dimradial.h" #include "drawing.h" -#include "rs_solid.h" -#include "rs_text.h" -#include "rs_units.h" +#include "solid.h" +#include "text.h" +#include "units.h" /** * Constructor. diff --git a/src/base/rs_dimradial.h b/src/base/dimradial.h similarity index 96% rename from src/base/rs_dimradial.h rename to src/base/dimradial.h index a194b52..4570d96 100644 --- a/src/base/rs_dimradial.h +++ b/src/base/dimradial.h @@ -1,7 +1,7 @@ -#ifndef RS_DIMRADIAL_H -#define RS_DIMRADIAL_H +#ifndef __DIMRADIAL_H__ +#define __DIMRADIAL_H__ -#include "rs_dimension.h" +#include "dimension.h" /** * Holds the data that defines a radial dimension entity. diff --git a/src/base/rs_document.cpp b/src/base/document.cpp similarity index 97% rename from src/base/rs_document.cpp rename to src/base/document.cpp index 8279b38..cd8503e 100644 --- a/src/base/rs_document.cpp +++ b/src/base/document.cpp @@ -1,4 +1,4 @@ -// rs_document.cpp +// document.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,9 +14,9 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_document.h" +#include "document.h" -#include "rs_debug.h" +#include "debug.h" /** * Constructor. diff --git a/src/base/rs_document.h b/src/base/document.h similarity index 93% rename from src/base/rs_document.h rename to src/base/document.h index 8519c4d..dd5463c 100644 --- a/src/base/rs_document.h +++ b/src/base/document.h @@ -1,9 +1,9 @@ -#ifndef RS_DOCUMENT_H -#define RS_DOCUMENT_H +#ifndef __DOCUMENT_H__ +#define __DOCUMENT_H__ #include -#include "rs_entitycontainer.h" -#include "rs_undo.h" +#include "entitycontainer.h" +#include "undo.h" class RS_BlockList; class RS_LayerList; diff --git a/src/base/drawing.cpp b/src/base/drawing.cpp index 283586a..4193ae5 100644 --- a/src/base/drawing.cpp +++ b/src/base/drawing.cpp @@ -19,10 +19,10 @@ #include "drawing.h" -#include "rs_debug.h" -#include "rs_fileio.h" -#include "rs_math.h" -#include "rs_units.h" +#include "debug.h" +#include "fileio.h" +#include "mathextra.h" +#include "units.h" #include "settings.h" /** diff --git a/src/base/drawing.h b/src/base/drawing.h index a794474..1190f71 100644 --- a/src/base/drawing.h +++ b/src/base/drawing.h @@ -1,12 +1,12 @@ -#ifndef RS_GRAPHIC_H -#define RS_GRAPHIC_H +#ifndef __GRAPHIC_H__ +#define __GRAPHIC_H__ -#include "rs_blocklist.h" -#include "rs_layerlist.h" -#include "rs_variabledict.h" -#include "rs_document.h" +#include "blocklist.h" +#include "layerlist.h" +#include "variabledict.h" +#include "document.h" #ifdef RS_CAM -#include "rs_camdata.h" +#include "camdata.h" #endif //class RS_CamData; diff --git a/src/base/rs_ellipse.cpp b/src/base/ellipse.cpp similarity index 99% rename from src/base/rs_ellipse.cpp rename to src/base/ellipse.cpp index 8b0fea2..030a733 100644 --- a/src/base/rs_ellipse.cpp +++ b/src/base/ellipse.cpp @@ -1,4 +1,4 @@ -// rs_ellipse.cpp +// ellipse.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,12 +14,12 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_ellipse.h" +#include "ellipse.h" #include "drawing.h" #include "graphicview.h" -#include "rs_information.h" -#include "rs_linetypepattern.h" +#include "information.h" +#include "linetypepattern.h" #include "paintinterface.h" /** diff --git a/src/base/rs_ellipse.h b/src/base/ellipse.h similarity index 97% rename from src/base/rs_ellipse.h rename to src/base/ellipse.h index dc0588c..2ed0f98 100644 --- a/src/base/rs_ellipse.h +++ b/src/base/ellipse.h @@ -1,7 +1,7 @@ -#ifndef RS_ELLIPSE_H -#define RS_ELLIPSE_H +#ifndef __ELLIPSE_H__ +#define __ELLIPSE_H__ -#include "rs_atomicentity.h" +#include "atomicentity.h" /** * Holds the data that defines an ellipse. diff --git a/src/base/rs_entity.cpp b/src/base/entity.cpp similarity index 98% rename from src/base/rs_entity.cpp rename to src/base/entity.cpp index ff86b6b..bf5be9c 100644 --- a/src/base/rs_entity.cpp +++ b/src/base/entity.cpp @@ -1,4 +1,4 @@ -// rs_entity.cpp +// entity.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,23 +14,23 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_entity.h" +#include "entity.h" #include -#include "rs_arc.h" -#include "rs_circle.h" -#include "rs_debug.h" -#include "rs_document.h" -#include "rs_ellipse.h" +#include "arc.h" +#include "circle.h" +#include "debug.h" +#include "document.h" +#include "ellipse.h" #include "drawing.h" #include "graphicview.h" -#include "rs_insert.h" -#include "rs_layer.h" -#include "rs_line.h" -#include "rs_point.h" -#include "rs_polyline.h" -#include "rs_text.h" -#include "rs_units.h" +#include "insert.h" +#include "layer.h" +#include "line.h" +#include "point.h" +#include "polyline.h" +#include "text.h" +#include "units.h" /** * Default constructor. diff --git a/src/base/rs_entity.h b/src/base/entity.h similarity index 98% rename from src/base/rs_entity.h rename to src/base/entity.h index bd1060e..8aad246 100644 --- a/src/base/rs_entity.h +++ b/src/base/entity.h @@ -1,12 +1,12 @@ -#ifndef RS_ENTITY_H -#define RS_ENTITY_H +#ifndef __ENTITY_H__ +#define __ENTITY_H__ #include #include "rs.h" -#include "rs_layer.h" -#include "rs_math.h" -#include "rs_pen.h" -#include "rs_undoable.h" +#include "layer.h" +#include "mathextra.h" +#include "pen.h" +#include "undoable.h" #include "vector.h" #include "vectorsolutions.h" @@ -281,4 +281,4 @@ class RS_Entity: public RS_Undoable QMultiHash varList; }; -#endif +#endif // __ENTITY_H__ diff --git a/src/base/rs_entitycontainer.cpp b/src/base/entitycontainer.cpp similarity index 99% rename from src/base/rs_entitycontainer.cpp rename to src/base/entitycontainer.cpp index e3c4091..238c5a8 100644 --- a/src/base/rs_entitycontainer.cpp +++ b/src/base/entitycontainer.cpp @@ -1,4 +1,4 @@ -// rs_entitycontainer.cpp +// entitycontainer.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,18 +14,18 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_entitycontainer.h" - -#include "rs_debug.h" -#include "rs_dimension.h" -#include "rs_math.h" -#include "rs_layer.h" -#include "rs_line.h" -#include "rs_polyline.h" -#include "rs_text.h" -#include "rs_insert.h" -#include "rs_spline.h" -#include "rs_information.h" +#include "entitycontainer.h" + +#include "debug.h" +#include "dimension.h" +#include "mathextra.h" +#include "layer.h" +#include "line.h" +#include "polyline.h" +#include "text.h" +#include "insert.h" +#include "spline.h" +#include "information.h" #include "graphicview.h" #include "paintinterface.h" diff --git a/src/base/rs_entitycontainer.h b/src/base/entitycontainer.h similarity index 95% rename from src/base/rs_entitycontainer.h rename to src/base/entitycontainer.h index a55733e..a8c4d9e 100644 --- a/src/base/rs_entitycontainer.h +++ b/src/base/entitycontainer.h @@ -1,13 +1,13 @@ -#ifndef RS_ENTITYCONTAINER_H -#define RS_ENTITYCONTAINER_H +#ifndef __ENTITYCONTAINER_H__ +#define __ENTITYCONTAINER_H__ #include -#include "rs_arc.h" -#include "rs_circle.h" -#include "rs_ellipse.h" -#include "rs_entity.h" -#include "rs_line.h" -#include "rs_point.h" +#include "arc.h" +#include "circle.h" +#include "ellipse.h" +#include "entity.h" +#include "line.h" +#include "point.h" /** * Class representing a tree of entities. @@ -121,4 +121,4 @@ class RS_EntityContainer: public RS_Entity QListIterator entityIterator; }; -#endif +#endif // __ENTITYCONTAINER_H__ diff --git a/src/base/rs_eventhandler.cpp b/src/base/eventhandler.cpp similarity index 99% rename from src/base/rs_eventhandler.cpp rename to src/base/eventhandler.cpp index fa89eff..58334af 100644 --- a/src/base/rs_eventhandler.cpp +++ b/src/base/eventhandler.cpp @@ -1,4 +1,4 @@ -// rs_eventhandler.cpp +// eventhandler.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,14 +14,14 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_eventhandler.h" +#include "eventhandler.h" #include "actioninterface.h" -#include "rs_commandevent.h" -#include "rs_debug.h" -#include "rs_dialogfactory.h" +#include "commandevent.h" +#include "debug.h" +#include "dialogfactory.h" #include "graphicview.h" -#include "rs_math.h" +#include "mathextra.h" /** * Constructor. diff --git a/src/base/rs_eventhandler.h b/src/base/eventhandler.h similarity index 94% rename from src/base/rs_eventhandler.h rename to src/base/eventhandler.h index 55e0dc7..aab7f39 100644 --- a/src/base/rs_eventhandler.h +++ b/src/base/eventhandler.h @@ -1,5 +1,5 @@ -#ifndef RS_EVENTHANDLER_H -#define RS_EVENTHANDLER_H +#ifndef __EVENTHANDLER_H__ +#define __EVENTHANDLER_H__ #include #include "rs.h" @@ -53,4 +53,4 @@ class RS_EventHandler bool coordinateInputEnabled; }; -#endif +#endif // __EVENTHANDLER_H__ diff --git a/src/base/rs_fileio.cpp b/src/base/fileio.cpp similarity index 96% rename from src/base/rs_fileio.cpp rename to src/base/fileio.cpp index dc29997..3187bed 100644 --- a/src/base/rs_fileio.cpp +++ b/src/base/fileio.cpp @@ -1,4 +1,4 @@ -// rs_fileio.cpp +// fileio.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -15,12 +15,12 @@ // JLH 09/07/2010 Fixed file detection algorithm. // -#include "rs_fileio.h" +#include "fileio.h" -#include "rs_filtercxf.h" -#include "rs_filterdxf.h" -#include "rs_filterdxf1.h" -#include "rs_filterinterface.h" +#include "filtercxf.h" +#include "filterdxf.h" +#include "filterdxf1.h" +#include "filterinterface.h" RS_FileIO * RS_FileIO::uniqueInstance = NULL; diff --git a/src/base/rs_fileio.h b/src/base/fileio.h similarity index 90% rename from src/base/rs_fileio.h rename to src/base/fileio.h index fa0e8c3..a564f78 100644 --- a/src/base/rs_fileio.h +++ b/src/base/fileio.h @@ -1,5 +1,5 @@ -#ifndef RS_FILEIO_H -#define RS_FILEIO_H +#ifndef __FILEIO_H__ +#define __FILEIO_H__ #include #include "rs.h" @@ -12,6 +12,7 @@ class RS_FilterInterface; /** * API Class for importing files. * + * @author James Hammons * @author Andrew Mustun */ class RS_FileIO @@ -36,4 +37,4 @@ class RS_FileIO QList filterList; }; -#endif +#endif // __FILEIO_H__ diff --git a/src/base/rs_filtercxf.cpp b/src/base/filtercxf.cpp similarity index 98% rename from src/base/rs_filtercxf.cpp rename to src/base/filtercxf.cpp index 09a0e72..31c80e7 100644 --- a/src/base/rs_filtercxf.cpp +++ b/src/base/filtercxf.cpp @@ -1,4 +1,4 @@ -// rs_filtercxf.cpp +// filtercxf.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,15 +14,15 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_filtercxf.h" +#include "filtercxf.h" #include #include #include -#include "rs_font.h" -#include "rs_utility.h" -#include "rs_system.h" +#include "font.h" +#include "utility.h" +#include "system.h" /** * Default constructor. diff --git a/src/base/rs_filtercxf.h b/src/base/filtercxf.h similarity index 90% rename from src/base/rs_filtercxf.h rename to src/base/filtercxf.h index 85e81dc..973af92 100644 --- a/src/base/rs_filtercxf.h +++ b/src/base/filtercxf.h @@ -1,8 +1,8 @@ -#ifndef RS_FILTERCXF_H -#define RS_FILTERCXF_H +#ifndef __FILTERCXF_H__ +#define __FILTERCXF_H__ #include -#include "rs_filterinterface.h" +#include "filterinterface.h" /** * This format filter class can import and export CXF (CAM Expert Font) files. diff --git a/src/base/rs_filterdxf.cpp b/src/base/filterdxf.cpp similarity index 99% rename from src/base/rs_filterdxf.cpp rename to src/base/filterdxf.cpp index c1b73c4..18fb3f9 100644 --- a/src/base/rs_filterdxf.cpp +++ b/src/base/filterdxf.cpp @@ -1,4 +1,4 @@ -// rs_filterdxf.cpp +// filterdxf.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,22 +14,22 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_filterdxf.h" +#include "filterdxf.h" #include #include #include "dl_attributes.h" #include "dl_codes.h" #include "dl_writer_ascii.h" -#include "rs_dimaligned.h" -#include "rs_dimangular.h" -#include "rs_dimdiametric.h" -#include "rs_dimlinear.h" -#include "rs_dimradial.h" -#include "rs_hatch.h" -#include "rs_image.h" -#include "rs_leader.h" -#include "rs_system.h" +#include "dimaligned.h" +#include "dimangular.h" +#include "dimdiametric.h" +#include "dimlinear.h" +#include "dimradial.h" +#include "hatch.h" +#include "image.h" +#include "leader.h" +#include "system.h" /** * Default constructor. diff --git a/src/base/rs_filterdxf.h b/src/base/filterdxf.h similarity index 94% rename from src/base/rs_filterdxf.h rename to src/base/filterdxf.h index ce3d574..1287da1 100644 --- a/src/base/rs_filterdxf.h +++ b/src/base/filterdxf.h @@ -1,21 +1,21 @@ -#ifndef RS_FILTERDXF_H -#define RS_FILTERDXF_H - -#include "rs_filterinterface.h" - -#include "rs_block.h" -#include "rs_color.h" -#include "rs_dimension.h" -#include "rs_hatch.h" -#include "rs_insert.h" -#include "rs_layer.h" -#include "rs_layer.h" -#include "rs_leader.h" -#include "rs_polyline.h" -#include "rs_spline.h" -#include "rs_solid.h" -#include "rs_text.h" -#include "rs_image.h" +#ifndef __FILTERDXF_H__ +#define __FILTERDXF_H__ + +#include "filterinterface.h" + +#include "block.h" +#include "color.h" +#include "dimension.h" +#include "hatch.h" +#include "insert.h" +#include "layer.h" +#include "layer.h" +#include "leader.h" +#include "polyline.h" +#include "spline.h" +#include "solid.h" +#include "text.h" +#include "image.h" #include "dl_creationinterface.h" #include "dl_dxf.h" @@ -179,4 +179,4 @@ class RS_FilterDXF: public RS_FilterInterface, DL_CreationInterface RS_VariableDict variables; }; -#endif +#endif // __FILTERDXF_H__ diff --git a/src/base/rs_filterdxf1.cpp b/src/base/filterdxf1.cpp similarity index 99% rename from src/base/rs_filterdxf1.cpp rename to src/base/filterdxf1.cpp index c50d382..4a03ad5 100644 --- a/src/base/rs_filterdxf1.cpp +++ b/src/base/filterdxf1.cpp @@ -1,4 +1,4 @@ -// rs_filterdxf1.cpp +// filterdxf1.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,19 +14,19 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_filterdxf1.h" +#include "filterdxf1.h" #include -#include "rs_filterdxf.h" -#include "rs_font.h" -#include "rs_information.h" -#include "rs_utility.h" -#include "rs_system.h" -#include "rs_dimlinear.h" -#include "rs_dimaligned.h" -#include "rs_dimangular.h" -#include "rs_dimdiametric.h" -#include "rs_dimradial.h" +#include "filterdxf.h" +#include "font.h" +#include "information.h" +#include "utility.h" +#include "system.h" +#include "dimlinear.h" +#include "dimaligned.h" +#include "dimangular.h" +#include "dimdiametric.h" +#include "dimradial.h" /** * Default constructor. diff --git a/src/base/rs_filterdxf1.h b/src/base/filterdxf1.h similarity index 95% rename from src/base/rs_filterdxf1.h rename to src/base/filterdxf1.h index 5f86af5..422fa2c 100644 --- a/src/base/rs_filterdxf1.h +++ b/src/base/filterdxf1.h @@ -1,10 +1,10 @@ -#ifndef RS_FILTERDXF1_H -#define RS_FILTERDXF1_H +#ifndef __FILTERDXF1_H__ +#define __FILTERDXF1_H__ #include -#include "rs_filterinterface.h" -//#include "rs_file.h" +#include "filterinterface.h" +//#include "file.h" /** * This format filter class can import and export old DXF files diff --git a/src/base/rs_filterinterface.cpp b/src/base/filterinterface.cpp similarity index 95% rename from src/base/rs_filterinterface.cpp rename to src/base/filterinterface.cpp index d3a0f45..4b7a091 100644 --- a/src/base/rs_filterinterface.cpp +++ b/src/base/filterinterface.cpp @@ -1,4 +1,4 @@ -// rs_filterinterface.cpp +// filterinterface.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,9 +14,9 @@ // JLH 05/05/2010 Moved implementation from header to this file. :-) // -#include "rs_filterinterface.h" +#include "filterinterface.h" -#include "rs_debug.h" +#include "debug.h" /** * Constructor. diff --git a/src/base/rs_filterinterface.h b/src/base/filterinterface.h similarity index 96% rename from src/base/rs_filterinterface.h rename to src/base/filterinterface.h index 730203b..7addd6e 100644 --- a/src/base/rs_filterinterface.h +++ b/src/base/filterinterface.h @@ -1,5 +1,5 @@ -#ifndef RS_FILTERINTERFACE_H -#define RS_FILTERINTERFACE_H +#ifndef __FILTERINTERFACE_H__ +#define __FILTERINTERFACE_H__ #include #include "drawing.h" diff --git a/src/base/rs_flags.cpp b/src/base/flags.cpp similarity index 96% rename from src/base/rs_flags.cpp rename to src/base/flags.cpp index 2dcba42..3261795 100644 --- a/src/base/rs_flags.cpp +++ b/src/base/flags.cpp @@ -1,4 +1,4 @@ -// rs_flags.cpp +// flags.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,7 +14,7 @@ // JLH 08/03/2010 Created this file. :-) // -#include "rs_flags.h" +#include "flags.h" /** Default constructor. Resets all flags to 0. */ RS_Flags::RS_Flags() diff --git a/src/base/rs_flags.h b/src/base/flags.h similarity index 91% rename from src/base/rs_flags.h rename to src/base/flags.h index e127a40..d8a7133 100644 --- a/src/base/rs_flags.h +++ b/src/base/flags.h @@ -1,5 +1,5 @@ -#ifndef RS_FLAGS_H -#define RS_FLAGS_H +#ifndef __FLAGS_H__ +#define __FLAGS_H__ /** * Base class for objects which have flags. diff --git a/src/base/rs_font.cpp b/src/base/font.cpp similarity index 98% rename from src/base/rs_font.cpp rename to src/base/font.cpp index a7156ce..b5a1303 100644 --- a/src/base/rs_font.cpp +++ b/src/base/font.cpp @@ -1,4 +1,4 @@ -// rs_font.cpp +// font.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,12 +14,12 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_font.h" +#include "font.h" -#include "rs_color.h" -#include "rs_fontchar.h" -#include "rs_math.h" -#include "rs_system.h" +#include "color.h" +#include "fontchar.h" +#include "mathextra.h" +#include "system.h" /** * Constructor. diff --git a/src/base/rs_font.h b/src/base/font.h similarity index 96% rename from src/base/rs_font.h rename to src/base/font.h index 61eee22..f47d0cf 100644 --- a/src/base/rs_font.h +++ b/src/base/font.h @@ -1,9 +1,9 @@ -#ifndef RS_FONT_H -#define RS_FONT_H +#ifndef __FONT_H__ +#define __FONT_H__ #include #include -#include "rs_blocklist.h" +#include "blocklist.h" /** * Class for representing a font. This is implemented as a Drawing diff --git a/src/base/rs_fontchar.h b/src/base/fontchar.h similarity index 93% rename from src/base/rs_fontchar.h rename to src/base/fontchar.h index 11fc761..df74ae5 100644 --- a/src/base/rs_fontchar.h +++ b/src/base/fontchar.h @@ -1,7 +1,7 @@ -#ifndef RS_FONTCHAR_H -#define RS_FONTCHAR_H +#ifndef __FONTCHAR_H__ +#define __FONTCHAR_H__ -#include "rs_block.h" +#include "block.h" /** * A character in a font is represented by this special block class. diff --git a/src/base/rs_fontlist.cpp b/src/base/fontlist.cpp similarity index 97% rename from src/base/rs_fontlist.cpp rename to src/base/fontlist.cpp index c910671..80527a4 100644 --- a/src/base/rs_fontlist.cpp +++ b/src/base/fontlist.cpp @@ -1,4 +1,4 @@ -// rs_fontlist.cpp +// fontlist.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,11 +14,11 @@ // JLH 05/27/2010 Added this text. :-) // -#include "rs_fontlist.h" +#include "fontlist.h" -#include "rs_font.h" -#include "rs_entity.h" -#include "rs_system.h" +#include "font.h" +#include "entity.h" +#include "system.h" //[DONE] #warning "!!! NEED TO FIX ITERATORS IN THIS CLASS !!!" diff --git a/src/base/rs_fontlist.h b/src/base/fontlist.h similarity index 84% rename from src/base/rs_fontlist.h rename to src/base/fontlist.h index e955d7b..4030493 100644 --- a/src/base/rs_fontlist.h +++ b/src/base/fontlist.h @@ -1,5 +1,5 @@ -#ifndef RS_FONTLIST_H -#define RS_FONTLIST_H +#ifndef __FONTLIST_H__ +#define __FONTLIST_H__ #include @@ -11,6 +11,7 @@ class RS_Font; * The global list of fonts. This is implemented as a singleton. * Use RS_FontList::instance() to get a pointer to the object. * + * @author James Hammons * @author Andrew Mustun */ class RS_FontList @@ -20,14 +21,13 @@ class RS_FontList public: /** - * @return Instance to the unique font list. - */ + * @return Instance to the unique font list. + */ static RS_FontList * instance(); virtual ~RS_FontList(); void init(); - void clearFonts(); int countFonts(); virtual void removeFont(RS_Font * font); @@ -42,9 +42,8 @@ class RS_FontList private: //! fonts in the graphic -// Q3PtrList fonts; QList fonts; QListIterator fontIterator; }; -#endif +#endif // __FONTLIST_H__ diff --git a/src/base/rs_grid.cpp b/src/base/grid.cpp similarity index 99% rename from src/base/rs_grid.cpp rename to src/base/grid.cpp index b12f7c8..d6e5fbd 100644 --- a/src/base/rs_grid.cpp +++ b/src/base/grid.cpp @@ -1,4 +1,4 @@ -// rs_grid.cpp +// grid.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,13 +14,13 @@ // JLH 05/21/2010 Added this text. :-) // -#include "rs_grid.h" +#include "grid.h" #include "drawing.h" #include "graphicview.h" -//#include "rs_graphicview.h" +//#include "graphicview.h" #include "settings.h" -#include "rs_units.h" +#include "units.h" #include "vector.h" #warning "!!! Clean out all references to RS_GraphicView here and in header !!!" diff --git a/src/base/rs_grid.h b/src/base/grid.h similarity index 96% rename from src/base/rs_grid.h rename to src/base/grid.h index d2ba69a..62c2808 100644 --- a/src/base/rs_grid.h +++ b/src/base/grid.h @@ -1,5 +1,5 @@ -#ifndef RS_GRID_H -#define RS_GRID_H +#ifndef __GRID_H__ +#define __GRID_H__ #include diff --git a/src/base/rs_hatch.cpp b/src/base/hatch.cpp similarity index 99% rename from src/base/rs_hatch.cpp rename to src/base/hatch.cpp index ef1fa55..1ff0902 100644 --- a/src/base/rs_hatch.cpp +++ b/src/base/hatch.cpp @@ -1,4 +1,4 @@ -// rs_hatch.cpp +// hatch.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,15 +14,15 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_hatch.h" +#include "hatch.h" #include #include "drawing.h" #include "graphicview.h" -#include "rs_information.h" +#include "information.h" #include "paintinterface.h" -#include "rs_pattern.h" -#include "rs_patternlist.h" +#include "pattern.h" +#include "patternlist.h" /** * Constructor. diff --git a/src/base/rs_hatch.h b/src/base/hatch.h similarity index 89% rename from src/base/rs_hatch.h rename to src/base/hatch.h index ba560ed..298f38c 100644 --- a/src/base/rs_hatch.h +++ b/src/base/hatch.h @@ -1,8 +1,8 @@ -#ifndef RS_HATCH_H -#define RS_HATCH_H +#ifndef __HATCH_H__ +#define __HATCH_H__ -#include "rs_entity.h" -#include "rs_entitycontainer.h" +#include "entity.h" +#include "entitycontainer.h" /** * Holds the data that defines a hatch entity. @@ -27,12 +27,12 @@ class RS_HatchData this->angle = angle; this->pattern = pattern; - //std::cout << "RS_HatchData: " << pattern.latin1() << "\n"; + //std::cout << "RS_H__atchData: " << pattern.latin1() << "\n"; } friend std::ostream & operator<<(std::ostream & os, const RS_HatchData & td) { - os << "(" << td.pattern.toLatin1().data() << ")"; + os << "(" << td.pattern.toAscii().data() << ")"; return os; } @@ -46,6 +46,7 @@ class RS_HatchData /** * Class for a hatch entity. * + * @author James Hammons * @author Andrew Mustun */ class RS_Hatch: public RS_EntityContainer @@ -93,4 +94,4 @@ class RS_Hatch: public RS_EntityContainer bool needOptimization; }; -#endif +#endif // __HATCH_H__ diff --git a/src/base/rs_image.cpp b/src/base/image.cpp similarity index 98% rename from src/base/rs_image.cpp rename to src/base/image.cpp index 7567297..fa493ec 100644 --- a/src/base/rs_image.cpp +++ b/src/base/image.cpp @@ -1,4 +1,4 @@ -// rs_image.cpp +// image.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,12 +14,12 @@ // JLH 05/28/2010 Added this text. :-) // -#include "rs_image.h" +#include "image.h" -#include "rs_constructionline.h" -#include "rs_debug.h" +#include "constructionline.h" +#include "debug.h" #include "graphicview.h" -#include "rs_line.h" +#include "line.h" #include "paintinterface.h" /** diff --git a/src/base/rs_image.h b/src/base/image.h similarity index 98% rename from src/base/rs_image.h rename to src/base/image.h index 5076a3e..082c26c 100644 --- a/src/base/rs_image.h +++ b/src/base/image.h @@ -1,8 +1,8 @@ -#ifndef RS_IMAGE_H -#define RS_IMAGE_H +#ifndef __IMAGE_H__ +#define __IMAGE_H__ #include -#include "rs_atomicentity.h" +#include "atomicentity.h" /** * Holds the data that defines a line. diff --git a/src/base/rs_infoarea.cpp b/src/base/infoarea.cpp similarity index 97% rename from src/base/rs_infoarea.cpp rename to src/base/infoarea.cpp index e93eeaa..1046349 100644 --- a/src/base/rs_infoarea.cpp +++ b/src/base/infoarea.cpp @@ -1,4 +1,4 @@ -// rs_infoarea.cpp +// infoarea.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,10 +14,10 @@ // JLH 06/01/2010 Added this text. :-) // -#include "rs_infoarea.h" +#include "infoarea.h" -#include "rs_math.h" -#include "rs_debug.h" +#include "mathextra.h" +#include "debug.h" /** * Constructor. diff --git a/src/base/rs_infoarea.h b/src/base/infoarea.h similarity index 92% rename from src/base/rs_infoarea.h rename to src/base/infoarea.h index 4bc2fb2..607a5c7 100644 --- a/src/base/rs_infoarea.h +++ b/src/base/infoarea.h @@ -1,5 +1,5 @@ -#ifndef RS_INFOAREA_H -#define RS_INFOAREA_H +#ifndef __INFOAREA_H__ +#define __INFOAREA_H__ #include #include "vector.h" diff --git a/src/base/rs_information.cpp b/src/base/information.cpp similarity index 99% rename from src/base/rs_information.cpp rename to src/base/information.cpp index 54a3180..ee95485 100644 --- a/src/base/rs_information.cpp +++ b/src/base/information.cpp @@ -1,4 +1,4 @@ -// rs_information.cpp +// information.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,10 +14,10 @@ // JLH 06/01/2010 Added this text. :-) // -#include "rs_information.h" +#include "information.h" -#include "rs_constructionline.h" -#include "rs_debug.h" +#include "constructionline.h" +#include "debug.h" /** * Default constructor. diff --git a/src/base/rs_information.h b/src/base/information.h similarity index 92% rename from src/base/rs_information.h rename to src/base/information.h index 57175e2..4af7994 100644 --- a/src/base/rs_information.h +++ b/src/base/information.h @@ -1,9 +1,9 @@ -#ifndef RS_INFORMATION_H -#define RS_INFORMATION_H +#ifndef __INFORMATION_H__ +#define __INFORMATION_H__ -#include "rs_entitycontainer.h" -#include "rs_line.h" -#include "rs_arc.h" +#include "entitycontainer.h" +#include "line.h" +#include "arc.h" /** * Class for getting information about entities. This includes diff --git a/src/base/rs_insert.cpp b/src/base/insert.cpp similarity index 99% rename from src/base/rs_insert.cpp rename to src/base/insert.cpp index 3b42e69..5365b00 100644 --- a/src/base/rs_insert.cpp +++ b/src/base/insert.cpp @@ -1,4 +1,4 @@ -// rs_insert.cpp +// insert.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,9 +14,9 @@ // JLH 06/01/2010 Added this text. :-) // -#include "rs_insert.h" +#include "insert.h" -#include "rs_block.h" +#include "block.h" #include "drawing.h" /** diff --git a/src/base/rs_insert.h b/src/base/insert.h similarity index 97% rename from src/base/rs_insert.h rename to src/base/insert.h index aafb2f4..b6e17ae 100644 --- a/src/base/rs_insert.h +++ b/src/base/insert.h @@ -1,8 +1,8 @@ -#ifndef RS_INSERT_H -#define RS_INSERT_H +#ifndef __INSERT_H__ +#define __INSERT_H__ -#include "rs_entitycontainer.h" -#include "rs_block.h" +#include "entitycontainer.h" +#include "block.h" #include "drawing.h" /** diff --git a/src/base/rs_layer.cpp b/src/base/layer.cpp similarity index 97% rename from src/base/rs_layer.cpp rename to src/base/layer.cpp index ee468fe..4146aa2 100644 --- a/src/base/rs_layer.cpp +++ b/src/base/layer.cpp @@ -1,4 +1,4 @@ -// rs_layer.cpp +// layer.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,10 +14,10 @@ // JLH 06/01/2010 Added this text. :-) // -#include "rs_layer.h" +#include "layer.h" -#include "rs_color.h" -#include "rs_math.h" +#include "color.h" +#include "mathextra.h" /** * Constructor. diff --git a/src/base/rs_layer.h b/src/base/layer.h similarity index 94% rename from src/base/rs_layer.h rename to src/base/layer.h index 36e8da7..187b675 100644 --- a/src/base/rs_layer.h +++ b/src/base/layer.h @@ -1,5 +1,5 @@ -#ifndef RS_LAYER_H -#define RS_LAYER_H +#ifndef __LAYER_H__ +#define __LAYER_H__ #include @@ -10,8 +10,8 @@ #include #include -#include "rs_flags.h" -#include "rs_pen.h" +#include "flags.h" +#include "pen.h" /** * Holds the data that defines a layer. diff --git a/src/base/rs_layerlist.cpp b/src/base/layerlist.cpp similarity index 98% rename from src/base/rs_layerlist.cpp rename to src/base/layerlist.cpp index 56c169e..d468904 100644 --- a/src/base/rs_layerlist.cpp +++ b/src/base/layerlist.cpp @@ -1,4 +1,4 @@ -// rs_layerlist.cpp +// layerlist.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,12 +14,12 @@ // JLH 06/01/2010 Added this text. :-) // -#include "rs_layerlist.h" +#include "layerlist.h" -//#include "rs_layerlistlistener.h" -#include "rs_debug.h" -#include "rs_entity.h" -#include "rs_layer.h" +//#include "layerlistlistener.h" +#include "debug.h" +#include "entity.h" +#include "layer.h" /** * Default constructor. diff --git a/src/base/rs_layerlist.h b/src/base/layerlist.h similarity index 96% rename from src/base/rs_layerlist.h rename to src/base/layerlist.h index 0dcdfbd..2ee231e 100644 --- a/src/base/rs_layerlist.h +++ b/src/base/layerlist.h @@ -1,5 +1,5 @@ -#ifndef RS_LAYERLIST_H -#define RS_LAYERLIST_H +#ifndef __LAYERLIST_H__ +#define __LAYERLIST_H__ #include #include diff --git a/src/base/rs_leader.cpp b/src/base/leader.cpp similarity index 97% rename from src/base/rs_leader.cpp rename to src/base/leader.cpp index 73c1288..945e3df 100644 --- a/src/base/rs_leader.cpp +++ b/src/base/leader.cpp @@ -1,4 +1,4 @@ -// rs_leader.cpp +// leader.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,11 +14,11 @@ // JLH 06/01/2010 Added this text. :-) // -#include "rs_leader.h" +#include "leader.h" -#include "rs_debug.h" -#include "rs_line.h" -#include "rs_solid.h" +#include "debug.h" +#include "line.h" +#include "solid.h" /** * Constructor. diff --git a/src/base/rs_leader.h b/src/base/leader.h similarity index 93% rename from src/base/rs_leader.h rename to src/base/leader.h index ca60740..521093e 100644 --- a/src/base/rs_leader.h +++ b/src/base/leader.h @@ -1,8 +1,8 @@ -#ifndef RS_LEADER_H -#define RS_LEADER_H +#ifndef __LEADER_H__ +#define __LEADER_H__ -#include "rs_entity.h" -#include "rs_entitycontainer.h" +#include "entity.h" +#include "entitycontainer.h" /** * Holds the data that defines a leader. diff --git a/src/base/rs_line.cpp b/src/base/line.cpp similarity index 99% rename from src/base/rs_line.cpp rename to src/base/line.cpp index d571aa6..7b8404c 100644 --- a/src/base/rs_line.cpp +++ b/src/base/line.cpp @@ -1,4 +1,4 @@ -// rs_line.cpp +// line.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,12 +14,12 @@ // JLH 06/01/2010 Added this text. :-) // -#include "rs_line.h" +#include "line.h" -#include "rs_debug.h" +#include "debug.h" #include "drawing.h" #include "graphicview.h" -#include "rs_linetypepattern.h" +#include "linetypepattern.h" #include "paintinterface.h" /** diff --git a/src/base/rs_line.h b/src/base/line.h similarity index 97% rename from src/base/rs_line.h rename to src/base/line.h index 7b3cdcd..695bec7 100644 --- a/src/base/rs_line.h +++ b/src/base/line.h @@ -1,7 +1,7 @@ -#ifndef RS_LINE_H -#define RS_LINE_H +#ifndef __LINE_H__ +#define __LINE_H__ -#include "rs_atomicentity.h" +#include "atomicentity.h" /** * Holds the data that defines a line. diff --git a/src/base/rs_linetypepattern.cpp b/src/base/linetypepattern.cpp similarity index 93% rename from src/base/rs_linetypepattern.cpp rename to src/base/linetypepattern.cpp index e1f2efc..8488a22 100644 --- a/src/base/rs_linetypepattern.cpp +++ b/src/base/linetypepattern.cpp @@ -1,4 +1,4 @@ -// rs_linetypepattern.cpp +// linetypepattern.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,7 +14,7 @@ // JLH 06/01/2010 Added this text. :-) // -#include "rs_linetypepattern.h" +#include "linetypepattern.h" RS_LineTypePattern::RS_LineTypePattern(int count ...) { diff --git a/src/base/rs_linetypepattern.h b/src/base/linetypepattern.h similarity index 96% rename from src/base/rs_linetypepattern.h rename to src/base/linetypepattern.h index 93ef8b7..7674177 100644 --- a/src/base/rs_linetypepattern.h +++ b/src/base/linetypepattern.h @@ -1,5 +1,5 @@ -#ifndef RS_LINETYPEPATTERN_H -#define RS_LINETYPEPATTERN_H +#ifndef __LINETYPEPATTERN_H__ +#define __LINETYPEPATTERN_H__ #include diff --git a/src/base/rs_mainwindowinterface.h b/src/base/mainwindowinterface.h similarity index 87% rename from src/base/rs_mainwindowinterface.h rename to src/base/mainwindowinterface.h index e1ad32f..eefd0e2 100644 --- a/src/base/rs_mainwindowinterface.h +++ b/src/base/mainwindowinterface.h @@ -1,5 +1,5 @@ -#ifndef RS_MAINWINDOWINTERFACE_H -#define RS_MAINWINDOWINTERFACE_H +#ifndef __MAINWINDOWINTERFACE_H__ +#define __MAINWINDOWINTERFACE_H__ class GraphicView; class RS_Document; diff --git a/src/base/rs_math.cpp b/src/base/mathextra.cpp similarity index 90% rename from src/base/rs_math.cpp rename to src/base/mathextra.cpp index 1d2f848..7646bf0 100644 --- a/src/base/rs_math.cpp +++ b/src/base/mathextra.cpp @@ -1,4 +1,4 @@ -// rs_math.cpp +// mathextra.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,13 +14,13 @@ // JLH 06/01/2010 Added this text. :-) // -#include "rs_math.h" +#include "mathextra.h" #include // For test() #include #include #include "fparser.h" -#include "rs_debug.h" +#include "debug.h" /** * Rounds the given double to the next int. @@ -113,16 +113,12 @@ bool RS_Math::isAngleBetween(double a, double a1, double a2, bool reversed) if (a1 >= a2 - 1.0e-12) { if (a >= a1 - 1.0e-12 || a <= a2 + 1.0e-12) - { ret = true; - } } else { if (a >= a1 - 1.0e-12 && a <= a2 + 1.0e-12) - { ret = true; - } } //RS_DEBUG->print("angle %f is %sbetween %f and %f", @@ -186,7 +182,7 @@ double RS_Math::makeAngleReadable(double angle, bool readable, bool * corrected) else ret = angle + M_PI; - if (corrected != NULL) + if (corrected) *corrected = cor; return ret; @@ -213,14 +209,8 @@ bool RS_Math::isSameDirection(double dir1, double dir2, double tol) double diff = fabs(dir1 - dir2); if (diff < tol || diff > 2 * M_PI - tol) - { - //std::cout << "RS_Math::isSameDirection: " << dir1 << " and " << dir2 - // << " point in the same direction" << "\n"; return true; - } - //std::cout << "RS_Math::isSameDirection: " << dir1 << " and " << dir2 - // << " don't point in the same direction" << "\n"; return false; } @@ -242,11 +232,7 @@ double RS_Math::eval(const QString & expr, double def) double res = RS_Math::eval(expr, &ok); if (!ok) - { - //std::cerr << "RS_Math::evaluate: Parse error at col " - //<< ret << ": " << fp.ErrorMsg() << "\n"; return def; - } return res; } @@ -275,12 +261,10 @@ double RS_Math::eval(const QString & expr, bool * ok) do { done = true; -// int i = s.find(QRegExp("[0-9]* [0-9]*/[0-9]*")); int i = s.indexOf(QRegExp("[0-9]* [0-9]*/[0-9]*")); if (i != -1) { -// int i2 = s.find(' ', i); int i2 = s.indexOf(' ', i); if (i2 != -1) @@ -292,7 +276,7 @@ double RS_Math::eval(const QString & expr, bool * ok) } while (!done); - int ret = fp.Parse(s.toLatin1().data(), "", true); + int ret = fp.Parse(s.toAscii().data(), "", true); if (ret >= 0) { @@ -324,13 +308,10 @@ QString RS_Math::doubleToString(double value, double prec) } QString ret; - QString exaStr; - int dotPos; int num = RS_Math::round(value / prec); - exaStr = RS_Math::doubleToString(prec, 10); -// dotPos = exaStr.find('.'); - dotPos = exaStr.indexOf('.'); + QString exaStr = RS_Math::doubleToString(prec, 10); + int dotPos = exaStr.indexOf('.'); if (dotPos == -1) ret.sprintf("%d", RS_Math::round(num * prec)); diff --git a/src/base/rs_math.h b/src/base/mathextra.h similarity index 86% rename from src/base/rs_math.h rename to src/base/mathextra.h index 4f8f874..eeb1ea6 100644 --- a/src/base/rs_math.h +++ b/src/base/mathextra.h @@ -1,11 +1,5 @@ -#ifndef RS_MATH_H -#define RS_MATH_H - -// no idea why, but doesn't link without that under win32 / bcc55: -//who cares if it doesn't -//#ifndef _MT -//#define _MT -//#endif +#ifndef __MATHEXTRA_H__ +#define __MATHEXTRA_H__ #include @@ -40,4 +34,4 @@ public: static void test(); }; -#endif +#endif // __MATHEXTRA_H__ diff --git a/src/base/rs_modification.cpp b/src/base/modification.cpp similarity index 99% rename from src/base/rs_modification.cpp rename to src/base/modification.cpp index c43ae64..c93ea26 100644 --- a/src/base/rs_modification.cpp +++ b/src/base/modification.cpp @@ -1,4 +1,4 @@ -// rs_modification.cpp +// modification.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,17 +14,17 @@ // JLH 06/01/2010 Added this text. :-) // -#include "rs_modification.h" +#include "modification.h" -#include "rs_clipboard.h" -#include "rs_creation.h" -#include "rs_entity.h" +#include "clipboard.h" +#include "creation.h" +#include "entity.h" #include "drawing.h" -#include "rs_information.h" -#include "rs_insert.h" -#include "rs_polyline.h" -#include "rs_text.h" -#include "rs_units.h" +#include "information.h" +#include "insert.h" +#include "polyline.h" +#include "text.h" +#include "units.h" /** * Default constructor. diff --git a/src/base/rs_modification.h b/src/base/modification.h similarity index 98% rename from src/base/rs_modification.h rename to src/base/modification.h index c4183f9..fc139dd 100644 --- a/src/base/rs_modification.h +++ b/src/base/modification.h @@ -1,9 +1,9 @@ -#ifndef RS_MODIFICATION_H -#define RS_MODIFICATION_H +#ifndef __MODIFICATION_H__ +#define __MODIFICATION_H__ -#include "rs_entitycontainer.h" +#include "entitycontainer.h" #include "graphicview.h" -#include "rs_line.h" +#include "line.h" /** * Holds the data needed for move modifications. diff --git a/src/base/paintinterface.cpp b/src/base/paintinterface.cpp index d98db84..1fd7751 100644 --- a/src/base/paintinterface.cpp +++ b/src/base/paintinterface.cpp @@ -18,8 +18,8 @@ #include "paintinterface.h" -#include "rs_debug.h" -#include "rs_math.h" +#include "debug.h" +#include "mathextra.h" PaintInterface::PaintInterface(QPainter * p): painter(p), drawingMode(RS2::ModeFull), offset(Vector(0.0, 0.0)) diff --git a/src/base/paintinterface.h b/src/base/paintinterface.h index acd0ad4..072d333 100644 --- a/src/base/paintinterface.h +++ b/src/base/paintinterface.h @@ -1,11 +1,11 @@ -#ifndef __PAINTINTERFACE_H__ -#define __PAINTINTERFACE_H__ +#ifndef ____PAINTINTERFACE_H____ +#define ____PAINTINTERFACE_H____ #include #include "rs.h" #include "vector.h" -#include "rs_color.h" -#include "rs_pen.h" +#include "color.h" +#include "pen.h" // This is an interface class to the rest of the RS_* functions that are supposed // to be toolkit independent, but, because the author of QCad had no idea how to @@ -76,4 +76,4 @@ class PaintInterface RS_Pen lpen; }; -#endif // __PAINTINTERFACE_H__ +#endif // __PAINTINTERFACE_H____ diff --git a/src/base/rs_pattern.cpp b/src/base/pattern.cpp similarity index 97% rename from src/base/rs_pattern.cpp rename to src/base/pattern.cpp index 9cfa3a9..5d14519 100644 --- a/src/base/rs_pattern.cpp +++ b/src/base/pattern.cpp @@ -1,4 +1,4 @@ -// rs_pattern.cpp +// pattern.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,11 +14,11 @@ // JLH 06/01/2010 Added this text. :-) // -#include "rs_pattern.h" +#include "pattern.h" #include -#include "rs_system.h" -#include "rs_fileio.h" +#include "system.h" +#include "fileio.h" #include "drawing.h" /** diff --git a/src/base/rs_pattern.h b/src/base/pattern.h similarity index 86% rename from src/base/rs_pattern.h rename to src/base/pattern.h index 98344ec..9852573 100644 --- a/src/base/rs_pattern.h +++ b/src/base/pattern.h @@ -1,7 +1,7 @@ -#ifndef RS_PATTERN_H -#define RS_PATTERN_H +#ifndef __PATTERN_H__ +#define __PATTERN_H__ -#include "rs_entitycontainer.h" +#include "entitycontainer.h" class RS_PatternList; diff --git a/src/base/rs_patternlist.cpp b/src/base/patternlist.cpp similarity index 98% rename from src/base/rs_patternlist.cpp rename to src/base/patternlist.cpp index 76eb7ca..c9f1499 100644 --- a/src/base/rs_patternlist.cpp +++ b/src/base/patternlist.cpp @@ -1,4 +1,4 @@ -// rs_patternlist.cpp +// patternlist.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,9 +14,9 @@ // JLH 06/01/2010 Added this text. :-) // -#include "rs_patternlist.h" +#include "patternlist.h" -#include "rs_system.h" +#include "system.h" RS_PatternList * RS_PatternList::uniqueInstance = NULL; diff --git a/src/base/rs_patternlist.h b/src/base/patternlist.h similarity index 78% rename from src/base/rs_patternlist.h rename to src/base/patternlist.h index f5c1061..0690203 100644 --- a/src/base/rs_patternlist.h +++ b/src/base/patternlist.h @@ -1,9 +1,9 @@ -#ifndef RS_PATTERNLIST_H -#define RS_PATTERNLIST_H +#ifndef __PATTERNLIST_H__ +#define __PATTERNLIST_H__ #include -#include "rs_pattern.h" -#include "rs_entity.h" +#include "pattern.h" +#include "entity.h" #define RS_PATTERNLIST RS_PatternList::instance() @@ -11,6 +11,7 @@ * The global list of patterns. This is implemented as a singleton. * Use RS_PatternList::instance() to get a pointer to the object. * + * @author James Hammons * @author Andrew Mustun */ class RS_PatternList @@ -38,11 +39,8 @@ class RS_PatternList private: //! patterns in the graphic - // Q3PtrList patterns; QList patterns; QListIterator patternIterator; - //! List of registered PatternListListeners - //Q3PtrList patternListListeners; }; -#endif +#endif // __PATTERNLIST_H__ diff --git a/src/base/rs_pen.cpp b/src/base/pen.cpp similarity index 98% rename from src/base/rs_pen.cpp rename to src/base/pen.cpp index 2423cf4..ee68475 100644 --- a/src/base/rs_pen.cpp +++ b/src/base/pen.cpp @@ -1,4 +1,4 @@ -// rs_pen.cpp +// pen.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,7 +14,7 @@ // JLH 08/03/2010 Created this file. :-) // -#include "rs_pen.h" +#include "pen.h" /** * Creates a default pen (black, solid, width 0). diff --git a/src/base/rs_pen.h b/src/base/pen.h similarity index 92% rename from src/base/rs_pen.h rename to src/base/pen.h index 4d6c9c0..526dade 100644 --- a/src/base/rs_pen.h +++ b/src/base/pen.h @@ -1,9 +1,9 @@ -#ifndef RS_PEN_H -#define RS_PEN_H +#ifndef __PEN_H__ +#define __PEN_H__ #include "rs.h" -#include "rs_color.h" -#include "rs_flags.h" +#include "color.h" +#include "flags.h" /** * A pen stores attributes for painting such as line width, diff --git a/src/base/rs_point.cpp b/src/base/point.cpp similarity index 98% rename from src/base/rs_point.cpp rename to src/base/point.cpp index 825659b..6a680db 100644 --- a/src/base/rs_point.cpp +++ b/src/base/point.cpp @@ -1,4 +1,4 @@ -// rs_point.cpp +// point.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,7 +14,7 @@ // JLH 06/01/2010 Added this text. :-) // -#include "rs_point.h" +#include "point.h" #include "graphicview.h" #include "paintinterface.h" diff --git a/src/base/rs_point.h b/src/base/point.h similarity index 96% rename from src/base/rs_point.h rename to src/base/point.h index e25c25b..20fb95e 100644 --- a/src/base/rs_point.h +++ b/src/base/point.h @@ -1,7 +1,7 @@ -#ifndef RS_POINT_H -#define RS_POINT_H +#ifndef __POINT_H__ +#define __POINT_H__ -#include "rs_atomicentity.h" +#include "atomicentity.h" /** * Holds the data that defines a point. diff --git a/src/base/rs_polyline.cpp b/src/base/polyline.cpp similarity index 99% rename from src/base/rs_polyline.cpp rename to src/base/polyline.cpp index 8fb1074..77fdbab 100644 --- a/src/base/rs_polyline.cpp +++ b/src/base/polyline.cpp @@ -1,4 +1,4 @@ -// rs_polyline.cpp +// polyline.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,11 +14,11 @@ // JLH 06/01/2010 Added this text. :-) // -#include "rs_polyline.h" +#include "polyline.h" -#include "rs_debug.h" -#include "rs_line.h" -#include "rs_arc.h" +#include "debug.h" +#include "line.h" +#include "arc.h" #include "graphicview.h" #include "paintinterface.h" diff --git a/src/base/rs_polyline.h b/src/base/polyline.h similarity index 96% rename from src/base/rs_polyline.h rename to src/base/polyline.h index 0066847..49c9b09 100644 --- a/src/base/rs_polyline.h +++ b/src/base/polyline.h @@ -1,8 +1,8 @@ -#ifndef RS_POLYLINE_H -#define RS_POLYLINE_H +#ifndef __POLYLINE_H__ +#define __POLYLINE_H__ -#include "rs_entity.h" -#include "rs_entitycontainer.h" +#include "entity.h" +#include "entitycontainer.h" /** * Holds the data that defines a polyline. diff --git a/src/base/rs_preview.cpp b/src/base/preview.cpp similarity index 97% rename from src/base/rs_preview.cpp rename to src/base/preview.cpp index 2c38235..1a873b8 100644 --- a/src/base/rs_preview.cpp +++ b/src/base/preview.cpp @@ -1,4 +1,4 @@ -// rs_preview.cpp +// preview.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,11 +14,11 @@ // JLH 05/21/2010 Added this text. :-) // -#include "rs_preview.h" +#include "preview.h" -#include "rs_entitycontainer.h" +#include "entitycontainer.h" #include "graphicview.h" -#include "rs_information.h" +#include "information.h" #include "paintinterface.h" #include "settings.h" diff --git a/src/base/rs_preview.h b/src/base/preview.h similarity index 92% rename from src/base/rs_preview.h rename to src/base/preview.h index e1151de..42ed4d0 100644 --- a/src/base/rs_preview.h +++ b/src/base/preview.h @@ -1,7 +1,7 @@ -#ifndef RS_PREVIEW_H -#define RS_PREVIEW_H +#ifndef __PREVIEW_H__ +#define __PREVIEW_H__ -#include "rs_entitycontainer.h" +#include "entitycontainer.h" #include "vector.h" class RS_Entity; diff --git a/src/base/rs_python.cpp b/src/base/python.cpp similarity index 98% rename from src/base/rs_python.cpp rename to src/base/python.cpp index ded5742..b3a92d3 100644 --- a/src/base/rs_python.cpp +++ b/src/base/python.cpp @@ -1,4 +1,4 @@ -// rs_python.cpp +// python.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,7 +14,7 @@ // JLH 06/02/2010 Added this text. :-) // -#include "rs_python.h" +#include "python.h" #ifdef RS_OPT_PYTHON diff --git a/src/base/rs_python.h b/src/base/python.h similarity index 85% rename from src/base/rs_python.h rename to src/base/python.h index cea41f9..7e1a7db 100644 --- a/src/base/rs_python.h +++ b/src/base/python.h @@ -1,5 +1,5 @@ -#ifndef RS_PYTHON_H -#define RS_PYTHON_H +#ifndef __PYTHON_H__ +#define __PYTHON_H__ #ifdef RS_OPT_PYTHON @@ -7,7 +7,7 @@ #include "drawing.h" -#define RS_PYTHON RS_Python::instance() +#define __PYTHON RS_Python::instance() /** * Python scripting support. diff --git a/src/base/rs_python_wrappers.cpp b/src/base/python_wrappers.cpp similarity index 97% rename from src/base/rs_python_wrappers.cpp rename to src/base/python_wrappers.cpp index 9af577a..68901f4 100644 --- a/src/base/rs_python_wrappers.cpp +++ b/src/base/python_wrappers.cpp @@ -24,32 +24,32 @@ #include using namespace boost::python; -#include "rs_python_wrappers.h" -#include "rs_python.h" +#include "python_wrappers.h" +#include "python.h" #include "rs.h" -#include "rs_arc.h" -#include "rs_atomicentity.h" -#include "rs_block.h" -#include "rs_blocklist.h" -#include "rs_circle.h" -#include "rs_color.h" -#include "rs_constructionline.h" -#include "rs_document.h" -#include "rs_ellipse.h" -#include "rs_entitycontainer.h" -#include "rs_entity.h" -#include "rs_flags.h" +#include "arc.h" +#include "atomicentity.h" +#include "block.h" +#include "blocklist.h" +#include "circle.h" +#include "color.h" +#include "constructionline.h" +#include "document.h" +#include "ellipse.h" +#include "entitycontainer.h" +#include "entity.h" +#include "flags.h" #include "drawing.h" -#include "rs_image.h" -#include "rs_insert.h" -#include "rs_layer.h" -#include "rs_layerlist.h" -#include "rs_line.h" -#include "rs_pen.h" -#include "rs_point.h" -#include "rs_polyline.h" -#include "rs_vector.h" +#include "image.h" +#include "insert.h" +#include "layer.h" +#include "layerlist.h" +#include "line.h" +#include "pen.h" +#include "point.h" +#include "polyline.h" +#include "vector.h" /* Global root functions */ Drawing* currentGraphic() { return RS_PYTHON->getGraphic(); } diff --git a/src/base/rs_python_wrappers.h b/src/base/python_wrappers.h similarity index 100% rename from src/base/rs_python_wrappers.h rename to src/base/python_wrappers.h diff --git a/src/base/rs.h b/src/base/rs.h index 6d7424a..d0bfc41 100644 --- a/src/base/rs.h +++ b/src/base/rs.h @@ -1,5 +1,5 @@ -#ifndef RS_H -#define RS_H +#ifndef __RS_H__ +#define __RS_H__ #include #include @@ -15,10 +15,10 @@ #define RS_MINDOUBLE -1.0E+10 /** - * Class namespace for various enums along with some simple - * wrapper methods for converting the enums to the Qt - * counterparts. + * Class namespace for various enums along with some simple wrapper methods for + * converting the enums to the Qt counterparts. * + * @author James Hammons * @author Andrew Mustun */ class RS2 @@ -559,52 +559,6 @@ public: RestrictVertical /**< Restrict to 90,270 degrees */ }; -#if 0 -enum Qt::ButtonState_enum -Constant Value -Qt::ShiftButton Qt::ShiftModifier -Qt::ControlButton Qt::ControlModifier -Qt::AltButton Qt::AltModifier -Qt::MetaButton Qt::MetaModifier -Qt::Keypad Qt::KeypadModifier -Qt::KeyButtonMask Qt::KeyboardModifierMask - /** - * Mouse button and keyboard state for mouse events. - */ - enum ButtonState { - NoButton = Qt::NoButton, - LeftButton = Qt::LeftButton, - RightButton = Qt::RightButton, - MidButton = Qt::MidButton, - MouseButtonMask = Qt::MouseButtonMask, - ShiftButton = Qt::ShiftModifier, - ControlButton = Qt::ControlModifier, - AltButton = Qt::AltModifier, - MetaButton = Qt::MetaModifier, - KeyButtonMask = Qt::KeyboardModifierMask, - Keypad = Qt::KeypadModifier - }; -#endif - -//get rid of unnecessary shiaut like this: -#if 0 - /** - * Wrapper for Qt - */ -// static Qt::ButtonState rsToQtButtonState(RS2::ButtonState t) { -// return (Qt::ButtonState)t; -// } - static int rsToQtButtonState(RS2::ButtonState t) { return t; } - - /** - * Wrapper for Qt - */ -// static RS2::ButtonState qtToRsButtonState(Qt::ButtonState t) { -// return (RS2::ButtonState)t; -// } - static RS2::ButtonState qtToRsButtonState(int t) { return (RS2::ButtonState)t; } -#endif - /** * Enum of line styles: */ @@ -1120,4 +1074,4 @@ Qt::KeyButtonMask Qt::KeyboardModifierMask } }; -#endif +#endif // __RS_H__ diff --git a/src/base/rs_script.cpp b/src/base/script.cpp similarity index 95% rename from src/base/rs_script.cpp rename to src/base/script.cpp index 24cb0d3..5cb583a 100644 --- a/src/base/rs_script.cpp +++ b/src/base/script.cpp @@ -1,4 +1,4 @@ -// rs_script.cpp +// script.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,7 +14,7 @@ // JLH 06/02/2010 Added this text. :-) // -#include "rs_script.h" +#include "script.h" /** * Constructor. diff --git a/src/base/rs_script.h b/src/base/script.h similarity index 91% rename from src/base/rs_script.h rename to src/base/script.h index 9db7d02..18a3bb6 100644 --- a/src/base/rs_script.h +++ b/src/base/script.h @@ -1,5 +1,5 @@ -#ifndef RS_SCRIPT_H -#define RS_SCRIPT_H +#ifndef __SCRIPT_H__ +#define __SCRIPT_H__ #include diff --git a/src/base/rs_scriptlist.cpp b/src/base/scriptlist.cpp similarity index 98% rename from src/base/rs_scriptlist.cpp rename to src/base/scriptlist.cpp index ce5c173..4b6b007 100644 --- a/src/base/rs_scriptlist.cpp +++ b/src/base/scriptlist.cpp @@ -1,4 +1,4 @@ -// rs_scriptlist.cpp +// scriptlist.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,9 +14,9 @@ // JLH 06/02/2010 Added this text. :-) // -#include "rs_scriptlist.h" +#include "scriptlist.h" -#include "rs_system.h" +#include "system.h" RS_ScriptList * RS_ScriptList::uniqueInstance = NULL; diff --git a/src/base/rs_scriptlist.h b/src/base/scriptlist.h similarity index 85% rename from src/base/rs_scriptlist.h rename to src/base/scriptlist.h index ca45ec3..417d00a 100644 --- a/src/base/rs_scriptlist.h +++ b/src/base/scriptlist.h @@ -1,10 +1,11 @@ -#ifndef RS_SCRIPTLIST_H -#define RS_SCRIPTLIST_H +#ifndef __SCRIPTLIST_H__ +#define __SCRIPTLIST_H__ #include -#include "rs_script.h" +#include "script.h" #define RS_SCRIPTLIST RS_ScriptList::instance() +#warning "!!! THIS CLASS IS OBSOLETE !!!" /** * The global list of scripts. This is implemented as a singleton. @@ -41,4 +42,4 @@ class RS_ScriptList QListIterator scriptIterator; }; -#endif +#endif // __SCRIPTLIST_H__ diff --git a/src/base/rs_selection.cpp b/src/base/selection.cpp similarity index 98% rename from src/base/rs_selection.cpp rename to src/base/selection.cpp index d2ab97d..1261f70 100644 --- a/src/base/rs_selection.cpp +++ b/src/base/selection.cpp @@ -1,4 +1,4 @@ -// rs_selection.cpp +// selection.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,13 +14,13 @@ // JLH 06/02/2010 Added this text. :-) // -#include "rs_selection.h" +#include "selection.h" #include "drawing.h" -#include "rs_entity.h" +#include "entity.h" #include "graphicview.h" -#include "rs_information.h" -#include "rs_polyline.h" +#include "information.h" +#include "polyline.h" /** * Default constructor. diff --git a/src/base/rs_selection.h b/src/base/selection.h similarity index 93% rename from src/base/rs_selection.h rename to src/base/selection.h index 2e6ffb3..3a39ebe 100644 --- a/src/base/rs_selection.h +++ b/src/base/selection.h @@ -1,7 +1,7 @@ -#ifndef RS_SELECTION_H -#define RS_SELECTION_H +#ifndef __SELECTION_H__ +#define __SELECTION_H__ -#include "rs_entitycontainer.h" +#include "entitycontainer.h" class Drawing; class GraphicView; diff --git a/src/base/rs_simplepython.cpp b/src/base/simplepython.cpp similarity index 98% rename from src/base/rs_simplepython.cpp rename to src/base/simplepython.cpp index 0ea2e1b..522a2e9 100644 --- a/src/base/rs_simplepython.cpp +++ b/src/base/simplepython.cpp @@ -1,4 +1,4 @@ -// rs_simplepython.cpp +// simplepython.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -15,7 +15,7 @@ // #ifdef RS_OPT_SIMPLEPYTHON -#include "rs_simplepython.h" +#include "simplepython.h" RS_SimplePython* RS_SimplePython::uniqueInstance = NULL; diff --git a/src/base/rs_simplepython.h b/src/base/simplepython.h similarity index 88% rename from src/base/rs_simplepython.h rename to src/base/simplepython.h index 9466165..031a82e 100644 --- a/src/base/rs_simplepython.h +++ b/src/base/simplepython.h @@ -1,5 +1,5 @@ -#ifndef RS_SIMPLEPYTHON_H -#define RS_SIMPLEPYTHON_H +#ifndef __SIMPLEPYTHON_H__ +#define __SIMPLEPYTHON_H__ #ifdef RS_OPT_SIMPLEPYTHON @@ -7,7 +7,7 @@ #include "drawing.h" -#define RS_SIMPLEPYTHON RS_SimplePython::instance() +#define __SIMPLEPYTHON RS_SimplePython::instance() /** * Python scripting support. diff --git a/src/base/rs_snapper.cpp b/src/base/snapper.cpp similarity index 98% rename from src/base/rs_snapper.cpp rename to src/base/snapper.cpp index 2aa4f25..dd6e8bc 100644 --- a/src/base/rs_snapper.cpp +++ b/src/base/snapper.cpp @@ -1,4 +1,4 @@ -// rs_snapper.cpp +// snapper.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,14 +14,14 @@ // JLH 05/21/2010 Added this text. :-) // -#include "rs_snapper.h" +#include "snapper.h" -#include "rs_dialogfactory.h" +#include "dialogfactory.h" #include "drawing.h" -#include "rs_entitycontainer.h" +#include "entitycontainer.h" #include "graphicview.h" -#include "rs_grid.h" -#include "rs_information.h" +#include "grid.h" +#include "information.h" #include "paintinterface.h" #include "settings.h" diff --git a/src/base/rs_snapper.h b/src/base/snapper.h similarity index 98% rename from src/base/rs_snapper.h rename to src/base/snapper.h index 52bd4f7..990e4ae 100644 --- a/src/base/rs_snapper.h +++ b/src/base/snapper.h @@ -1,5 +1,5 @@ -#ifndef RS_SNAPPER_H -#define RS_SNAPPER_H +#ifndef __SNAPPER_H__ +#define __SNAPPER_H__ #include #include "rs.h" diff --git a/src/base/rs_solid.cpp b/src/base/solid.cpp similarity index 98% rename from src/base/rs_solid.cpp rename to src/base/solid.cpp index 8e3814e..5fcb044 100644 --- a/src/base/rs_solid.cpp +++ b/src/base/solid.cpp @@ -1,4 +1,4 @@ -// rs_solid.cpp +// solid.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,9 +14,9 @@ // JLH 06/02/2010 Added this text. :-) // -#include "rs_solid.h" +#include "solid.h" -#include "rs_debug.h" +#include "debug.h" #include "graphicview.h" #include "paintinterface.h" diff --git a/src/base/rs_solid.h b/src/base/solid.h similarity index 97% rename from src/base/rs_solid.h rename to src/base/solid.h index d2f8761..a4b4578 100644 --- a/src/base/rs_solid.h +++ b/src/base/solid.h @@ -1,7 +1,7 @@ -#ifndef RS_SOLID_H -#define RS_SOLID_H +#ifndef __SOLID_H__ +#define __SOLID_H__ -#include "rs_atomicentity.h" +#include "atomicentity.h" #include "vector.h" /** diff --git a/src/base/rs_spline.cpp b/src/base/spline.cpp similarity index 99% rename from src/base/rs_spline.cpp rename to src/base/spline.cpp index ec686c2..c28a232 100644 --- a/src/base/rs_spline.cpp +++ b/src/base/spline.cpp @@ -1,4 +1,4 @@ -// rs_spline.cpp +// spline.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,9 +14,9 @@ // JLH 06/02/2010 Added this text. :-) // -#include "rs_spline.h" +#include "spline.h" -#include "rs_debug.h" +#include "debug.h" #include "graphicview.h" #include "drawing.h" #include "paintinterface.h" diff --git a/src/base/rs_spline.h b/src/base/spline.h similarity index 97% rename from src/base/rs_spline.h rename to src/base/spline.h index 30e613a..dd6470b 100644 --- a/src/base/rs_spline.h +++ b/src/base/spline.h @@ -1,8 +1,8 @@ -#ifndef RS_SPLINE_H -#define RS_SPLINE_H +#ifndef __SPLINE_H__ +#define __SPLINE_H__ #include -#include "rs_entitycontainer.h" +#include "entitycontainer.h" /** * Holds the data that defines a line. diff --git a/src/base/rs_staticgraphicview.cpp b/src/base/staticgraphicview.cpp similarity index 96% rename from src/base/rs_staticgraphicview.cpp rename to src/base/staticgraphicview.cpp index 4064573..76896ef 100644 --- a/src/base/rs_staticgraphicview.cpp +++ b/src/base/staticgraphicview.cpp @@ -1,4 +1,4 @@ -// rs_staticgraphicview.cpp +// staticgraphicview.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -21,9 +21,9 @@ easily replaced by putting a bitmap creation method in GraphicView. But that's just me. >:-) */ -#include "rs_staticgraphicview.h" +#include "staticgraphicview.h" -#include "rs_debug.h" +#include "debug.h" /** * Constructor. diff --git a/src/base/rs_staticgraphicview.h b/src/base/staticgraphicview.h similarity index 91% rename from src/base/rs_staticgraphicview.h rename to src/base/staticgraphicview.h index 6347c19..e934108 100644 --- a/src/base/rs_staticgraphicview.h +++ b/src/base/staticgraphicview.h @@ -1,5 +1,5 @@ -#ifndef RS_STATICGRAPHICVIEW_H -#define RS_STATICGRAPHICVIEW_H +#ifndef __STATICGRAPHICVIEW_H__ +#define __STATICGRAPHICVIEW_H__ #include "graphicview.h" diff --git a/src/base/rs_system.cpp b/src/base/system.cpp similarity index 99% rename from src/base/rs_system.cpp rename to src/base/system.cpp index 2a85c83..c581e71 100644 --- a/src/base/rs_system.cpp +++ b/src/base/system.cpp @@ -1,4 +1,4 @@ -// rs_system.cpp +// system.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,7 +14,7 @@ // JLH 05/21/2010 Added this text. :-) // -#include "rs_system.h" +#include "system.h" #include #include "settings.h" diff --git a/src/base/rs_system.h b/src/base/system.h similarity index 89% rename from src/base/rs_system.h rename to src/base/system.h index 0ed2612..be9c729 100644 --- a/src/base/rs_system.h +++ b/src/base/system.h @@ -1,17 +1,18 @@ -#ifndef RS_SYSTEM_H -#define RS_SYSTEM_H +#ifndef __SYSTEM_H__ +#define __SYSTEM_H__ #include #include -#include "rs_debug.h" +#include "debug.h" #define RS_SYSTEM RS_System::instance() /** * Class for some system methods such as file system operations. * Implemented as singleton. Use init to Initialize the class - * before you use it. + * before you use it. (LAME! It should detect this condition transparently!) * + * @author James Hammons * @author Andrew Mustun */ class RS_System @@ -65,4 +66,4 @@ class RS_System bool initialized; }; -#endif +#endif // __SYSTEM_H__ diff --git a/src/base/rs_text.cpp b/src/base/text.cpp similarity index 99% rename from src/base/rs_text.cpp rename to src/base/text.cpp index 5991516..5a9df7a 100644 --- a/src/base/rs_text.cpp +++ b/src/base/text.cpp @@ -1,4 +1,4 @@ -// rs_text.cpp +// text.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,11 +14,11 @@ // JLH 05/27/2010 Added this text. :-) // -#include "rs_text.h" +#include "text.h" -#include "rs_font.h" -#include "rs_fontlist.h" -#include "rs_insert.h" +#include "font.h" +#include "fontlist.h" +#include "insert.h" /** * Constructor. diff --git a/src/base/rs_text.h b/src/base/text.h similarity index 98% rename from src/base/rs_text.h rename to src/base/text.h index 626d0ab..4149b71 100644 --- a/src/base/rs_text.h +++ b/src/base/text.h @@ -1,8 +1,8 @@ -#ifndef RS_TEXT_H -#define RS_TEXT_H +#ifndef __TEXT_H__ +#define __TEXT_H__ -#include "rs_entity.h" -#include "rs_entitycontainer.h" +#include "entity.h" +#include "entitycontainer.h" /** * Holds the data that defines a text entity. diff --git a/src/base/rs_undo.cpp b/src/base/undo.cpp similarity index 98% rename from src/base/rs_undo.cpp rename to src/base/undo.cpp index 742a277..7034493 100644 --- a/src/base/rs_undo.cpp +++ b/src/base/undo.cpp @@ -1,4 +1,4 @@ -// rs_undo.cpp +// undo.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,10 +14,10 @@ // JLH 06/02/2010 Added this text. :-) // -#include "rs_undo.h" +#include "undo.h" -#include "rs_debug.h" -#include "rs_undoable.h" +#include "debug.h" +#include "undoable.h" /** * Default constructor. diff --git a/src/base/rs_undo.h b/src/base/undo.h similarity index 96% rename from src/base/rs_undo.h rename to src/base/undo.h index 701f06f..f464d52 100644 --- a/src/base/rs_undo.h +++ b/src/base/undo.h @@ -1,8 +1,8 @@ -#ifndef RS_UNDO_H -#define RS_UNDO_H +#ifndef __UNDO_H__ +#define __UNDO_H__ #include -#include "rs_undocycle.h" +#include "undocycle.h" /** * Undo / redo functionality. The internal undo list consists of diff --git a/src/base/rs_undoable.cpp b/src/base/undoable.cpp similarity index 96% rename from src/base/rs_undoable.cpp rename to src/base/undoable.cpp index e11a344..04b8501 100644 --- a/src/base/rs_undoable.cpp +++ b/src/base/undoable.cpp @@ -1,4 +1,4 @@ -// rs_undoable.cpp +// undoable.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,9 +14,9 @@ // JLH 06/02/2010 Added this text. :-) // -#include "rs_undoable.h" +#include "undoable.h" -#include "rs_undocycle.h" +#include "undocycle.h" /** * Default constructor. diff --git a/src/base/rs_undoable.h b/src/base/undoable.h similarity index 90% rename from src/base/rs_undoable.h rename to src/base/undoable.h index 87e4403..c17a6b3 100644 --- a/src/base/rs_undoable.h +++ b/src/base/undoable.h @@ -1,8 +1,8 @@ -#ifndef RS_UNDOABLE_H -#define RS_UNDOABLE_H +#ifndef __UNDOABLE_H__ +#define __UNDOABLE_H__ #include "rs.h" -#include "rs_flags.h" +#include "flags.h" class RS_UndoCycle; diff --git a/src/base/rs_undocycle.cpp b/src/base/undocycle.cpp similarity index 95% rename from src/base/rs_undocycle.cpp rename to src/base/undocycle.cpp index 313fb31..979911a 100644 --- a/src/base/rs_undocycle.cpp +++ b/src/base/undocycle.cpp @@ -1,4 +1,4 @@ -// rs_undocycle.cpp +// undocycle.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,10 +14,10 @@ // JLH 05/05/2010 Moved implementation from header to this file. :-) // -#include "rs_undocycle.h" +#include "undocycle.h" -#include "rs_entity.h" -#include "rs_undoable.h" +#include "entity.h" +#include "undoable.h" /** * @param type Type of undo item. diff --git a/src/base/rs_undocycle.h b/src/base/undocycle.h similarity index 94% rename from src/base/rs_undocycle.h rename to src/base/undocycle.h index 4247542..e51285e 100644 --- a/src/base/rs_undocycle.h +++ b/src/base/undocycle.h @@ -1,5 +1,5 @@ -#ifndef RS_UNDOLISTITEM_H -#define RS_UNDOLISTITEM_H +#ifndef __UNDOLISTITEM_H__ +#define __UNDOLISTITEM_H__ #include #include diff --git a/src/base/rs_units.cpp b/src/base/units.cpp similarity index 99% rename from src/base/rs_units.cpp rename to src/base/units.cpp index 0c193fd..eb34a07 100644 --- a/src/base/rs_units.cpp +++ b/src/base/units.cpp @@ -1,4 +1,4 @@ -// rs_units.cpp +// units.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,11 +14,11 @@ // JLH 05/05/2010 Moved implementation from header to this file. :-) // -#include "rs_units.h" +#include "units.h" #include -#include "rs_math.h" -#include "rs_debug.h" +#include "mathextra.h" +#include "debug.h" /** * Converts a DXF integer () to a Unit enum. diff --git a/src/base/rs_units.h b/src/base/units.h similarity index 97% rename from src/base/rs_units.h rename to src/base/units.h index a10c54f..f90c2d2 100644 --- a/src/base/rs_units.h +++ b/src/base/units.h @@ -1,5 +1,5 @@ -#ifndef RS_UNITS_H -#define RS_UNITS_H +#ifndef __UNITS_H__ +#define __UNITS_H__ #include #include "rs.h" diff --git a/src/base/rs_utility.cpp b/src/base/utility.cpp similarity index 96% rename from src/base/rs_utility.cpp rename to src/base/utility.cpp index abef291..e7b332e 100644 --- a/src/base/rs_utility.cpp +++ b/src/base/utility.cpp @@ -1,4 +1,4 @@ -// rs_utility.cpp +// utility.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,7 +14,7 @@ // JLH 05/05/2010 Moved implementation from header to this file. :-) // -#include "rs_utility.h" +#include "utility.h" /** * Converts a double to a string cutting away unnecessary 0's. diff --git a/src/base/rs_utility.h b/src/base/utility.h similarity index 80% rename from src/base/rs_utility.h rename to src/base/utility.h index 7ca446d..c6e176d 100644 --- a/src/base/rs_utility.h +++ b/src/base/utility.h @@ -1,5 +1,5 @@ -#ifndef RS_UTILITY_H -#define RS_UTILITY_H +#ifndef __UTILITY_H__ +#define __UTILITY_H__ #include diff --git a/src/base/rs_variable.cpp b/src/base/variable.cpp similarity index 97% rename from src/base/rs_variable.cpp rename to src/base/variable.cpp index 9a4cd3d..edc0245 100644 --- a/src/base/rs_variable.cpp +++ b/src/base/variable.cpp @@ -1,4 +1,4 @@ -// rs_variable.cpp +// variable.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -15,7 +15,7 @@ // // We probably could replace all this crap with QVariant... -#include "rs_variable.h" +#include "variable.h" RS_Variable::RS_Variable() { diff --git a/src/base/rs_variable.h b/src/base/variable.h similarity index 93% rename from src/base/rs_variable.h rename to src/base/variable.h index 74b180d..68319dd 100644 --- a/src/base/rs_variable.h +++ b/src/base/variable.h @@ -1,10 +1,10 @@ -#ifndef RS_VARIABLE_H -#define RS_VARIABLE_H +#ifndef __VARIABLE_H__ +#define __VARIABLE_H__ #include #include "rs.h" #include "vector.h" -#include "rs_debug.h" +#include "debug.h" /** * A variable of type int, double, string or vector. diff --git a/src/base/rs_variabledict.cpp b/src/base/variabledict.cpp similarity index 99% rename from src/base/rs_variabledict.cpp rename to src/base/variabledict.cpp index a85bb52..e3a32d5 100644 --- a/src/base/rs_variabledict.cpp +++ b/src/base/variabledict.cpp @@ -1,4 +1,4 @@ -// rs_variabledict.cpp +// variabledict.cpp // // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun @@ -14,7 +14,7 @@ // JLH 05/12/2010 Created this file. :-) // -#include "rs_variabledict.h" +#include "variabledict.h" /** * Constructor. diff --git a/src/base/rs_variabledict.h b/src/base/variabledict.h similarity index 92% rename from src/base/rs_variabledict.h rename to src/base/variabledict.h index ac8ca52..5ac8f7a 100644 --- a/src/base/rs_variabledict.h +++ b/src/base/variabledict.h @@ -1,9 +1,9 @@ -#ifndef RS_VARIABLEDICT_H -#define RS_VARIABLEDICT_H +#ifndef __VARIABLEDICT_H__ +#define __VARIABLEDICT_H__ #include -#include "rs_variable.h" -#include "rs_debug.h" +#include "variable.h" +#include "debug.h" /** * Dictionary of variables. The variables are stored as key / value diff --git a/src/base/vector.cpp b/src/base/vector.cpp index 3f0125b..a733e73 100644 --- a/src/base/vector.cpp +++ b/src/base/vector.cpp @@ -17,8 +17,8 @@ #include "vector.h" #include "rs.h" // For RS_MIN/MAXDOUBLE (!) -#include "rs_debug.h" -#include "rs_math.h" +#include "debug.h" +#include "mathextra.h" /** * Constructor for a point with default coordinates. diff --git a/src/base/vector.h b/src/base/vector.h index b57d259..9eaae76 100644 --- a/src/base/vector.h +++ b/src/base/vector.h @@ -1,5 +1,5 @@ -#ifndef __VECTOR_H__ -#define __VECTOR_H__ +#ifndef ____VECTOR_H____ +#define ____VECTOR_H____ #include // Needed for 'friend ostream' below @@ -71,4 +71,4 @@ class Vector bool valid; }; -#endif // __VECTOR_H__ +#endif // __VECTOR_H____ diff --git a/src/base/vectorsolutions.cpp b/src/base/vectorsolutions.cpp index a8f206f..d72a72a 100644 --- a/src/base/vectorsolutions.cpp +++ b/src/base/vectorsolutions.cpp @@ -17,7 +17,7 @@ #include "vectorsolutions.h" #include "rs.h" // For RS_MIN/MAXDOUBLE (!) -#include "rs_math.h" +#include "mathextra.h" /** * Constructor for no solution. diff --git a/src/base/vectorsolutions.h b/src/base/vectorsolutions.h index 72ab42d..fcb6508 100644 --- a/src/base/vectorsolutions.h +++ b/src/base/vectorsolutions.h @@ -1,5 +1,5 @@ -#ifndef __VECTORSOLUTIONS_H__ -#define __VECTORSOLUTIONS_H__ +#ifndef ____VECTORSOLUTIONS_H____ +#define ____VECTORSOLUTIONS_H____ #include // Needed for 'friend ostream' below #include "vector.h" @@ -46,4 +46,4 @@ class VectorSolutions bool tangent; }; -#endif // __VECTORSOLUTIONS_H__ +#endif // __VECTORSOLUTIONS_H____ diff --git a/src/forms/arcoptions.cpp b/src/forms/arcoptions.cpp index cada2cd..c241d17 100644 --- a/src/forms/arcoptions.cpp +++ b/src/forms/arcoptions.cpp @@ -19,7 +19,7 @@ #include "actiondrawarc.h" #include "actioninterface.h" -#include "rs_debug.h" +#include "debug.h" #include "settings.h" ArcOptions::ArcOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/arctangentialoptions.cpp b/src/forms/arctangentialoptions.cpp index 67d6420..23137ba 100644 --- a/src/forms/arctangentialoptions.cpp +++ b/src/forms/arctangentialoptions.cpp @@ -17,7 +17,7 @@ #include "arctangentialoptions.h" #include "actiondrawarctangential.h" -#include "rs_debug.h" +#include "debug.h" #include "settings.h" ArcTangentialOptions::ArcTangentialOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/beveloptions.cpp b/src/forms/beveloptions.cpp index bbfbd71..6d98737 100644 --- a/src/forms/beveloptions.cpp +++ b/src/forms/beveloptions.cpp @@ -19,7 +19,7 @@ #include "rs.h" #include "actioninterface.h" #include "actionmodifybevel.h" -#include "rs_debug.h" +#include "debug.h" #include "settings.h" BevelOptions::BevelOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/blockdialog.cpp b/src/forms/blockdialog.cpp index 99d8d67..335e549 100644 --- a/src/forms/blockdialog.cpp +++ b/src/forms/blockdialog.cpp @@ -16,8 +16,8 @@ #include "blockdialog.h" -#include "rs_blocklist.h" -#include "rs_debug.h" +#include "blocklist.h" +#include "debug.h" BlockDialog::BlockDialog(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): QDialog(parent, flags), blockList(NULL) diff --git a/src/forms/blockdialog.h b/src/forms/blockdialog.h index fe25bb7..04863b2 100644 --- a/src/forms/blockdialog.h +++ b/src/forms/blockdialog.h @@ -2,7 +2,7 @@ #define __BLOCKDIALOG_H__ #include "ui_blockdialog.h" -#include "rs_block.h" +#include "block.h" class RS_BlockList; diff --git a/src/forms/circleoptions.cpp b/src/forms/circleoptions.cpp index 90c3d98..8507023 100644 --- a/src/forms/circleoptions.cpp +++ b/src/forms/circleoptions.cpp @@ -19,7 +19,7 @@ #include "rs.h" #include "actioninterface.h" #include "actiondrawcirclecr.h" -#include "rs_debug.h" +#include "debug.h" #include "settings.h" CircleOptions::CircleOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/coordinatewidget.cpp b/src/forms/coordinatewidget.cpp index ea612fe..8cbf7bb 100644 --- a/src/forms/coordinatewidget.cpp +++ b/src/forms/coordinatewidget.cpp @@ -18,7 +18,7 @@ #include "drawing.h" #include "settings.h" -#include "rs_units.h" +#include "units.h" CoordinateWidget::CoordinateWidget(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): QWidget(parent, flags)//, actionHandler(NULL), cadToolBar(NULL) @@ -30,21 +30,24 @@ CoordinateWidget::CoordinateWidget(QWidget * parent/*= 0*/, Qt::WindowFlags flag ui.lCoord1b->setText(""); ui.lCoord2b->setText(""); - int fsize; #ifdef __APPLE__ - fsize = 9; + int fsize = 9; #else - fsize = 7; + int fsize = 7; #endif settings.beginGroup("Appearance"); fsize = settings.value("StatusBarFontSize", fsize).toInt(); settings.endGroup(); - ui.lCoord1->setFont(QFont("Helvetica", fsize)); - ui.lCoord1b->setFont(QFont("Helvetica", fsize)); - ui.lCoord2->setFont(QFont("Helvetica", fsize)); - ui.lCoord2b->setFont(QFont("Helvetica", fsize)); +// ui.lCoord1->setFont(QFont("Helvetica", fsize)); +// ui.lCoord1b->setFont(QFont("Helvetica", fsize)); +// ui.lCoord2->setFont(QFont("Helvetica", fsize)); +// ui.lCoord2b->setFont(QFont("Helvetica", fsize)); + ui.lCoord1->setFont(QFont("Verdana", fsize)); + ui.lCoord1b->setFont(QFont("Verdana", fsize)); + ui.lCoord2->setFont(QFont("Verdana", fsize)); + ui.lCoord2b->setFont(QFont("Verdana", fsize)); graphic = NULL; prec = 4; @@ -127,39 +130,38 @@ void CoordinateWidget::setCoordinates(const Vector & abs, const Vector & rel, bo void CoordinateWidget::setCoordinates(double x, double y, double rx, double ry, bool updateFormat) { - if (graphic != NULL) + if (!graphic) + return; + + if (updateFormat) { - if (updateFormat) - { - format = graphic->getLinearFormat(); - prec = graphic->getLinearPrecision(); - aformat = graphic->getAngleFormat(); - aprec = graphic->getAnglePrecision(); - } - - // abs / rel coordinates: - QString absX = RS_Units::formatLinear(x, graphic->getUnit(), format, prec); - QString absY = RS_Units::formatLinear(y, graphic->getUnit(), format, prec); - QString relX = RS_Units::formatLinear(rx, graphic->getUnit(), format, prec); - QString relY = RS_Units::formatLinear(ry, graphic->getUnit(), format, prec); - - ui.lCoord1->setText(absX + " , " + absY); - ui.lCoord2->setText(relX + " , " + relY); - - // polar coordinates: - Vector v; - v = Vector(x, y); - QString str; - QString rStr = RS_Units::formatLinear(v.magnitude(), graphic->getUnit(), format, prec); - QString aStr = RS_Units::formatAngle(v.angle(), aformat, aprec); - - str = rStr + " < " + aStr; - ui.lCoord1b->setText(str); - - v = Vector(rx, ry); - rStr = RS_Units::formatLinear(v.magnitude(), graphic->getUnit(), format, prec); - aStr = RS_Units::formatAngle(v.angle(), aformat, aprec); - str = rStr + " < " + aStr; - ui.lCoord2b->setText(str); + format = graphic->getLinearFormat(); + prec = graphic->getLinearPrecision(); + aformat = graphic->getAngleFormat(); + aprec = graphic->getAnglePrecision(); } + + // abs / rel coordinates: + QString absX = RS_Units::formatLinear(x, graphic->getUnit(), format, prec); + QString absY = RS_Units::formatLinear(y, graphic->getUnit(), format, prec); + QString relX = RS_Units::formatLinear(rx, graphic->getUnit(), format, prec); + QString relY = RS_Units::formatLinear(ry, graphic->getUnit(), format, prec); + + ui.lCoord1->setText(absX + ", " + absY); + ui.lCoord2->setText(relX + ", " + relY); + + // polar coordinates: + Vector v = Vector(x, y); + QString rStr = RS_Units::formatLinear(v.magnitude(), graphic->getUnit(), format, prec); + QString aStr = RS_Units::formatAngle(v.angle(), aformat, aprec); + + // U+2221 = Measured angle + QString str = rStr + " " + QChar(0x2221) + aStr; + ui.lCoord1b->setText(str); + + v = Vector(rx, ry); + rStr = RS_Units::formatLinear(v.magnitude(), graphic->getUnit(), format, prec); + aStr = RS_Units::formatAngle(v.angle(), aformat, aprec); + str = rStr + " " + QChar(0x2221) + aStr; + ui.lCoord2b->setText(str); } diff --git a/src/forms/dimensionlabeleditor.cpp b/src/forms/dimensionlabeleditor.cpp index ab5e11a..08ca011 100644 --- a/src/forms/dimensionlabeleditor.cpp +++ b/src/forms/dimensionlabeleditor.cpp @@ -16,9 +16,9 @@ #include "dimensionlabeleditor.h" -//#include "rs_arc.h" +//#include "arc.h" //#include "drawing.h" -//#include "rs_math.h" +//#include "math.h" DimensionLabelEditor::DimensionLabelEditor(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): QWidget(parent, flags) diff --git a/src/forms/dimlinearoptions.cpp b/src/forms/dimlinearoptions.cpp index 08f30f5..9ec74b6 100644 --- a/src/forms/dimlinearoptions.cpp +++ b/src/forms/dimlinearoptions.cpp @@ -18,7 +18,7 @@ #include "actiondimlinear.h" #include "actioninterface.h" -#include "rs_debug.h" +#include "debug.h" #include "settings.h" DimLinearOptions::DimLinearOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/dimoptions.cpp b/src/forms/dimoptions.cpp index 0e8c51d..7ea2c88 100644 --- a/src/forms/dimoptions.cpp +++ b/src/forms/dimoptions.cpp @@ -18,7 +18,7 @@ #include "actiondimension.h" #include "actioninterface.h" -#include "rs_debug.h" +#include "debug.h" #include "settings.h" DimOptions::DimOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/dlgarc.cpp b/src/forms/dlgarc.cpp index b96e7ad..b5a194a 100644 --- a/src/forms/dlgarc.cpp +++ b/src/forms/dlgarc.cpp @@ -16,9 +16,9 @@ #include "dlgarc.h" -#include "rs_arc.h" +#include "arc.h" #include "drawing.h" -#include "rs_math.h" +#include "math.h" DlgArc::DlgArc(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): QDialog(parent, flags) diff --git a/src/forms/dlgattributes.cpp b/src/forms/dlgattributes.cpp index 4f18d61..322ae48 100644 --- a/src/forms/dlgattributes.cpp +++ b/src/forms/dlgattributes.cpp @@ -17,8 +17,8 @@ #include "dlgattributes.h" //#include "layerbox.h" -#include "rs_modification.h" -#include "rs_layerlist.h" +#include "modification.h" +#include "layerlist.h" DlgAttributes::DlgAttributes(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): QDialog(parent, flags) diff --git a/src/forms/dlgattributes.h b/src/forms/dlgattributes.h index c701dae..85de35c 100644 --- a/src/forms/dlgattributes.h +++ b/src/forms/dlgattributes.h @@ -2,7 +2,7 @@ #define __DLGATTRIBUTES_H__ #include "ui_dlgattributes.h" -#include "rs_pen.h" +#include "pen.h" class RS_AttributesData; class RS_LayerList; diff --git a/src/forms/dlgcircle.cpp b/src/forms/dlgcircle.cpp index 396ffae..277405d 100644 --- a/src/forms/dlgcircle.cpp +++ b/src/forms/dlgcircle.cpp @@ -16,9 +16,9 @@ #include "dlgcircle.h" -#include "rs_circle.h" +#include "circle.h" #include "drawing.h" -#include "rs_math.h" +#include "math.h" DlgCircle::DlgCircle(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): QDialog(parent, flags) diff --git a/src/forms/dlgdimension.cpp b/src/forms/dlgdimension.cpp index 8428a83..23720c1 100644 --- a/src/forms/dlgdimension.cpp +++ b/src/forms/dlgdimension.cpp @@ -16,7 +16,7 @@ #include "dlgdimension.h" -#include "rs_dimension.h" +#include "dimension.h" #include "drawing.h" DlgDimension::DlgDimension(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/dlgdimlinear.cpp b/src/forms/dlgdimlinear.cpp index c782946..b1f2cc7 100644 --- a/src/forms/dlgdimlinear.cpp +++ b/src/forms/dlgdimlinear.cpp @@ -16,9 +16,9 @@ #include "dlgdimlinear.h" -#include "rs_dimlinear.h" +#include "dimlinear.h" #include "drawing.h" -#include "rs_math.h" +#include "math.h" DlgDimLinear::DlgDimLinear(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): QDialog(parent, flags) diff --git a/src/forms/dlgellipse.cpp b/src/forms/dlgellipse.cpp index 9bb72ba..ea82592 100644 --- a/src/forms/dlgellipse.cpp +++ b/src/forms/dlgellipse.cpp @@ -16,9 +16,9 @@ #include "dlgellipse.h" -#include "rs_ellipse.h" +#include "ellipse.h" #include "drawing.h" -#include "rs_math.h" +#include "math.h" DlgEllipse::DlgEllipse(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): QDialog(parent, flags) diff --git a/src/forms/dlghatch.cpp b/src/forms/dlghatch.cpp index 780b5bf..fa634d1 100644 --- a/src/forms/dlghatch.cpp +++ b/src/forms/dlghatch.cpp @@ -16,10 +16,10 @@ #include "dlghatch.h" -#include "rs_entitycontainer.h" -#include "rs_hatch.h" -#include "rs_pattern.h" -#include "rs_patternlist.h" +#include "entitycontainer.h" +#include "hatch.h" +#include "pattern.h" +#include "patternlist.h" #include "settings.h" DlgHatch::DlgHatch(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/dlgimageoptions.cpp b/src/forms/dlgimageoptions.cpp index b1329f7..19e5f92 100644 --- a/src/forms/dlgimageoptions.cpp +++ b/src/forms/dlgimageoptions.cpp @@ -16,7 +16,7 @@ #include "dlgimageoptions.h" -#include "rs_math.h" +#include "mathextra.h" #include "settings.h" ImageOptionsDialog::ImageOptionsDialog(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/dlginitial.cpp b/src/forms/dlginitial.cpp index fc453b0..3f0f19f 100644 --- a/src/forms/dlginitial.cpp +++ b/src/forms/dlginitial.cpp @@ -18,8 +18,8 @@ #include "rs.h" #include "settings.h" -#include "rs_system.h" -#include "rs_units.h" +#include "system.h" +#include "units.h" DlgInitial::DlgInitial(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): QDialog(parent, flags) diff --git a/src/forms/dlginsert.cpp b/src/forms/dlginsert.cpp index 9c1f17f..a9b8244 100644 --- a/src/forms/dlginsert.cpp +++ b/src/forms/dlginsert.cpp @@ -16,9 +16,9 @@ #include "dlginsert.h" -#include "rs_insert.h" +#include "insert.h" #include "drawing.h" -#include "rs_math.h" +#include "math.h" DlgInsert::DlgInsert(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): QDialog(parent, flags) diff --git a/src/forms/dlgline.cpp b/src/forms/dlgline.cpp index d6a94d5..8493fd9 100644 --- a/src/forms/dlgline.cpp +++ b/src/forms/dlgline.cpp @@ -16,9 +16,9 @@ #include "dlgline.h" -#include "rs_insert.h" +#include "insert.h" #include "drawing.h" -#include "rs_math.h" +#include "math.h" DlgLine::DlgLine(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): QDialog(parent, flags) diff --git a/src/forms/dlgmirror.cpp b/src/forms/dlgmirror.cpp index 2cfee32..68b79a8 100644 --- a/src/forms/dlgmirror.cpp +++ b/src/forms/dlgmirror.cpp @@ -16,7 +16,7 @@ #include "dlgmirror.h" -#include "rs_modification.h" +#include "modification.h" #include "settings.h" DlgMirror::DlgMirror(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/dlgmove.cpp b/src/forms/dlgmove.cpp index a9045ab..7ccb2e1 100644 --- a/src/forms/dlgmove.cpp +++ b/src/forms/dlgmove.cpp @@ -16,7 +16,7 @@ #include "dlgmove.h" -#include "rs_modification.h" +#include "modification.h" #include "settings.h" DlgMove::DlgMove(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/dlgmoverotate.cpp b/src/forms/dlgmoverotate.cpp index 64665da..53b1928 100644 --- a/src/forms/dlgmoverotate.cpp +++ b/src/forms/dlgmoverotate.cpp @@ -16,7 +16,7 @@ #include "dlgmoverotate.h" -#include "rs_modification.h" +#include "modification.h" #include "settings.h" DlgMoveRotate::DlgMoveRotate(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/dlgoptionsdrawing.cpp b/src/forms/dlgoptionsdrawing.cpp index 12ec5db..2ac2a87 100644 --- a/src/forms/dlgoptionsdrawing.cpp +++ b/src/forms/dlgoptionsdrawing.cpp @@ -17,11 +17,11 @@ #include "dlgoptionsdrawing.h" #include "rs.h" -#include "rs_debug.h" -#include "rs_filterdxf.h" +#include "debug.h" +#include "filterdxf.h" #include "drawing.h" -#include "rs_math.h" -#include "rs_units.h" +#include "math.h" +#include "units.h" #include "vector.h" DlgOptionsDrawing::DlgOptionsDrawing(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/dlgoptionsgeneral.cpp b/src/forms/dlgoptionsgeneral.cpp index 28aa123..03f4552 100644 --- a/src/forms/dlgoptionsgeneral.cpp +++ b/src/forms/dlgoptionsgeneral.cpp @@ -17,10 +17,10 @@ #include "dlgoptionsgeneral.h" #include "rs.h" -#include "rs_debug.h" +#include "debug.h" #include "settings.h" -#include "rs_system.h" -#include "rs_units.h" +#include "system.h" +#include "units.h" DlgOptionsGeneral::DlgOptionsGeneral(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): QDialog(parent, flags) diff --git a/src/forms/dlgpoint.cpp b/src/forms/dlgpoint.cpp index 81c3060..d576169 100644 --- a/src/forms/dlgpoint.cpp +++ b/src/forms/dlgpoint.cpp @@ -16,9 +16,9 @@ #include "dlgpoint.h" -#include "rs_point.h" +#include "point.h" #include "drawing.h" -#include "rs_math.h" +#include "math.h" DlgPoint::DlgPoint(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): QDialog(parent, flags) diff --git a/src/forms/dlgpoint.h b/src/forms/dlgpoint.h index 46c624a..39573bc 100644 --- a/src/forms/dlgpoint.h +++ b/src/forms/dlgpoint.h @@ -2,7 +2,7 @@ #define __DLGPOINT_H__ #include "ui_dlgpoint.h" -#include "rs_pen.h" +#include "pen.h" class RS_Point; diff --git a/src/forms/dlgrotate.cpp b/src/forms/dlgrotate.cpp index 6c7ea60..d030ee8 100644 --- a/src/forms/dlgrotate.cpp +++ b/src/forms/dlgrotate.cpp @@ -16,7 +16,7 @@ #include "dlgrotate.h" -#include "rs_modification.h" +#include "modification.h" #include "settings.h" DlgRotate::DlgRotate(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/dlgrotate2.cpp b/src/forms/dlgrotate2.cpp index 04f0f2f..97d80e5 100644 --- a/src/forms/dlgrotate2.cpp +++ b/src/forms/dlgrotate2.cpp @@ -16,7 +16,7 @@ #include "dlgrotate2.h" -#include "rs_modification.h" +#include "modification.h" #include "settings.h" DlgRotate2::DlgRotate2(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/dlgscale.cpp b/src/forms/dlgscale.cpp index 07e49fa..b58b3a5 100644 --- a/src/forms/dlgscale.cpp +++ b/src/forms/dlgscale.cpp @@ -16,7 +16,7 @@ #include "dlgscale.h" -#include "rs_modification.h" +#include "modification.h" #include "settings.h" DlgScale::DlgScale(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/dlgspline.cpp b/src/forms/dlgspline.cpp index 5f5df0d..783f68e 100644 --- a/src/forms/dlgspline.cpp +++ b/src/forms/dlgspline.cpp @@ -17,7 +17,7 @@ #include "dlgspline.h" #include "drawing.h" -#include "rs_spline.h" +#include "spline.h" DlgSpline::DlgSpline(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): QDialog(parent, flags) diff --git a/src/forms/dlgtext.cpp b/src/forms/dlgtext.cpp index ca8ed25..6b90d22 100644 --- a/src/forms/dlgtext.cpp +++ b/src/forms/dlgtext.cpp @@ -16,10 +16,10 @@ #include "dlgtext.h" -#include "rs_filterdxf.h" -#include "rs_font.h" -#include "rs_system.h" -#include "rs_text.h" +#include "filterdxf.h" +#include "font.h" +#include "system.h" +#include "text.h" #include "settings.h" DlgText::DlgText(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/imageoptions.cpp b/src/forms/imageoptions.cpp index a0b6a96..3803349 100644 --- a/src/forms/imageoptions.cpp +++ b/src/forms/imageoptions.cpp @@ -19,7 +19,7 @@ #include "rs.h" #include "actiondrawimage.h" #include "actioninterface.h" -#include "rs_debug.h" +#include "debug.h" #include "settings.h" ImageOptions::ImageOptions(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/layerdialog.cpp b/src/forms/layerdialog.cpp index a3418bc..aa8d735 100644 --- a/src/forms/layerdialog.cpp +++ b/src/forms/layerdialog.cpp @@ -16,8 +16,8 @@ #include "layerdialog.h" -#include "rs_layer.h" -#include "rs_layerlist.h" +#include "layer.h" +#include "layerlist.h" LayerDialog::LayerDialog(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): QDialog(parent, flags), layer(NULL), layerList(NULL), layerName(""), editLayer(false) diff --git a/src/forms/librarywidget.cpp b/src/forms/librarywidget.cpp index edacdc1..607b5a1 100644 --- a/src/forms/librarywidget.cpp +++ b/src/forms/librarywidget.cpp @@ -23,6 +23,7 @@ that it does so and the doco (such as it was) didn't mention it either. So what we need is to make it very clear that inserting is to the BLOCK list and not the document--perhaps we need to fold it into the block list, and make the insert function insert into the block list only... +Also, it would be useful to have some information like base unit, dimensions, etc. */ #include "librarywidget.h" @@ -30,8 +31,8 @@ insert function insert into the block list only... #include "actionhandler.h" #include "actionlibraryinsert.h" #include "drawing.h" -#include "rs_staticgraphicview.h" -#include "rs_system.h" +#include "staticgraphicview.h" +#include "system.h" #include "paintinterface.h" LibraryWidget::LibraryWidget(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/lineangleoptions.cpp b/src/forms/lineangleoptions.cpp index 626d0a4..5fd69d5 100644 --- a/src/forms/lineangleoptions.cpp +++ b/src/forms/lineangleoptions.cpp @@ -17,7 +17,7 @@ #include "lineangleoptions.h" #include "actiondrawlineangle.h" -#include "rs_debug.h" +#include "debug.h" #include "settings.h" LineAngleOptions::LineAngleOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/linebisectoroptions.cpp b/src/forms/linebisectoroptions.cpp index 7a83da7..f603138 100644 --- a/src/forms/linebisectoroptions.cpp +++ b/src/forms/linebisectoroptions.cpp @@ -17,7 +17,7 @@ #include "linebisectoroptions.h" #include "actiondrawlinebisector.h" -#include "rs_debug.h" +#include "debug.h" #include "settings.h" LineBisectorOptions::LineBisectorOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/lineoptions.cpp b/src/forms/lineoptions.cpp index 937bec4..5f3696c 100644 --- a/src/forms/lineoptions.cpp +++ b/src/forms/lineoptions.cpp @@ -19,7 +19,7 @@ #include "rs.h" #include "actiondrawline.h" #include "actioninterface.h" -#include "rs_debug.h" +#include "debug.h" LineOptions::LineOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): QWidget(parent, flags), action(NULL), diff --git a/src/forms/lineparalleloptions.cpp b/src/forms/lineparalleloptions.cpp index 573c627..ba4f27d 100644 --- a/src/forms/lineparalleloptions.cpp +++ b/src/forms/lineparalleloptions.cpp @@ -17,7 +17,7 @@ #include "lineparalleloptions.h" #include "actiondrawlineparallel.h" -#include "rs_debug.h" +#include "debug.h" #include "settings.h" LineParallelOptions::LineParallelOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/lineparallelthroughoptions.cpp b/src/forms/lineparallelthroughoptions.cpp index aed9775..782f31b 100644 --- a/src/forms/lineparallelthroughoptions.cpp +++ b/src/forms/lineparallelthroughoptions.cpp @@ -17,7 +17,7 @@ #include "lineparallelthroughoptions.h" #include "actiondrawlineparallelthrough.h" -#include "rs_debug.h" +#include "debug.h" #include "settings.h" LineParallelThroughOptions::LineParallelThroughOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/linepolygon2options.cpp b/src/forms/linepolygon2options.cpp index ac4d93f..f43e70d 100644 --- a/src/forms/linepolygon2options.cpp +++ b/src/forms/linepolygon2options.cpp @@ -17,7 +17,7 @@ #include "linepolygon2options.h" #include "actiondrawlinepolygon2.h" -#include "rs_debug.h" +#include "debug.h" #include "settings.h" LinePolygon2Options::LinePolygon2Options(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/linepolygonoptions.cpp b/src/forms/linepolygonoptions.cpp index efeb418..69b8f62 100644 --- a/src/forms/linepolygonoptions.cpp +++ b/src/forms/linepolygonoptions.cpp @@ -17,7 +17,7 @@ #include "linepolygonoptions.h" #include "actiondrawlinepolygon.h" -#include "rs_debug.h" +#include "debug.h" #include "settings.h" LinePolygonOptions::LinePolygonOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/linerelangleoptions.cpp b/src/forms/linerelangleoptions.cpp index 2c49d76..ed19769 100644 --- a/src/forms/linerelangleoptions.cpp +++ b/src/forms/linerelangleoptions.cpp @@ -17,7 +17,7 @@ #include "linerelangleoptions.h" #include "actiondrawlinerelangle.h" -#include "rs_debug.h" +#include "debug.h" #include "settings.h" LineRelAngleOptions::LineRelAngleOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/mousewidget.cpp b/src/forms/mousewidget.cpp index d4b4e84..174ba59 100644 --- a/src/forms/mousewidget.cpp +++ b/src/forms/mousewidget.cpp @@ -26,19 +26,20 @@ MouseWidget::MouseWidget(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): ui.lLeftButton->setText(""); ui.lRightButton->setText(""); - int fsize; #ifdef __APPLE__ - fsize = 9; + int fsize = 9; #else - fsize = 7; + int fsize = 7; #endif settings.beginGroup("Appearance"); fsize = settings.value("StatusBarFontSize", fsize).toInt(); settings.endGroup(); - ui.lLeftButton->setFont(QFont("Helvetica", fsize)); - ui.lRightButton->setFont(QFont("Helvetica", fsize)); +// ui.lLeftButton->setFont(QFont("Helvetica", fsize)); +// ui.lRightButton->setFont(QFont("Helvetica", fsize)); + ui.lLeftButton->setFont(QFont("Verdana", fsize)); + ui.lRightButton->setFont(QFont("Verdana", fsize)); } MouseWidget::~MouseWidget() diff --git a/src/forms/mousewidget.ui b/src/forms/mousewidget.ui index 8cba006..56b8e3e 100644 --- a/src/forms/mousewidget.ui +++ b/src/forms/mousewidget.ui @@ -137,7 +137,7 @@ - image0 + :/res/mouse.xpm Qt::AlignCenter @@ -150,6 +150,8 @@ - + + + diff --git a/src/forms/moverotateoptions.cpp b/src/forms/moverotateoptions.cpp index 56d5aa0..de280f5 100644 --- a/src/forms/moverotateoptions.cpp +++ b/src/forms/moverotateoptions.cpp @@ -17,7 +17,7 @@ #include "moverotateoptions.h" #include "actionmodifymoverotate.h" -#include "rs_debug.h" +#include "debug.h" #include "settings.h" MoveRotateOptions::MoveRotateOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/printpreviewoptions.cpp b/src/forms/printpreviewoptions.cpp index fa7bbb6..a5e6893 100644 --- a/src/forms/printpreviewoptions.cpp +++ b/src/forms/printpreviewoptions.cpp @@ -19,8 +19,8 @@ #include "rs.h" #include "actioninterface.h" #include "actionprintpreview.h" -#include "rs_debug.h" -#include "rs_math.h" +#include "debug.h" +#include "mathextra.h" //PrintPreviewOptions::PrintPreviewOptions(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): PrintPreviewOptions::PrintPreviewOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/roundoptions.cpp b/src/forms/roundoptions.cpp index 9fce0ee..6b4fdc0 100644 --- a/src/forms/roundoptions.cpp +++ b/src/forms/roundoptions.cpp @@ -17,7 +17,7 @@ #include "roundoptions.h" #include "actionmodifyround.h" -#include "rs_debug.h" +#include "debug.h" #include "settings.h" RoundOptions::RoundOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/selectionwidget.cpp b/src/forms/selectionwidget.cpp index 1b5954e..21bb70d 100644 --- a/src/forms/selectionwidget.cpp +++ b/src/forms/selectionwidget.cpp @@ -36,8 +36,10 @@ SelectionWidget::SelectionWidget(QWidget * parent/*= 0*/, Qt::WindowFlags flags/ fsize = settings.value("StatusBarFontSize", fsize).toInt(); settings.endGroup(); - ui.lEntities->setFont(QFont("Helvetica", fsize)); - ui.lLabel->setFont(QFont("Helvetica", fsize)); +// ui.lEntities->setFont(QFont("Helvetica", fsize)); +// ui.lLabel->setFont(QFont("Helvetica", fsize)); + ui.lEntities->setFont(QFont("Verdana", fsize)); + ui.lLabel->setFont(QFont("Verdana", fsize)); } SelectionWidget::~SelectionWidget() diff --git a/src/forms/snapdistoptions.cpp b/src/forms/snapdistoptions.cpp index a231b3b..759b27c 100644 --- a/src/forms/snapdistoptions.cpp +++ b/src/forms/snapdistoptions.cpp @@ -16,10 +16,7 @@ #include "snapdistoptions.h" -//#include "actionmodifytrimamount.h" -//#include "actioninterface.h" -//#include "rs_debug.h" -#include "rs_math.h" +#include "mathextra.h" #include "settings.h" SnapDistOptions::SnapDistOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): @@ -63,7 +60,6 @@ void SnapDistOptions::setDist(double * d) void SnapDistOptions::updateDist(const QString & d) { - if (dist != NULL) + if (dist) *dist = RS_Math::eval(d, 1.0); } - diff --git a/src/forms/splineoptions.cpp b/src/forms/splineoptions.cpp index b0a1de2..dad1687 100644 --- a/src/forms/splineoptions.cpp +++ b/src/forms/splineoptions.cpp @@ -18,7 +18,7 @@ #include "actiondrawspline.h" #include "actioninterface.h" -#include "rs_debug.h" +#include "debug.h" #include "settings.h" SplineOptions::SplineOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/textoptions.cpp b/src/forms/textoptions.cpp index 00dbeac..86af421 100644 --- a/src/forms/textoptions.cpp +++ b/src/forms/textoptions.cpp @@ -18,7 +18,7 @@ #include "actiondrawtext.h" #include "actioninterface.h" -#include "rs_debug.h" +#include "debug.h" TextOptions::TextOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): QWidget(parent, flags) diff --git a/src/forms/trimamountoptions.cpp b/src/forms/trimamountoptions.cpp index 5d6cb54..45b325c 100644 --- a/src/forms/trimamountoptions.cpp +++ b/src/forms/trimamountoptions.cpp @@ -18,8 +18,8 @@ #include "actionmodifytrimamount.h" #include "actioninterface.h" -#include "rs_debug.h" -#include "rs_math.h" +#include "debug.h" +#include "mathextra.h" #include "settings.h" TrimAmountOptions::TrimAmountOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/widgetpen.h b/src/forms/widgetpen.h index e6757a6..996bbf9 100644 --- a/src/forms/widgetpen.h +++ b/src/forms/widgetpen.h @@ -2,7 +2,7 @@ #define __WIDGETPEN_H__ #include "ui_widgetpen.h" -#include "rs_pen.h" +#include "pen.h" class WidgetPen: public QWidget { diff --git a/src/mainapp/applicationwindow.cpp b/src/mainapp/applicationwindow.cpp index 0566beb..baf8ffc 100644 --- a/src/mainapp/applicationwindow.cpp +++ b/src/mainapp/applicationwindow.cpp @@ -22,29 +22,29 @@ #include "actiondrawlinefree.h" #include "actionlibraryinsert.h" #include "actionprintpreview.h" -#include "rs_creation.h" -#include "rs_dialogfactory.h" -#include "rs_dimaligned.h" -#include "rs_dimlinear.h" -#include "rs_dimradial.h" -#include "rs_ellipse.h" -#include "rs_fileio.h" -#include "rs_hatch.h" -#include "rs_insert.h" -#include "rs_image.h" +#include "creation.h" +#include "dialogfactory.h" +#include "dimaligned.h" +#include "dimlinear.h" +#include "dimradial.h" +#include "ellipse.h" +#include "fileio.h" +#include "hatch.h" +#include "insert.h" +#include "image.h" #include "paintinterface.h" -#include "rs_script.h" -#include "rs_scriptlist.h" +#include "script.h" +#include "scriptlist.h" #include "settings.h" -#include "rs_solid.h" -#include "rs_staticgraphicview.h" -#include "rs_system.h" -#include "rs_text.h" -#include "rs_units.h" +#include "solid.h" +#include "staticgraphicview.h" +#include "system.h" +#include "text.h" +#include "units.h" #ifdef RS_CAM -#include "rs_camdialog.h" -#include "rs_simulationcontrols.h" +#include "camdialog.h" +#include "simulationcontrols.h" #endif #include "colorbox.h" diff --git a/src/mainapp/applicationwindow.h b/src/mainapp/applicationwindow.h index 3e2a134..82273ed 100644 --- a/src/mainapp/applicationwindow.h +++ b/src/mainapp/applicationwindow.h @@ -3,7 +3,7 @@ #include -#include "rs_document.h" +#include "document.h" #include "qc_dialogfactory.h" #include "mdiwindow.h" #include "actionhandler.h" @@ -21,7 +21,7 @@ #endif #ifdef RS_CAM -#include "rs_simulationcontrols.h" +#include "simulationcontrols.h" #endif class RecentFiles; diff --git a/src/mainapp/commands.cpp b/src/mainapp/commands.cpp index 52b7208..f2460e0 100644 --- a/src/mainapp/commands.cpp +++ b/src/mainapp/commands.cpp @@ -16,8 +16,8 @@ #include "commands.h" -#include "rs_dialogfactory.h" -#include "rs_debug.h" +#include "dialogfactory.h" +#include "debug.h" // Class variable Commands * Commands::uniqueInstance = NULL; diff --git a/src/mainapp/graphicview.cpp b/src/mainapp/graphicview.cpp index 77c7404..afb20a0 100644 --- a/src/mainapp/graphicview.cpp +++ b/src/mainapp/graphicview.cpp @@ -16,15 +16,15 @@ #include "graphicview.h" -#include "rs_dialogfactory.h" +#include "dialogfactory.h" #include "drawing.h" -#include "rs_eventhandler.h" -#include "rs_grid.h" -#include "rs_linetypepattern.h" +#include "eventhandler.h" +#include "grid.h" +#include "linetypepattern.h" #include "paintinterface.h" #include "settings.h" -#include "rs_text.h" -#include "rs_units.h" +#include "text.h" +#include "units.h" /** * Constructor. diff --git a/src/mainapp/graphicview.h b/src/mainapp/graphicview.h index 90e30b2..4b997de 100644 --- a/src/mainapp/graphicview.h +++ b/src/mainapp/graphicview.h @@ -3,9 +3,9 @@ #include #include "rs.h" -#include "rs_color.h" -#include "rs_preview.h" -#include "rs_snapper.h" +#include "color.h" +#include "preview.h" +#include "snapper.h" #include "vector.h" class ActionInterface; diff --git a/src/mainapp/main.cpp b/src/mainapp/main.cpp index 4807484..72eac0e 100644 --- a/src/mainapp/main.cpp +++ b/src/mainapp/main.cpp @@ -28,23 +28,23 @@ QSplashScreen * splash = 0; #include #endif -#include "rs_fontlist.h" -#include "rs_patternlist.h" -#include "rs_scriptlist.h" +#include "fontlist.h" +#include "patternlist.h" +#include "scriptlist.h" #include "settings.h" -#include "rs_system.h" -#include "rs_fileio.h" -#include "rs_filtercxf.h" -#include "rs_filterdxf.h" -#include "rs_filterdxf1.h" +#include "system.h" +#include "fileio.h" +#include "filtercxf.h" +#include "filterdxf.h" +#include "filterdxf1.h" #include "dlginitial.h" #include "applicationwindow.h" #ifdef RS_CAM -# include "rs_filtercam.h" -# include "rs_camdialog.h" +# include "filtercam.h" +# include "camdialog.h" #endif //#ifdef RS_CAM diff --git a/src/mainapp/mdiwindow.cpp b/src/mainapp/mdiwindow.cpp index 1e7dc79..1bac26e 100644 --- a/src/mainapp/mdiwindow.cpp +++ b/src/mainapp/mdiwindow.cpp @@ -17,7 +17,7 @@ #include "mdiwindow.h" #include "drawing.h" -#include "rs_eventhandler.h" +#include "eventhandler.h" #include "exitdialog.h" #include "filedialog.h" #include "qg_graphicview.h" diff --git a/src/mainapp/mdiwindow.h b/src/mainapp/mdiwindow.h index 6b66aef..13afe6c 100644 --- a/src/mainapp/mdiwindow.h +++ b/src/mainapp/mdiwindow.h @@ -2,7 +2,7 @@ #define QC_MDIWINDOW_H #include -#include "rs_document.h" +#include "document.h" #include "layerwidget.h" #include "pentoolbar.h" diff --git a/src/mainapp/qc_dialogfactory.cpp b/src/mainapp/qc_dialogfactory.cpp index 2f81da9..6f8bdcf 100644 --- a/src/mainapp/qc_dialogfactory.cpp +++ b/src/mainapp/qc_dialogfactory.cpp @@ -17,7 +17,7 @@ #include "qc_dialogfactory.h" #include "applicationwindow.h" -#include "rs_blocklist.h" +#include "blocklist.h" #include "qg_graphicview.h" QC_DialogFactory::QC_DialogFactory(QWidget * parent, QToolBar * ow): QG_DialogFactory(parent, ow) diff --git a/src/widgets/actionhandler.cpp b/src/widgets/actionhandler.cpp index 689db38..d26327b 100644 --- a/src/widgets/actionhandler.cpp +++ b/src/widgets/actionhandler.cpp @@ -16,7 +16,7 @@ #include "actionhandler.h" -#include "rs_commandevent.h" +#include "commandevent.h" #include "commands.h" #include "actionblocksadd.h" #include "actionblocksattributes.h" @@ -128,8 +128,8 @@ #endif #ifdef RS_CAM -#include "rs_actioncamexportauto.h" -#include "rs_actioncamreorder.h" +#include "actioncamexportauto.h" +#include "actioncamreorder.h" #endif #include "qg_mainwindowinterface.h" diff --git a/src/widgets/blockwidget.cpp b/src/widgets/blockwidget.cpp index 813bebf..34e0542 100644 --- a/src/widgets/blockwidget.cpp +++ b/src/widgets/blockwidget.cpp @@ -17,9 +17,9 @@ #include "blockwidget.h" #include "actionhandler.h" -#include "rs_block.h" -#include "rs_blocklist.h" -#include "rs_debug.h" +#include "block.h" +#include "blocklist.h" +#include "debug.h" /** * Constructor. diff --git a/src/widgets/colorbox.h b/src/widgets/colorbox.h index cbd9412..1db675f 100644 --- a/src/widgets/colorbox.h +++ b/src/widgets/colorbox.h @@ -2,7 +2,7 @@ #define __COLORBOX_H__ #include -#include "rs_color.h" +#include "color.h" /** * A combobox for choosing a color. diff --git a/src/widgets/commandedit.cpp b/src/widgets/commandedit.cpp index f470009..7cf1eb7 100644 --- a/src/widgets/commandedit.cpp +++ b/src/widgets/commandedit.cpp @@ -16,7 +16,7 @@ #include "commandedit.h" -#include "rs_debug.h" +#include "debug.h" /** * Default Constructor. You must call init manually if you choose diff --git a/src/widgets/filedialog.cpp b/src/widgets/filedialog.cpp index 5d36c60..6af5269 100644 --- a/src/widgets/filedialog.cpp +++ b/src/widgets/filedialog.cpp @@ -19,7 +19,7 @@ #include "drawing.h" #include "qg_graphicview.h" #include "settings.h" -#include "rs_system.h" +#include "system.h" /** * Shows a dialog for choosing a file name. Saving the file is up to diff --git a/src/widgets/fontbox.cpp b/src/widgets/fontbox.cpp index ba06a48..b12812b 100644 --- a/src/widgets/fontbox.cpp +++ b/src/widgets/fontbox.cpp @@ -16,9 +16,9 @@ #include "fontbox.h" -#include "rs_debug.h" -#include "rs_font.h" -#include "rs_fontlist.h" +#include "debug.h" +#include "font.h" +#include "fontlist.h" /** * Default Constructor. You must call init manually if you choose diff --git a/src/widgets/layerbox.cpp b/src/widgets/layerbox.cpp index 360d30c..8024476 100644 --- a/src/widgets/layerbox.cpp +++ b/src/widgets/layerbox.cpp @@ -16,8 +16,8 @@ #include "layerbox.h" -#include "rs_layer.h" -#include "rs_layerlist.h" +#include "layer.h" +#include "layerlist.h" /** * Default Constructor. You must call init manually before using diff --git a/src/widgets/layerwidget.cpp b/src/widgets/layerwidget.cpp index a590f01..0a5c4d5 100644 --- a/src/widgets/layerwidget.cpp +++ b/src/widgets/layerwidget.cpp @@ -17,9 +17,9 @@ #include "layerwidget.h" #include "actionhandler.h" -#include "rs_debug.h" -#include "rs_layer.h" -#include "rs_layerlist.h" +#include "debug.h" +#include "layer.h" +#include "layerlist.h" /** * Constructor. diff --git a/src/widgets/linetypebox.cpp b/src/widgets/linetypebox.cpp index 8657dfc..52a92b6 100644 --- a/src/widgets/linetypebox.cpp +++ b/src/widgets/linetypebox.cpp @@ -16,7 +16,7 @@ #include "linetypebox.h" -#include "rs_debug.h" +#include "debug.h" /** * Default Constructor. You must call init manually if you choose diff --git a/src/widgets/patternbox.cpp b/src/widgets/patternbox.cpp index 94f4d93..fb92c4c 100644 --- a/src/widgets/patternbox.cpp +++ b/src/widgets/patternbox.cpp @@ -16,9 +16,9 @@ #include "patternbox.h" -#include "rs_pattern.h" -#include "rs_patternlist.h" -#include "rs_debug.h" +#include "pattern.h" +#include "patternlist.h" +#include "debug.h" /** * Default Constructor. You must call init manually if you choose diff --git a/src/widgets/pentoolbar.cpp b/src/widgets/pentoolbar.cpp index fd96c6c..8897167 100644 --- a/src/widgets/pentoolbar.cpp +++ b/src/widgets/pentoolbar.cpp @@ -21,7 +21,7 @@ #include "colorbox.h" #include "widthbox.h" #include "linetypebox.h" -#include "rs_layer.h" +#include "layer.h" /** * Constructor. diff --git a/src/widgets/pentoolbar.h b/src/widgets/pentoolbar.h index c08f006..1a3b5fb 100644 --- a/src/widgets/pentoolbar.h +++ b/src/widgets/pentoolbar.h @@ -2,8 +2,8 @@ #define __PENTOOLBAR_H__ #include -//#include "rs_layerlistlistener.h" -#include "rs_pen.h" +//#include "layerlistlistener.h" +#include "pen.h" class ColorBox; class WidthBox; diff --git a/src/widgets/qg_dialogfactory.cpp b/src/widgets/qg_dialogfactory.cpp index b5093ce..7a4f7b4 100644 --- a/src/widgets/qg_dialogfactory.cpp +++ b/src/widgets/qg_dialogfactory.cpp @@ -21,14 +21,14 @@ #include "qg_mainwindowinterface.h" #include "actiondimlinear.h" #include "actioninterface.h" -#include "rs_blocklist.h" -#include "rs_document.h" -#include "rs_hatch.h" -#include "rs_layerlist.h" -#include "rs_patternlist.h" +#include "blocklist.h" +#include "document.h" +#include "hatch.h" +#include "layerlist.h" +#include "patternlist.h" #include "settings.h" -#include "rs_system.h" -#include "rs_text.h" +#include "system.h" +#include "text.h" #include "arcoptions.h" #include "arctangentialoptions.h" @@ -87,7 +87,7 @@ #endif #ifdef RS_CAM -#include "rs_camdialog.h" +#include "camdialog.h" #endif //QG_DialogFactory* QG_DialogFactory::uniqueInstance = NULL; diff --git a/src/widgets/qg_dialogfactory.h b/src/widgets/qg_dialogfactory.h index c2d08c6..79f7231 100644 --- a/src/widgets/qg_dialogfactory.h +++ b/src/widgets/qg_dialogfactory.h @@ -2,9 +2,9 @@ #define QG_DIALOGFACTORY_H #include -#include "rs_dialogfactoryinterface.h" +#include "dialogfactoryinterface.h" #include "vector.h" -#include "rs_debug.h" +#include "debug.h" class ActionInterface; class CadToolBar; diff --git a/src/widgets/qg_graphicview.cpp b/src/widgets/qg_graphicview.cpp index 963738c..a12e67c 100644 --- a/src/widgets/qg_graphicview.cpp +++ b/src/widgets/qg_graphicview.cpp @@ -24,14 +24,14 @@ #include "actionmodifydelete.h" #include "actionselectsingle.h" #include "cadtoolbar.h" -#include "rs_dialogfactory.h" +#include "dialogfactory.h" #include "drawing.h" #include "graphicview.h" -#include "rs_patternlist.h" +#include "patternlist.h" #include "paintinterface.h" -#include "rs_preview.h" +#include "preview.h" #include "settings.h" -#include "rs_system.h" +#include "system.h" #define QG_SCROLLMARGIN 400 diff --git a/src/widgets/qg_mainwindowinterface.h b/src/widgets/qg_mainwindowinterface.h index 2e6e698..1fba382 100644 --- a/src/widgets/qg_mainwindowinterface.h +++ b/src/widgets/qg_mainwindowinterface.h @@ -1,7 +1,7 @@ #ifndef QG_MAINWINDOWINTERFACE_H #define QG_MAINWINDOWINTERFACE_H -#include "rs_mainwindowinterface.h" +#include "mainwindowinterface.h" class QMainWindow; class ActionHandler; diff --git a/src/widgets/recentfiles.cpp b/src/widgets/recentfiles.cpp index c614601..4e445a2 100644 --- a/src/widgets/recentfiles.cpp +++ b/src/widgets/recentfiles.cpp @@ -17,7 +17,7 @@ #include "recentfiles.h" #include "applicationwindow.h" -#include "rs_debug.h" +#include "debug.h" /** * Constructor diff --git a/src/widgets/widthbox.cpp b/src/widgets/widthbox.cpp index 3af0de3..f175aab 100644 --- a/src/widgets/widthbox.cpp +++ b/src/widgets/widthbox.cpp @@ -15,7 +15,7 @@ #include "widthbox.h" -#include "rs_debug.h" +#include "debug.h" /** * Default Constructor. You must call init manually if you choose