]> Shamusworld >> Repos - architektonas/commitdiff
Initial removal of unnecessary rs_ prefixes from files.
authorShamus Hammons <jlhamm@acm.org>
Thu, 9 Sep 2010 04:27:21 +0000 (04:27 +0000)
committerShamus Hammons <jlhamm@acm.org>
Thu, 9 Sep 2010 04:27:21 +0000 (04:27 +0000)
362 files changed:
architektonas.pro
src/actions/actionblocksadd.cpp
src/actions/actionblocksattributes.cpp
src/actions/actionblockscreate.cpp
src/actions/actionblocksedit.cpp
src/actions/actionblocksexplode.cpp
src/actions/actionblocksexplode.h
src/actions/actionblocksinsert.cpp
src/actions/actionblocksinsert.h
src/actions/actionblocksremove.cpp
src/actions/actiondefault.cpp
src/actions/actiondimaligned.cpp
src/actions/actiondimaligned.h
src/actions/actiondimangular.cpp
src/actions/actiondimangular.h
src/actions/actiondimdiametric.cpp
src/actions/actiondimdiametric.h
src/actions/actiondimension.cpp
src/actions/actiondimension.h
src/actions/actiondimleader.cpp
src/actions/actiondimleader.h
src/actions/actiondimlinear.cpp
src/actions/actiondimlinear.h
src/actions/actiondimradial.cpp
src/actions/actiondimradial.h
src/actions/actiondrawarc.cpp
src/actions/actiondrawarc.h
src/actions/actiondrawarc3p.cpp
src/actions/actiondrawarc3p.h
src/actions/actiondrawarctangential.cpp
src/actions/actiondrawarctangential.h
src/actions/actiondrawcircle.cpp
src/actions/actiondrawcircle.h
src/actions/actiondrawcircle2p.cpp
src/actions/actiondrawcircle2p.h
src/actions/actiondrawcircle3p.cpp
src/actions/actiondrawcircle3p.h
src/actions/actiondrawcirclecr.cpp
src/actions/actiondrawcirclecr.h
src/actions/actiondrawellipseaxis.cpp
src/actions/actiondrawellipseaxis.h
src/actions/actiondrawhatch.cpp
src/actions/actiondrawhatch.h
src/actions/actiondrawimage.cpp
src/actions/actiondrawimage.h
src/actions/actiondrawline.cpp
src/actions/actiondrawline.h
src/actions/actiondrawlineangle.cpp
src/actions/actiondrawlineangle.h
src/actions/actiondrawlinebisector.cpp
src/actions/actiondrawlinebisector.h
src/actions/actiondrawlinefree.cpp
src/actions/actiondrawlinehorvert.cpp
src/actions/actiondrawlinehorvert.h
src/actions/actiondrawlineparallel.cpp
src/actions/actiondrawlineparallel.h
src/actions/actiondrawlineparallelthrough.cpp
src/actions/actiondrawlineparallelthrough.h
src/actions/actiondrawlinepolygon.cpp
src/actions/actiondrawlinepolygon2.cpp
src/actions/actiondrawlinerectangle.cpp
src/actions/actiondrawlinerectangle.h
src/actions/actiondrawlinerelangle.cpp
src/actions/actiondrawlinerelangle.h
src/actions/actiondrawlinetangent1.cpp
src/actions/actiondrawlinetangent1.h
src/actions/actiondrawlinetangent2.cpp
src/actions/actiondrawlinetangent2.h
src/actions/actiondrawpoint.cpp
src/actions/actiondrawspline.cpp
src/actions/actiondrawspline.h
src/actions/actiondrawtext.cpp
src/actions/actiondrawtext.h
src/actions/actioneditcopy.cpp
src/actions/actioneditpaste.cpp
src/actions/actioneditundo.cpp
src/actions/actioninfoangle.cpp
src/actions/actioninfoarea.cpp
src/actions/actioninfoarea.h
src/actions/actioninfodist.cpp
src/actions/actioninfodist2.cpp
src/actions/actioninfoinside.cpp
src/actions/actioninfototallength.cpp
src/actions/actionlayersadd.cpp
src/actions/actionlayersedit.cpp
src/actions/actionlayersremove.cpp
src/actions/actionlibraryinsert.cpp
src/actions/actionlibraryinsert.h
src/actions/actionmodifyattributes.cpp
src/actions/actionmodifybevel.cpp
src/actions/actionmodifybevel.h
src/actions/actionmodifycut.cpp
src/actions/actionmodifydelete.cpp
src/actions/actionmodifydeletefree.cpp
src/actions/actionmodifydeletequick.cpp
src/actions/actionmodifyentity.cpp
src/actions/actionmodifyexplodetext.cpp
src/actions/actionmodifymirror.cpp
src/actions/actionmodifymirror.h
src/actions/actionmodifymove.cpp
src/actions/actionmodifymove.h
src/actions/actionmodifymoverotate.cpp
src/actions/actionmodifymoverotate.h
src/actions/actionmodifyrotate.cpp
src/actions/actionmodifyrotate.h
src/actions/actionmodifyrotate2.cpp
src/actions/actionmodifyrotate2.h
src/actions/actionmodifyround.cpp
src/actions/actionmodifyround.h
src/actions/actionmodifyscale.cpp
src/actions/actionmodifyscale.h
src/actions/actionmodifystretch.cpp
src/actions/actionmodifytrim.cpp
src/actions/actionmodifytrimamount.cpp
src/actions/actionoptionsdrawing.cpp
src/actions/actionprintpreview.cpp
src/actions/actionselect.cpp
src/actions/actionselectall.cpp
src/actions/actionselectcontour.cpp
src/actions/actionselectintersected.cpp
src/actions/actionselectinvert.cpp
src/actions/actionselectlayer.cpp
src/actions/actionselectsingle.cpp
src/actions/actionselectwindow.cpp
src/actions/actionsetrelativezero.cpp
src/actions/actionsnapintersectionmanual.cpp
src/actions/actionzoomwindow.cpp
src/base/actioninterface.cpp
src/base/arc.cpp [moved from src/base/rs_arc.cpp with 99% similarity]
src/base/arc.h [moved from src/base/rs_arc.h with 98% similarity]
src/base/atomicentity.cpp [moved from src/base/rs_atomicentity.cpp with 98% similarity]
src/base/atomicentity.h [moved from src/base/rs_atomicentity.h with 91% similarity]
src/base/block.cpp [moved from src/base/rs_block.cpp with 98% similarity]
src/base/block.h [moved from src/base/rs_block.h with 97% similarity]
src/base/blocklist.cpp [moved from src/base/rs_blocklist.cpp with 99% similarity]
src/base/blocklist.h [moved from src/base/rs_blocklist.h with 91% similarity]
src/base/circle.cpp [moved from src/base/rs_circle.cpp with 98% similarity]
src/base/circle.h [moved from src/base/rs_circle.h with 95% similarity]
src/base/clipboard.cpp [moved from src/base/rs_clipboard.cpp with 92% similarity]
src/base/clipboard.h [moved from src/base/rs_clipboard.h with 96% similarity]
src/base/color.cpp [moved from src/base/rs_color.cpp with 98% similarity]
src/base/color.h [moved from src/base/rs_color.h with 92% similarity]
src/base/commandevent.cpp [moved from src/base/rs_commandevent.cpp with 95% similarity]
src/base/commandevent.h [moved from src/base/rs_commandevent.h with 81% similarity]
src/base/constructionline.cpp [moved from src/base/rs_constructionline.cpp with 98% similarity]
src/base/constructionline.h [moved from src/base/rs_constructionline.h with 96% similarity]
src/base/creation.cpp [moved from src/base/rs_creation.cpp with 99% similarity]
src/base/creation.h [moved from src/base/rs_creation.h with 98% similarity]
src/base/debug.cpp [moved from src/base/rs_debug.cpp with 98% similarity]
src/base/debug.h [moved from src/base/rs_debug.h with 92% similarity]
src/base/dialogfactory.cpp [moved from src/base/rs_dialogfactory.cpp with 96% similarity]
src/base/dialogfactory.h [moved from src/base/rs_dialogfactory.h with 83% similarity]
src/base/dialogfactoryadapter.h [moved from src/base/rs_dialogfactoryadapter.h with 93% similarity]
src/base/dialogfactoryinterface.h [moved from src/base/rs_dialogfactoryinterface.h with 99% similarity]
src/base/dimaligned.cpp [moved from src/base/rs_dimaligned.cpp with 98% similarity]
src/base/dimaligned.h [moved from src/base/rs_dimaligned.h with 96% similarity]
src/base/dimangular.cpp [moved from src/base/rs_dimangular.cpp with 98% similarity]
src/base/dimangular.h [moved from src/base/rs_dimangular.h with 96% similarity]
src/base/dimdiametric.cpp [moved from src/base/rs_dimdiametric.cpp with 97% similarity]
src/base/dimdiametric.h [moved from src/base/rs_dimdiametric.h with 96% similarity]
src/base/dimension.cpp [moved from src/base/rs_dimension.cpp with 98% similarity]
src/base/dimension.h [moved from src/base/rs_dimension.h with 98% similarity]
src/base/dimlinear.cpp [moved from src/base/rs_dimlinear.cpp with 98% similarity]
src/base/dimlinear.h [moved from src/base/rs_dimlinear.h with 97% similarity]
src/base/dimradial.cpp [moved from src/base/rs_dimradial.cpp with 98% similarity]
src/base/dimradial.h [moved from src/base/rs_dimradial.h with 96% similarity]
src/base/document.cpp [moved from src/base/rs_document.cpp with 97% similarity]
src/base/document.h [moved from src/base/rs_document.h with 93% similarity]
src/base/drawing.cpp
src/base/drawing.h
src/base/ellipse.cpp [moved from src/base/rs_ellipse.cpp with 99% similarity]
src/base/ellipse.h [moved from src/base/rs_ellipse.h with 97% similarity]
src/base/entity.cpp [moved from src/base/rs_entity.cpp with 98% similarity]
src/base/entity.h [moved from src/base/rs_entity.h with 98% similarity]
src/base/entitycontainer.cpp [moved from src/base/rs_entitycontainer.cpp with 99% similarity]
src/base/entitycontainer.h [moved from src/base/rs_entitycontainer.h with 95% similarity]
src/base/eventhandler.cpp [moved from src/base/rs_eventhandler.cpp with 99% similarity]
src/base/eventhandler.h [moved from src/base/rs_eventhandler.h with 94% similarity]
src/base/fileio.cpp [moved from src/base/rs_fileio.cpp with 96% similarity]
src/base/fileio.h [moved from src/base/rs_fileio.h with 90% similarity]
src/base/filtercxf.cpp [moved from src/base/rs_filtercxf.cpp with 98% similarity]
src/base/filtercxf.h [moved from src/base/rs_filtercxf.h with 90% similarity]
src/base/filterdxf.cpp [moved from src/base/rs_filterdxf.cpp with 99% similarity]
src/base/filterdxf.h [moved from src/base/rs_filterdxf.h with 94% similarity]
src/base/filterdxf1.cpp [moved from src/base/rs_filterdxf1.cpp with 99% similarity]
src/base/filterdxf1.h [moved from src/base/rs_filterdxf1.h with 95% similarity]
src/base/filterinterface.cpp [moved from src/base/rs_filterinterface.cpp with 95% similarity]
src/base/filterinterface.h [moved from src/base/rs_filterinterface.h with 96% similarity]
src/base/flags.cpp [moved from src/base/rs_flags.cpp with 96% similarity]
src/base/flags.h [moved from src/base/rs_flags.h with 91% similarity]
src/base/font.cpp [moved from src/base/rs_font.cpp with 98% similarity]
src/base/font.h [moved from src/base/rs_font.h with 96% similarity]
src/base/fontchar.h [moved from src/base/rs_fontchar.h with 93% similarity]
src/base/fontlist.cpp [moved from src/base/rs_fontlist.cpp with 97% similarity]
src/base/fontlist.h [moved from src/base/rs_fontlist.h with 84% similarity]
src/base/grid.cpp [moved from src/base/rs_grid.cpp with 99% similarity]
src/base/grid.h [moved from src/base/rs_grid.h with 96% similarity]
src/base/hatch.cpp [moved from src/base/rs_hatch.cpp with 99% similarity]
src/base/hatch.h [moved from src/base/rs_hatch.h with 89% similarity]
src/base/image.cpp [moved from src/base/rs_image.cpp with 98% similarity]
src/base/image.h [moved from src/base/rs_image.h with 98% similarity]
src/base/infoarea.cpp [moved from src/base/rs_infoarea.cpp with 97% similarity]
src/base/infoarea.h [moved from src/base/rs_infoarea.h with 92% similarity]
src/base/information.cpp [moved from src/base/rs_information.cpp with 99% similarity]
src/base/information.h [moved from src/base/rs_information.h with 92% similarity]
src/base/insert.cpp [moved from src/base/rs_insert.cpp with 99% similarity]
src/base/insert.h [moved from src/base/rs_insert.h with 97% similarity]
src/base/layer.cpp [moved from src/base/rs_layer.cpp with 97% similarity]
src/base/layer.h [moved from src/base/rs_layer.h with 94% similarity]
src/base/layerlist.cpp [moved from src/base/rs_layerlist.cpp with 98% similarity]
src/base/layerlist.h [moved from src/base/rs_layerlist.h with 96% similarity]
src/base/leader.cpp [moved from src/base/rs_leader.cpp with 97% similarity]
src/base/leader.h [moved from src/base/rs_leader.h with 93% similarity]
src/base/line.cpp [moved from src/base/rs_line.cpp with 99% similarity]
src/base/line.h [moved from src/base/rs_line.h with 97% similarity]
src/base/linetypepattern.cpp [moved from src/base/rs_linetypepattern.cpp with 93% similarity]
src/base/linetypepattern.h [moved from src/base/rs_linetypepattern.h with 96% similarity]
src/base/mainwindowinterface.h [moved from src/base/rs_mainwindowinterface.h with 87% similarity]
src/base/mathextra.cpp [moved from src/base/rs_math.cpp with 90% similarity]
src/base/mathextra.h [moved from src/base/rs_math.h with 86% similarity]
src/base/modification.cpp [moved from src/base/rs_modification.cpp with 99% similarity]
src/base/modification.h [moved from src/base/rs_modification.h with 98% similarity]
src/base/paintinterface.cpp
src/base/paintinterface.h
src/base/pattern.cpp [moved from src/base/rs_pattern.cpp with 97% similarity]
src/base/pattern.h [moved from src/base/rs_pattern.h with 86% similarity]
src/base/patternlist.cpp [moved from src/base/rs_patternlist.cpp with 98% similarity]
src/base/patternlist.h [moved from src/base/rs_patternlist.h with 78% similarity]
src/base/pen.cpp [moved from src/base/rs_pen.cpp with 98% similarity]
src/base/pen.h [moved from src/base/rs_pen.h with 92% similarity]
src/base/point.cpp [moved from src/base/rs_point.cpp with 98% similarity]
src/base/point.h [moved from src/base/rs_point.h with 96% similarity]
src/base/polyline.cpp [moved from src/base/rs_polyline.cpp with 99% similarity]
src/base/polyline.h [moved from src/base/rs_polyline.h with 96% similarity]
src/base/preview.cpp [moved from src/base/rs_preview.cpp with 97% similarity]
src/base/preview.h [moved from src/base/rs_preview.h with 92% similarity]
src/base/python.cpp [moved from src/base/rs_python.cpp with 98% similarity]
src/base/python.h [moved from src/base/rs_python.h with 85% similarity]
src/base/python_wrappers.cpp [moved from src/base/rs_python_wrappers.cpp with 97% similarity]
src/base/python_wrappers.h [moved from src/base/rs_python_wrappers.h with 100% similarity]
src/base/rs.h
src/base/script.cpp [moved from src/base/rs_script.cpp with 95% similarity]
src/base/script.h [moved from src/base/rs_script.h with 91% similarity]
src/base/scriptlist.cpp [moved from src/base/rs_scriptlist.cpp with 98% similarity]
src/base/scriptlist.h [moved from src/base/rs_scriptlist.h with 85% similarity]
src/base/selection.cpp [moved from src/base/rs_selection.cpp with 98% similarity]
src/base/selection.h [moved from src/base/rs_selection.h with 93% similarity]
src/base/simplepython.cpp [moved from src/base/rs_simplepython.cpp with 98% similarity]
src/base/simplepython.h [moved from src/base/rs_simplepython.h with 88% similarity]
src/base/snapper.cpp [moved from src/base/rs_snapper.cpp with 98% similarity]
src/base/snapper.h [moved from src/base/rs_snapper.h with 98% similarity]
src/base/solid.cpp [moved from src/base/rs_solid.cpp with 98% similarity]
src/base/solid.h [moved from src/base/rs_solid.h with 97% similarity]
src/base/spline.cpp [moved from src/base/rs_spline.cpp with 99% similarity]
src/base/spline.h [moved from src/base/rs_spline.h with 97% similarity]
src/base/staticgraphicview.cpp [moved from src/base/rs_staticgraphicview.cpp with 96% similarity]
src/base/staticgraphicview.h [moved from src/base/rs_staticgraphicview.h with 91% similarity]
src/base/system.cpp [moved from src/base/rs_system.cpp with 99% similarity]
src/base/system.h [moved from src/base/rs_system.h with 89% similarity]
src/base/text.cpp [moved from src/base/rs_text.cpp with 99% similarity]
src/base/text.h [moved from src/base/rs_text.h with 98% similarity]
src/base/undo.cpp [moved from src/base/rs_undo.cpp with 98% similarity]
src/base/undo.h [moved from src/base/rs_undo.h with 96% similarity]
src/base/undoable.cpp [moved from src/base/rs_undoable.cpp with 96% similarity]
src/base/undoable.h [moved from src/base/rs_undoable.h with 90% similarity]
src/base/undocycle.cpp [moved from src/base/rs_undocycle.cpp with 95% similarity]
src/base/undocycle.h [moved from src/base/rs_undocycle.h with 94% similarity]
src/base/units.cpp [moved from src/base/rs_units.cpp with 99% similarity]
src/base/units.h [moved from src/base/rs_units.h with 97% similarity]
src/base/utility.cpp [moved from src/base/rs_utility.cpp with 96% similarity]
src/base/utility.h [moved from src/base/rs_utility.h with 80% similarity]
src/base/variable.cpp [moved from src/base/rs_variable.cpp with 97% similarity]
src/base/variable.h [moved from src/base/rs_variable.h with 93% similarity]
src/base/variabledict.cpp [moved from src/base/rs_variabledict.cpp with 99% similarity]
src/base/variabledict.h [moved from src/base/rs_variabledict.h with 92% similarity]
src/base/vector.cpp
src/base/vector.h
src/base/vectorsolutions.cpp
src/base/vectorsolutions.h
src/forms/arcoptions.cpp
src/forms/arctangentialoptions.cpp
src/forms/beveloptions.cpp
src/forms/blockdialog.cpp
src/forms/blockdialog.h
src/forms/circleoptions.cpp
src/forms/coordinatewidget.cpp
src/forms/dimensionlabeleditor.cpp
src/forms/dimlinearoptions.cpp
src/forms/dimoptions.cpp
src/forms/dlgarc.cpp
src/forms/dlgattributes.cpp
src/forms/dlgattributes.h
src/forms/dlgcircle.cpp
src/forms/dlgdimension.cpp
src/forms/dlgdimlinear.cpp
src/forms/dlgellipse.cpp
src/forms/dlghatch.cpp
src/forms/dlgimageoptions.cpp
src/forms/dlginitial.cpp
src/forms/dlginsert.cpp
src/forms/dlgline.cpp
src/forms/dlgmirror.cpp
src/forms/dlgmove.cpp
src/forms/dlgmoverotate.cpp
src/forms/dlgoptionsdrawing.cpp
src/forms/dlgoptionsgeneral.cpp
src/forms/dlgpoint.cpp
src/forms/dlgpoint.h
src/forms/dlgrotate.cpp
src/forms/dlgrotate2.cpp
src/forms/dlgscale.cpp
src/forms/dlgspline.cpp
src/forms/dlgtext.cpp
src/forms/imageoptions.cpp
src/forms/layerdialog.cpp
src/forms/librarywidget.cpp
src/forms/lineangleoptions.cpp
src/forms/linebisectoroptions.cpp
src/forms/lineoptions.cpp
src/forms/lineparalleloptions.cpp
src/forms/lineparallelthroughoptions.cpp
src/forms/linepolygon2options.cpp
src/forms/linepolygonoptions.cpp
src/forms/linerelangleoptions.cpp
src/forms/mousewidget.cpp
src/forms/mousewidget.ui
src/forms/moverotateoptions.cpp
src/forms/printpreviewoptions.cpp
src/forms/roundoptions.cpp
src/forms/selectionwidget.cpp
src/forms/snapdistoptions.cpp
src/forms/splineoptions.cpp
src/forms/textoptions.cpp
src/forms/trimamountoptions.cpp
src/forms/widgetpen.h
src/mainapp/applicationwindow.cpp
src/mainapp/applicationwindow.h
src/mainapp/commands.cpp
src/mainapp/graphicview.cpp
src/mainapp/graphicview.h
src/mainapp/main.cpp
src/mainapp/mdiwindow.cpp
src/mainapp/mdiwindow.h
src/mainapp/qc_dialogfactory.cpp
src/widgets/actionhandler.cpp
src/widgets/blockwidget.cpp
src/widgets/colorbox.h
src/widgets/commandedit.cpp
src/widgets/filedialog.cpp
src/widgets/fontbox.cpp
src/widgets/layerbox.cpp
src/widgets/layerwidget.cpp
src/widgets/linetypebox.cpp
src/widgets/patternbox.cpp
src/widgets/pentoolbar.cpp
src/widgets/pentoolbar.h
src/widgets/qg_dialogfactory.cpp
src/widgets/qg_dialogfactory.h
src/widgets/qg_graphicview.cpp
src/widgets/qg_mainwindowinterface.h
src/widgets/recentfiles.cpp
src/widgets/widthbox.cpp

index a14334393c6cac1d5c959774b84e998bec8d530a..3824c0363270651650b4f657b86d45364eedf791 100644 (file)
@@ -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
 
index 5e04f82edf285bbfceb58f1886e41453ed7358ff..88171393f5bd36a1cdc9870157d8241d6ec7f7c5 100644 (file)
@@ -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)
index 81c39806b45f66f7eecbffee8a77b662ec312f13..b8f5082c3dcdf3ec5cfa0f24fa4b422d7b7a6e0b 100644 (file)
@@ -17,7 +17,7 @@
 #include "actionblocksattributes.h"
 
 #include "drawing.h"
-#include "rs_dialogfactory.h"
+#include "dialogfactory.h"
 
 ActionBlocksAttributes::ActionBlocksAttributes(
        RS_EntityContainer & container, GraphicView & graphicView):
index aecaf397800891a24512dcae1acc313360304f3b..172c071b34bb35a47a7a564b58448545a51292f0 100644 (file)
 
 #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.
index 6c85e8a98ba15b45af90dbc3a3bc87bbbc75082f..46f549af90644452fc96453f672383f7472bcd41 100644 (file)
@@ -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)
index 3c394ccfcb8e1d284c985175b3c8af74d549a0e2..3e29a70ba14aed7a2ec09b0d5e6f7880d6607cd1 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "actionblocksexplode.h"
 
-#include "rs_modification.h"
+#include "modification.h"
 
 /**
  * Constructor.
index f28603e86cce3a938510c253551b911377114b97..8ab8aa516763f70fa77d70c628940fe55336bb92 100644 (file)
@@ -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
index 22b09b5f3f8b9f1f71ba0be4231f34dbf4676cdc..09eae0f22245b60ecbc47e42725d31020ab7f626 100644 (file)
 #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.
index 1bdf49d0cf99ba93403fea707d3c40ec7ed9c3ed..70303027d93d345f11f86f647ec518cd6f7f8d07 100644 (file)
@@ -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
index b6720fcf081f2b7463d5afce59a9c30185f78a94..1eaf12bfec6e3c00da8eb366ca07d3742777e4ff 100644 (file)
 
 #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)
index 29940ba90efe1cf50a55aa2f257aecdf6f39e126..bfbd45fa467f23038f31b9280fa19e297de96852 100644 (file)
 #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.
index 278b2e377911765c67825864281c5f590f86c0f2..537067093130cd1a349549308863a7b4baf8ba66 100644 (file)
 
 #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)
index 731aab1d61c3b4f5acdb122a8d5085625a66884e..ba4900f9c0f277e377bc81097b88fd0cf5582661 100644 (file)
@@ -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
index dcac4a5bf8a47d5fe8f0dead7113af6ae2baf838..d2da018ab5a6f212a3fba01e3ac361382688b8e3 100644 (file)
 
 #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)
index fa3643f87bc1466442e1ff1f2837a49049aa2d81..26e6b0edd5d3382d59f6236975aa90240075b9f6 100644 (file)
@@ -2,7 +2,7 @@
 #define __ACTIONDIMANGULAR_H__
 
 #include "actiondimension.h"
-#include "rs_dimangular.h"
+#include "dimangular.h"
 #include "vector.h"
 
 class RS_Line;
index 6de5c216f760b0d85e6b238f0afcaf39854fec01..fad94bf95207ca9bd72c3637f2347c068538cbd8 100644 (file)
 
 #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",
index 43859d17539bd866cf030d0e35d4f77e1ab8f81d..86c11823da463f8d8ae896ee80e526691e386417 100644 (file)
@@ -2,7 +2,7 @@
 #define __ACTIONDIMDIAMETRIC_H__
 
 #include "actiondimension.h"
-#include "rs_dimdiametric.h"
+#include "dimdiametric.h"
 #include "vector.h"
 
 class RS_Entity;
index b5b9fb809fa23af9e88c8f27a5d1e132967f201e..2de208563c6ee42d46eb4c8c99fd41e4bb6c0901 100644 (file)
@@ -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):
index e8f3b9d1faa71a8412b99f44e3ccb95b7a4053b8..23840ab08c625a43570b79b7d7c191e200847f9c 100644 (file)
@@ -2,7 +2,7 @@
 #define __ACTIONDIMENSION_H__
 
 #include <QtCore>
-#include "rs_dimension.h"
+#include "dimension.h"
 #include "actioninterface.h"
 
 /**
index 31cd29e5790f817e24f7d3da0db3290443105217..c0ef6f9698e79c5ceb558135e1046cd183c628bd 100644 (file)
 
 #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)
index d014628fd2236f9df287802580ce31e89bc57236..3db3b0ac75c555b6548997b748df9206f63536b3 100644 (file)
@@ -3,7 +3,7 @@
 
 #include <QtCore>
 #include "actioninterface.h"
-#include "rs_leader.h"
+#include "leader.h"
 
 class Vector;
 
index 6603284a0e25f469155d1496aeaad46a780b9967..cc22e46c8a6760e34b3f99dd9e97562ee18e6f08 100644 (file)
 
 #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.
index bc0ae783be36b90cd864d8f10c801848b023c3be..8b41e94fc80d9a755d97411d3d046e54c40584c9 100644 (file)
@@ -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.
index 5cc524176cb846bb885283bf50f7f037193711ec..4fd12fe295e41efa348c67b0d6cb4231f23b8275 100644 (file)
 
 #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)
index e928f3a5e92036b491ad46df02ff8f4d256ff815..d07772fe196ef9ff53c9ff5dd700ff3b63114723 100644 (file)
@@ -2,7 +2,7 @@
 #define __ACTIONDIMRADIAL_H__
 
 #include "actiondimension.h"
-#include "rs_dimradial.h"
+#include "dimradial.h"
 #include "vector.h"
 
 class RS_Entity;
index 184781c0873828d6f10a1d4c77d9b41f25d7dd17..be608fe3f193c29df31a60fe1ab11dadfd343ba0 100644 (file)
 
 #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)
index a834a3a267f62b44ac2cac0b0a28901cfac6e0df..adf4f099fcd85b8e5356c7e1ee99ae314be275f6 100644 (file)
@@ -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
index d63dbe1b5556c5aed0e66f158f78d260de9aac04..ce3d6587850cbad5b59cf92d0c0a24e8fb7673b0 100644 (file)
 #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)
index ffca07fa3d8bd7aa4eb31d5ab4662c96ecbe4780..64f627b6511f744fcc2ec8e8f9e1a4b9ab1ee2c8 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONDRAWARC3P_H__
 #define __ACTIONDRAWARC3P_H__
 
-#include "rs_arc.h"
+#include "arc.h"
 #include "actioninterface.h"
 #include "vector.h"
 
index 7cf9e1196cbb629a4ee1cd448c278316a14ed769..7ad86a7743d4f012b7cd4ef3f730e5e43cc89d2d 100644 (file)
 
 #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)
index d1f3ac23c26d0d8f52395bb4a9a3106408f1aae0..4e9ace40a7271d55cf562660118c96fc78c933da 100644 (file)
@@ -2,7 +2,7 @@
 #define __ACTIONDRAWARCTANGENTIAL_H__
 
 #include "actioninterface.h"
-#include "rs_arc.h"
+#include "arc.h"
 #include "vector.h"
 
 class RS_AtomicEntity;
index d00973f6dde3eb0487788ff8cb53f20c0e105fcf..84e0640d627c7d7a4d1fa76d7edeb55ed74c5f5c 100644 (file)
 
 #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)
index 763d184c0f8f13b65510f2eae63aab13235c252b..7357c210ed685d16dfd21d7ed67113cf2900f40e 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONDRAWCIRCLE_H__
 #define __ACTIONDRAWCIRCLE_H__
 
-#include "rs_circle.h"
+#include "circle.h"
 #include "actioninterface.h"
 
 /**
index f0719f30fcc8c2bc295e333fdc1c696363510687..33d55340c09a830ef5046d3c33b034e8a7e55a08 100644 (file)
 
 #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)
index 8f47cb734e0d4febf02841651be647f2e91fbb79..86d343a5eb99e29dcade750a47f77b1649a342c4 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONDRAWCIRCLE2P_H__
 #define __ACTIONDRAWCIRCLE2P_H__
 
-#include "rs_circle.h"
+#include "circle.h"
 #include "actioninterface.h"
 #include "vector.h"
 
index 674eedfd9a5a46cdbc0ab576362e1ee4609270e6..c836878032af34d5565c7297f10fe5d2c85e3b7e 100644 (file)
 
 #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",
index d2d64b47e6a77999ae42970f6a3e73c8910c1230..a5288137b3a3d8a2bda2d323445a0c58ae5a0bf9 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONDRAWCIRCLE3P_H__
 #define __ACTIONDRAWCIRCLE3P_H__
 
-#include "rs_circle.h"
+#include "circle.h"
 #include "actioninterface.h"
 #include "vector.h"
 
index a84a93d62110d27378e3d46ea0fdfe8b3beb4ebc..4f41d81c0a252cdf70f143a1684fee86c09013a3 100644 (file)
 
 #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.
index 6e50f446a50251ad7600c917a03aa84d60ec37b7..e3406f0cea2ebc41dd1a794688a70cb379844045 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONDRAWCIRCLECR_H__
 #define __ACTIONDRAWCIRCLECR_H__
 
-#include "rs_circle.h"
+#include "circle.h"
 #include "actioninterface.h"
 
 /**
index 717fc37e2ea2c51557e00c9f385a5f1c1380e673..e219649c442ace9715c123a1faa6cdfc1b8028a0 100644 (file)
 
 #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.
index 31e54e3300d98debc745fc11d1f2a874d6289fb4..073b43110f5e41e2a0efe9cef85fa9f6444792d1 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONDRAWELLIPSEAXIS_H__
 #define __ACTIONDRAWELLIPSEAXIS_H__
 
-#include "rs_ellipse.h"
+#include "ellipse.h"
 #include "actioninterface.h"
 
 /**
index a12530e9df1b9881508e583a5e91dea80fccdd60..aa4e3e8a19819c90fa0fdae615727aa7a858c606 100644 (file)
 
 #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)
index 20c2a0a4cf79861a54a29240e9c665cd371f4a6a..b04c79c55bd86ba91b9c0de336de6f1b67ed08bd 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONDRAWHATCH_H__
 #define __ACTIONDRAWHATCH_H__
 
-#include "rs_hatch.h"
+#include "hatch.h"
 #include "actioninterface.h"
 
 /**
index 51ef4d29d532b5daa6d7f7b213ad87c645bb88bb..524663cb24d50f74bdaf2fbced8dd4f97a7bd156 100644 (file)
 
 #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.
index 79b3e8f874bedd1062d70d7cf12a16a00f5b06f0..af2aacffb53938a44e0d382bcb00d2849ed66cca 100644 (file)
@@ -2,7 +2,7 @@
 #define __ACTIONDRAWIMAGE_H__
 
 #include <QtGui>
-#include "rs_image.h"
+#include "image.h"
 #include "actioninterface.h"
 
 /**
index b387ee93501d197013f179b4a99c073f3c9cae65..50fb99087cae5b6075a613e3f536c5cfa025f711 100644 (file)
 #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)
index fde8b4f448cf1a0854ef36d3acf2b29235bc2acd..672405b369a28b8c777d06f9d33cbbb258ef595f 100644 (file)
@@ -3,7 +3,7 @@
 
 #include <QtCore>
 #include "actioninterface.h"
-#include "rs_line.h"
+#include "line.h"
 
 /**
  * This action class can handle user events to draw
index e0c1d6839327872f05e89cebc36395e4f0657ae0..36441b72d6f2e9186e026f5ad6c60f253e91178b 100644 (file)
 
 #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):
index 3d49a6a4251946720d80edbcd697b21a6707eabe..2bc5a220d4d22374a9a05e2f478b0144bd3902ff 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONDRAWLINEANGLE_H__
 #define __ACTIONDRAWLINEANGLE_H__
 
-#include "rs_line.h"
+#include "line.h"
 #include "actioninterface.h"
 #include "vector.h"
 
index b7dab13f2c668b9357270abfafa5479068094cd0..e4c8bdd94bf27d40c2f9e3d22f405567c6e40c86 100644 (file)
 
 #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):
index b0b9b0496ee4d961b689a89b36cf7bb03405fe49..992ae0300aed910f903e85c46f01cb646751bb72 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONDRAWLINEBISECTOR_H__
 #define __ACTIONDRAWLINEBISECTOR_H__
 
-#include "rs_line.h"
+#include "line.h"
 #include "actioninterface.h"
 #include "vector.h"
 
index a54c4c2956dda0ec4a834121badaaac7656b7f14..9537cbee9a0b3b67fada49e6c671731930c25315 100644 (file)
 
 #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",
index 7dad93cf22946abb76d48d89d10db69d3f66166e..e8707a2be12aa1c6ce036a3380e7a6764e0e4c00 100644 (file)
 
 #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)
index 8c0fb451d5617ea5962cf9e480ca9faea3d4b3e8..41ae4b5791c9d4480c5d4e38f0b1bab295077a07 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONDRAWLINEHORVERT_H__
 #define __ACTIONDRAWLINEHORVERT_H__
 
-#include "rs_line.h"
+#include "line.h"
 #include "actioninterface.h"
 #include "vector.h"
 
index 5ed49a9a692ca475310e8e4aaacb5634f3f1b350..2ca3285e4318f9e3077e0891fa081ee7b6971194 100644 (file)
 #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):
index cabe41f161a6c3ca2ae8a645a45d4cca1cb855b8..a3252c36248bbcbdf1831ba6a52fd4b8cbe09063 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONDRAWLINEPARALLEL_H__
 #define __ACTIONDRAWLINEPARALLEL_H__
 
-#include "rs_line.h"
+#include "line.h"
 #include "actioninterface.h"
 #include "vector.h"
 
index a974edded82827523ccf1837227c36498e227246..21cc7ebee1f058fccef387ee860d87970b89f9d2 100644 (file)
 
 #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):
index ddf54923573dc4b1def4322622c71f43a655c79f..a3205d711da0448c228d21191edb94d5277da5b4 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONDRAWLINEPARALLELTHROUGH_H__
 #define __ACTIONDRAWLINEPARALLELTHROUGH_H__
 
-#include "rs_line.h"
+#include "line.h"
 #include "actioninterface.h"
 #include "vector.h"
 
index 00d1e6668f9035944551b4f8ff52a3d58b7929d2..ea57975f2539553fab891a053cfb065194734198 100644 (file)
 
 #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",
index c2c404f9248e07b3a468980b9d4e43543d3ac6ba..3fb68be48fdcae4a2264264f34198ac2ca57a54d 100644 (file)
 
 #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)
index 596f2331d888312203919bef8e17148ee5cd2c02..134a788091e3489adc96de931070266501c89edd 100644 (file)
 
 #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):
index 7e7fa92fc2e19ebe6449ac44ded50a6430549ec5..93eebd1c7e40fd928f9f037badc24e55d89337a6 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONDRAWLINERECTANGLE_H__
 #define __ACTIONDRAWLINERECTANGLE_H__
 
-#include "rs_line.h"
+#include "line.h"
 #include "actioninterface.h"
 #include "vector.h"
 
index e56e41d6e7f56cd3079218763da465bfb9ed754c..6d3c2f6ac58540727af909848f001865aff5a616 100644 (file)
 
 #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):
index 6120006f461eadfb1429f43b50006e52b9ce298e..8f8f27a72e634d1666f7adc7e7ee44d83e4440b9 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONDRAWLINERELANGLE_H__
 #define __ACTIONDRAWLINERELANGLE_H__
 
-#include "rs_line.h"
+#include "line.h"
 #include "actioninterface.h"
 #include "vector.h"
 
index 426fc9f7d4d8a5a7d1dc8a9e670e9b7f9b5cd08e..28c1ea1c68ee007681cc574564cedf0d729e2c94 100644 (file)
 
 #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)
index 8d369c8b64d802e3332a03bf08851c879676cc71..744291ff65c925fc2e61235cf8a51eeb0defde51 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONDRAWLINETANGENT1_H__
 #define __ACTIONDRAWLINETANGENT1_H__
 
-#include "rs_line.h"
+#include "line.h"
 #include "actioninterface.h"
 #include "vector.h"
 
index 0238dfa3d379a2517269794ea35ef312dccc0c6a..7cf85862702f785e7d589054ded82a1f31aafdc3 100644 (file)
 
 #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):
index 62e315d1a1733c6cbc17d879626c719522577528..7e048916115fc3c6aa56edb93999b43f42a36b5c 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONDRAWLINETANGENT2_H__
 #define __ACTIONDRAWLINETANGENT2_H__
 
-#include "rs_line.h"
+#include "line.h"
 #include "actioninterface.h"
 
 class RS_Entity;
index 0a1240e31a195f90426687fdab61a9498b87ad6b..f1ac97864570782df04234899cbf822a263da61a 100644 (file)
 
 #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)
index b50943292ae6c6a7e7e42992cd0382a2535a74e4..3ef5a1851821c1bbf90fecfef8e9f9db26e153ee 100644 (file)
 
 #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)
index 02722d7c7fad1a84ab928b6c4b5f5177541bf910..30b794374e2d6f3e1fdf92ff56afc435d537afa8 100644 (file)
@@ -3,7 +3,7 @@
 
 #include <QtCore>
 #include "actioninterface.h"
-#include "rs_spline.h"
+#include "spline.h"
 
 /**
  * This action class can handle user events to draw splines.
index 2de93f39032d82cf8342961eeb40bb0338880cb5..7e3d2337e4f3b1e44c9bba998af6e07f598f9963 100644 (file)
 
 #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)
 {
index 92c338040982ea9e8ef08a5fc106cb9993df2dcc..eaad7c0e946ab6116974453e1301d7992b964a13 100644 (file)
@@ -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.
index 778d9e86741ccc06c06ca1e04c277a3c5c752d9a..47103541318f6b3abe763d34b41a47e960672c91 100644 (file)
@@ -16,8 +16,8 @@
 
 #include "actioneditcopy.h"
 
-#include "rs_dialogfactory.h"
-#include "rs_modification.h"
+#include "dialogfactory.h"
+#include "modification.h"
 
 /**
  * Constructor.
index ddfcee5a26ca26946e6909545bad0210b52ea141..5bc21fb4cb3c14ed08538f2625b1e22e7a00eae2 100644 (file)
 
 #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.
index 37c3419721a94861a231d7c676e08f8005799a03..98e7a212723e784b1a832d54204961d70a9c2a9d 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "actioneditundo.h"
 
-#include "rs_dialogfactory.h"
+#include "dialogfactory.h"
 #include "graphicview.h"
 
 /**
index e0dff359196352f2b52e76e08bc9c837ae3241af..34ad19acd45ae8f899337681ed0dd8b8b6370c61 100644 (file)
 
 #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)
index 8d6af6d4630693a2733b6fd3e6ff5d8706d5a80d..ba3b6f355bebaeeba00e0424fbdaac5d368f704d 100644 (file)
 
 #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)
index 0527155cba220a5a6b201bfa366eee1f1b4900ee..9ba718da8a5b89f3cde3a5bdf007bcbe43e5fe29 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONINFOAREA_H__
 #define __ACTIONINFOAREA_H__
 
-#include "rs_infoarea.h"
+#include "infoarea.h"
 #include "actioninterface.h"
 #include "vector.h"
 
index a9bb31bc5fc05c1b8119663fbf890f746aca7f2f..9cc40fa2a61b1eea905ddce10f6a4be79232652c 100644 (file)
 
 #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)
index ed462d740cdbe6b31846d40a54c8886f604f8b13..c215e3183ccfa770f7388af0a0a4d25b3aa586ac 100644 (file)
 
 #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)
index c6b2fe3f78d71f0fd46e62f59f9d853fdeaa91ba..b31958d63756c6cb84ab75d6a6b15f756adba625 100644 (file)
@@ -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)
index deee3691fba35c9146cb79b2aecf1826455e9e36..5abe6445652778ee4e4935571bd49e671703c577 100644 (file)
@@ -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)
index 44575e36596f645540068a174b89d70093180245..199b844ccfba3404ed62ae061962006489580c98 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "actionlayersadd.h"
 
-#include "rs_dialogfactory.h"
+#include "dialogfactory.h"
 #include "drawing.h"
 
 ActionLayersAdd::ActionLayersAdd(RS_EntityContainer & container, GraphicView & graphicView):
index 864ef124097182829a6f444d1201adf94394ce40..c4a46b9b23e3a48cfbacf1cbbb04a8efd01504e1 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "actionlayersedit.h"
 
-#include "rs_dialogfactory.h"
+#include "dialogfactory.h"
 #include "graphicview.h"
 #include "drawing.h"
 
index 2d756b955be4033b25786acb997999a5e75f7d4f..ef2c870760d10d7f0d56ac53b0325c638731782d 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "actionlayersremove.h"
 
-#include "rs_dialogfactory.h"
+#include "dialogfactory.h"
 #include "drawing.h"
 
 ActionLayersRemove::ActionLayersRemove(RS_EntityContainer & container,
index 91d43a1302316452e5538750ab041625006e305e..eee135be6e380b617b5de509949db94828bace48 100644 (file)
 
 #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.
index f69576d79e50f7c4c1ee877483d852c31eb618ee..1b0b72fb4abc7b7d23da7c3055b940a777e56564 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONLIBRARYINSERT_H__
 #define __ACTIONLIBRARYINSERT_H__
 
-#include "rs_creation.h"
+#include "creation.h"
 #include "drawing.h"
 #include "actioninterface.h"
 
index f3cbd7e5e01017559e6851edfdfdaac5481ebac1..dbc64519adcfc54c7e614fb78a0d62743da5da87 100644 (file)
 
 #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):
index 4c0a6f3eab76abae15492afa9645ebd1b57a636d..92042729df01492a7112a7c089952883e31d01fb 100644 (file)
 
 #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)
index 2718dfdb9ce6e9710387e83763fcebb042a5c5f8..d30a33ebf7ebaa6f63b84008424616a3a4ace485 100644 (file)
@@ -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.
index bcfceb568ef9bbf801ea9a70e7665f66427f9ab3..b5ff8ceec2650901d5141320cdc31b95107af06e 100644 (file)
 
 #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",
index dfe22514edb7b666fac09e362af79d6e10732514..94ea10bc63d21e49753d2de7a5c9e0fa7a662b79 100644 (file)
 
 #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",
index 3a761651d6caea07d2b139e4fbe8d9761415c0b5..c37207851132fa63010a6eede442e877df872630 100644 (file)
 
 #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):
index df151cc9ffdfa79dcde7248cedfa155c4bf3eebe..5aa67c3e7992e41fa9842119a8d0aa055e312708 100644 (file)
@@ -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(
index 2dbe66a6c02c09f48ca0e41890bd7a661cfc183a..e4ca1bc3ad1b0d62b3d891e4f0ae53fb3e124a6e 100644 (file)
@@ -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,
index 3fb6e35774116446211639a1830daebf11a43fb1..bddf01859aeaf134bbca192515139c53205c66f9 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "actionmodifyexplodetext.h"
 
-#include "rs_modification.h"
+#include "modification.h"
 
 /**
  * Constructor.
index 44cc340200a7c63691ebb64505b0686850b130b6..7c07178035361f12ebdfe4089ad6b6c2c58ce538 100644 (file)
@@ -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)
index 4c74872ad67c3537468d1c1b0d8185f87d64ae17..12c11b4ba96fa1acfd928dc1d35e99b80dfdbc15 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONMODIFYMIRROR_H__
 #define __ACTIONMODIFYMIRROR_H__
 
-#include "rs_modification.h"
+#include "modification.h"
 #include "actioninterface.h"
 #include "vector.h"
 
index aaf0251921607751d5eb1c3daa781b0869e14d58..9943bcfcae8d97fb89d8f4a72d2dc3e1c35aa081 100644 (file)
@@ -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):
index 7f93a39cc93941145181eced39cfd39ed6ed26d8..87396bfdfff4d316607be135fb23542f90e05329 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONMODIFYMOVE_H__
 #define __ACTIONMODIFYMOVE_H__
 
-#include "rs_modification.h"
+#include "modification.h"
 #include "actioninterface.h"
 #include "vector.h"
 
index 961ab2ad489979f3cc6f1edc42e7b9c23d249c3d..b8dce06fce4541c4c6b5f53186df0aa45ac5e696 100644 (file)
 
 #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):
index ca9c67ac4c6e36000f64da6078151b851dd73d89..2fc2c9d1aa098637882805da328f6194c1581615 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONMODIFYMOVEROTATE_H__
 #define __ACTIONMODIFYMOVEROTATE_H__
 
-#include "rs_modification.h"
+#include "modification.h"
 #include "actioninterface.h"
 #include "vector.h"
 
index 70b4ae5b691d490b35ac4543450595caab46ee6e..d784c2b635984b2745023c9f65b004c9b9edde68 100644 (file)
@@ -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",
index be88a0e9b6d0760115962f8f7aa8e3f1c8a70fd0..a3e2a2198fdf5c9761fec0bbb264a13e52dc7569 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONMODIFYROTATE_H__
 #define __ACTIONMODIFYROTATE_H__
 
-#include "rs_modification.h"
+#include "modification.h"
 #include "actioninterface.h"
 #include "vector.h"
 
index d859214e184c7ffc45982ffdd1d94149d3815991..892aa2354b9d16c8b498d12c23941660357ace60 100644 (file)
@@ -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):
index 673f255c9c41696c7582ac8c3f4cb0f437cd1b66..94306af63141775a326b9693a11197e276a5d2a8 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONMODIFYROTATE2_H__
 #define __ACTIONMODIFYROTATE2_H__
 
-#include "rs_modification.h"
+#include "modification.h"
 #include "actioninterface.h"
 
 /**
index 87d2ddcf10c509d5f7870e808a7abea431e958d3..1ed1a79d90a299a15a0b96eb4b3d4e12d0f88fa6 100644 (file)
 
 #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)
index fab4beda749d84d417b99b95f66773e73ea0f9fd..1c954829b92bf1bea2909e6fc7c246fc61c115a5 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONMODIFYROUND_H__
 #define __ACTIONMODIFYROUND_H__
 
-#include "rs_modification.h"
+#include "modification.h"
 #include "actioninterface.h"
 #include "vector.h"
 
index 8e2aa389efa76979f50bee383bb43354a7a76183..8f04c5a10756905cfe98d1ce7044af8a73afb7e5 100644 (file)
@@ -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)
index 3a070cbe94df19418146df4300876ff16311360c..0241abffdcacca5bf826065ead4e2e9d67d04ae2 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ACTIONMODIFYSCALE_H__
 #define __ACTIONMODIFYSCALE_H__
 
-#include "rs_modification.h"
+#include "modification.h"
 #include "actioninterface.h"
 #include "vector.h"
 
index a61f07c26a74d14ff65226ac3128a2c30f6ca132..3dff16aa85a8f7b397e6d9fb017433e1efede87d 100644 (file)
 
 #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",
index 884aea5b39ba5879144df37edbd1d8bdcc364a43..0e66a71fc4aae072cf0b2481522065464472ce2e 100644 (file)
@@ -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.
index 21f2acab4098fdbfb5c9e425bea2f482f9d87369..a34367825c287993e8a70a5e5dc86c626adf6eec 100644 (file)
 
 #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):
index 4e48b5ab9947f8baf8b70420aa38e0bd2e98a173..ec39d03f2c8fd49d8d6aa940b2e5730643cb926e 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "actionoptionsdrawing.h"
 
-#include "rs_dialogfactory.h"
+#include "dialogfactory.h"
 #include "graphicview.h"
 
 ActionOptionsDrawing::ActionOptionsDrawing(RS_EntityContainer & container, GraphicView & graphicView):
index a253f22e6b6c8f9fe1a8683eb1c26984e46f29ca..d43e891e9786b1bfb2b12b7fc511c81422d4bc3b 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "actionprintpreview.h"
 
-#include "rs_dialogfactory.h"
+#include "dialogfactory.h"
 #include "drawing.h"
 #include "graphicview.h"
 
index bea5f37633b9af9d99f3184658500888b69ff922..bd96b43ef83d32d92acd89fba8d63a12821a23ac 100644 (file)
@@ -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,
index 561fac7f7b992f8124c867d5a651d42b3b10b87b..a54df0bfa01339aae0bcdb79c3c9ad2eabf86403 100644 (file)
@@ -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):
index 51477af01e7f91bd20bd0740ba3290e7c3c097cd..648a1f2a418c9d42fdcdc2f34776bc877d2ce77a 100644 (file)
 
 #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):
index b571d2b6873ff57dccb92d80589b6c7f7ea311e7..122f1f007f727200056758fee74db5ea3a8982e0 100644 (file)
 
 #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.
index 544f1aa4936abf4216345550828fcfaccbcc601b..eac8098172b588c2601771dc26986d270bdaedae 100644 (file)
@@ -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",
index 04181561b38dee71e17cb25653030d908ea1357f..e89f0bdcab14fb9aab9438793ec4898fc115404b 100644 (file)
 
 #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)
index daffbf0a2a9e57909bb5db7daa93524763758d71..f994d5d30b2922593f9f537101fa4279c4b7214d 100644 (file)
 
 #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)
index 06d0ba174da10eb4fafda6a98eaf150624e1ede5..513369314ff22917436d7480ed46c8463e921009 100644 (file)
 
 #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.
index ef69b13ff280a8ba68c21818c03b4f6f2865dbdf..5e1fc09161e403151685981d5d550651c6d5d8e0 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "actionsetrelativezero.h"
 
-#include "rs_dialogfactory.h"
+#include "dialogfactory.h"
 #include "graphicview.h"
 
 ActionSetRelativeZero::ActionSetRelativeZero(RS_EntityContainer & container,
index df4e13b127aa1daf07460985a33522f9b338cd30..72b65f415bd89467db917904df692e958fc9ffd6 100644 (file)
 
 #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.
index c204847e72a447af500a4db5aa429031f4f041e8..4913c31efedfdd7e20cd68f09b91296eb9c16efe 100644 (file)
 
 #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.
index 10f452408161383c5dd9e9a35f096a2e723401d8..f4265e7393e90faff9b0825ca5bcab95053f821d 100644 (file)
@@ -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"
 
 /**
similarity index 99%
rename from src/base/rs_arc.cpp
rename to src/base/arc.cpp
index 5fac5819d5d6f358f520acbcb18649ede4b49cdc..e21a998eeee7bb365420609f22616e398097bac5 100644 (file)
@@ -1,4 +1,4 @@
-// rs_arc.cpp
+// arc.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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"
 
 /**
similarity index 98%
rename from src/base/rs_arc.h
rename to src/base/arc.h
index 974d97ee119471558434e0104b1bd82f08c091e9..1db003a4ebfc2c3d030e5f275add24a453dd0570 100644 (file)
@@ -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__
similarity index 98%
rename from src/base/rs_atomicentity.cpp
rename to src/base/atomicentity.cpp
index 0b70917dc356b05e5f0f1b82ebfee75a2203038c..7e215d20408ad53a519916315757806940e60c7a 100644 (file)
@@ -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.
similarity index 91%
rename from src/base/rs_atomicentity.h
rename to src/base/atomicentity.h
index 89a307c5042281da074d2b91b2bb717453d8d039..fb5000a2edf93a4a35a54aa1ac20230cf9e4a3fe 100644 (file)
@@ -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__
similarity index 98%
rename from src/base/rs_block.cpp
rename to src/base/block.cpp
index e817031e327a0d30e2facb71dd741a646f9c19f8..9d520fbe85af132138babc7967878901e17aa17e 100644 (file)
@@ -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 <iomanip>
 #include "drawing.h"
similarity index 97%
rename from src/base/rs_block.h
rename to src/base/block.h
index 63b3254a439381b6543d35818d085cc530a23fca..ceed4435203612d98791013ebd0c71c350b1e180 100644 (file)
@@ -1,8 +1,8 @@
-#ifndef RS_BLOCK_H
-#define RS_BLOCK_H
+#ifndef __BLOCK_H__
+#define __BLOCK_H__
 
 #include <QtCore>
-#include "rs_document.h"
+#include "document.h"
 
 /**
  * Holds the data that defines a block.
similarity index 99%
rename from src/base/rs_blocklist.cpp
rename to src/base/blocklist.cpp
index 76e78e97936653513c36e093de8f06847eeada47..98045470d4d5e8d3b27b425a8fbec70cfe6217a2 100644 (file)
@@ -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.
similarity index 91%
rename from src/base/rs_blocklist.h
rename to src/base/blocklist.h
index ed1dc8ce583d4557f2b147ba84a4bc014efba7d0..6b1c630c4929e40aa1de1f1a063d168c3783285d 100644 (file)
@@ -1,10 +1,10 @@
-#ifndef RS_BLOCKLIST_H
-#define RS_BLOCKLIST_H
+#ifndef __BLOCKLIST_H__
+#define __BLOCKLIST_H__
 
 #include <QtCore>
-#include "rs_block.h"
-//#include "rs_blocklistlistener.h"
-#include "rs_entity.h"
+#include "block.h"
+//#include "blocklistlistener.h"
+#include "entity.h"
 
 /**
  * List of blocks.
similarity index 98%
rename from src/base/rs_circle.cpp
rename to src/base/circle.cpp
index 563c42a13a0ccad41f85e2135df924d29186ab8d..dc66e348395b4cbbee1b12351d4e274d8e839b21 100644 (file)
@@ -1,4 +1,4 @@
-// rs_circle.cpp
+// circle.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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"
 
 /**
similarity index 95%
rename from src/base/rs_circle.h
rename to src/base/circle.h
index d272ad8fea66d26b0f29e9663226aebfd987da8d..8edd3eae84f56e4f831a1cccad20204c04f13cb3 100644 (file)
@@ -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();
similarity index 92%
rename from src/base/rs_clipboard.cpp
rename to src/base/clipboard.cpp
index 46aaf82d4eeee2dab886d954f9049343dbf4be01..783951ebeb75547305d7ead3e8bea33662378789 100644 (file)
@@ -1,4 +1,4 @@
-// rs_clipboard.cpp
+// clipboard.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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;
 
similarity index 96%
rename from src/base/rs_clipboard.h
rename to src/base/clipboard.h
index 5e8c27036726d50e46e36b8c6e9af78c2df9e17a..247d07b10c16bf2384b807187b73580388860b1a 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_CLIPBOARD_H
-#define RS_CLIPBOARD_H
+#ifndef __CLIPBOARD_H__
+#define __CLIPBOARD_H__
 
 #include <iostream>
 #include "drawing.h"
similarity index 98%
rename from src/base/rs_color.cpp
rename to src/base/color.cpp
index 14d79614502858d4c824e93aa99caf7581091ffa..82d8a1f731b5b11445b5314c9355567161044d66 100644 (file)
@@ -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"
 
similarity index 92%
rename from src/base/rs_color.h
rename to src/base/color.h
index 5420f453162999ec65d8f45c66d66f5648a78f5b..d07f48da2df5ed7947ae2c99a7e7bc5047853241 100644 (file)
@@ -1,8 +1,8 @@
-#ifndef RS_COLOR_H
-#define RS_COLOR_H
+#ifndef __COLOR_H__
+#define __COLOR_H__
 
 #include <QtGui>
-#include "rs_flags.h"
+#include "flags.h"
 
 //! Color defined by layer not entity
 //#define C_BY_LAYER     0x00000001
similarity index 95%
rename from src/base/rs_commandevent.cpp
rename to src/base/commandevent.cpp
index 724a7a1949d5c8a3d6a55363443df593eabc464f..c1b33b3be1991afc8e440fe50f29bb523263603c 100644 (file)
@@ -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.
similarity index 81%
rename from src/base/rs_commandevent.h
rename to src/base/commandevent.h
index d766588ade3b861f29428f8684fef4cf49bd96e1..0eaefd569aa1bf8d0f70cb7f395b5f35e42fd6d1 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_COMMANDEVENT_H
-#define RS_COMMANDEVENT_H
+#ifndef __COMMANDEVENT_H__
+#define __COMMANDEVENT_H__
 
 #include <QtCore>
 
similarity index 98%
rename from src/base/rs_constructionline.cpp
rename to src/base/constructionline.cpp
index 20b9ccde6e61f8dbfe0f1af873c8510d21a55c51..877a64d422137ccff6180b6f4575155756f8f6bc 100644 (file)
@@ -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.
similarity index 96%
rename from src/base/rs_constructionline.h
rename to src/base/constructionline.h
index c5d797e6ae5a0a263b6270b7bce5b86bbb2b89aa..e51a693ef0b3866691d240f7a55489122a2a2a64 100644 (file)
@@ -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"
 
 /**
similarity index 99%
rename from src/base/rs_creation.cpp
rename to src/base/creation.cpp
index be969ef3dd5309d2b945021c45712dd6125d50a3..b6f9d79eb33d8f3867b717c4d729c95b3a0e7776 100644 (file)
@@ -1,4 +1,4 @@
-// rs_creation.cpp
+// creation.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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.
similarity index 98%
rename from src/base/rs_creation.h
rename to src/base/creation.h
index 4e8cab83d616a8b610d0ec952f9ab31dae97745f..35c8d3000fa57fd48986177f8b80a2e93cd6b7e7 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_CREATION_H
-#define RS_CREATION_H
+#ifndef __CREATION_H__
+#define __CREATION_H__
 
 #include <QtCore>
 #include "vector.h"
similarity index 98%
rename from src/base/rs_debug.cpp
rename to src/base/debug.cpp
index 5d0cdde5617ad4cd9e60a0249eb04721b029d757..acfafaca02fc282614b0c33e9cf64faa16490b05 100644 (file)
@@ -1,4 +1,4 @@
-// rs_debug.cpp
+// debug.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // JLH  05/28/2010  Added this text. :-)
 //
 
-#include "rs_debug.h"
+#include "debug.h"
 
 #include <stdarg.h>
-#include "rs_system.h"
+#include "system.h"
 
 RS_Debug * RS_Debug::uniqueInstance = NULL;
 
similarity index 92%
rename from src/base/rs_debug.h
rename to src/base/debug.h
index 78da213768fc76003e2735995e4baec74d7b58d1..771719b0ee81399e138251256d0b1f9f42a2d85a 100644 (file)
@@ -1,7 +1,7 @@
-#ifndef RS_DEBUG_H
-#define RS_DEBUG_H
+#ifndef __DEBUG_H__
+#define __DEBUG_H__
 
-#ifdef __hpux
+#ifdef hpux
 #include <sys/_size_t.h>
 #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__
similarity index 96%
rename from src/base/rs_dialogfactory.cpp
rename to src/base/dialogfactory.cpp
index 12c0d4c17524b7bf7c5b1f0b80eb99183a2fbf56..5fca3cbc0e87519a2cb445a4109784c89789b63c 100644 (file)
@@ -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;
 
similarity index 83%
rename from src/base/rs_dialogfactory.h
rename to src/base/dialogfactory.h
index 128aa564b4157fade6aa66461fe8c619b424c6c9..b0f580a82677b677e841070193ae736eec5fa1f2 100644 (file)
@@ -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__
similarity index 93%
rename from src/base/rs_dialogfactoryadapter.h
rename to src/base/dialogfactoryadapter.h
index 8ddb17fd63e7509af14134f8bfb0cf9771ecba83..d36e450d0ee604378966db5f1a5a1e3205e7efc5 100644 (file)
@@ -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__
similarity index 99%
rename from src/base/rs_dialogfactoryinterface.h
rename to src/base/dialogfactoryinterface.h
index 9df40defc0e17d344b722fc2bd04bc113f7283b6..c12ee70b5e2d1076dd961a3a66b3b31c2a3d48f1 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_DIALOGFACTORYINTERFACE_H
-#define RS_DIALOGFACTORYINTERFACE_H
+#ifndef __DIALOGFACTORYINTERFACE_H__
+#define __DIALOGFACTORYINTERFACE_H__
 
 #include <QtCore>
 #include "rs.h"
@@ -378,4 +378,4 @@ public:
        virtual bool isAdapter() = 0;
 };
 
-#endif
+#endif // __DIALOGFACTORYINTERFACE_H__
similarity index 98%
rename from src/base/rs_dimaligned.cpp
rename to src/base/dimaligned.cpp
index 7a6554a464cd460e7e2dc38515610e253390d414..cc9fc237983ffcfeff0d05ca3fb32b8a5bcf4229 100644 (file)
@@ -1,4 +1,4 @@
-// rs_dimaligned.cpp
+// dimaligned.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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.
similarity index 96%
rename from src/base/rs_dimaligned.h
rename to src/base/dimaligned.h
index c7a260b68bd27c2e3be60f2458bda5d5ae8c0c66..a8a7e4fc0854f28e8d5025f8e54ecbbcc2bc39e9 100644 (file)
@@ -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.
similarity index 98%
rename from src/base/rs_dimangular.cpp
rename to src/base/dimangular.cpp
index 44776526a0c79ec01d0c2af13548c70b7d3926a5..511a57010ac6c891fad44418318ea76da01ded6c 100644 (file)
@@ -1,4 +1,4 @@
-// rs_dimangular.cpp
+// dimangular.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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.
similarity index 96%
rename from src/base/rs_dimangular.h
rename to src/base/dimangular.h
index 7c7aeef3c084f570a1e62534f541301a18402c3e..4c3f71ef2ea04758cedba9c7276b9aa78f5fe486 100644 (file)
@@ -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.
similarity index 97%
rename from src/base/rs_dimdiametric.cpp
rename to src/base/dimdiametric.cpp
index 68a07277749064a585423c00a0282cd7d974cbb8..811115dd5d272eeeff8ca6d547df652b33a5c5c8 100644 (file)
@@ -1,4 +1,4 @@
-// rs_dimdiametric.cpp
+// dimdiametric.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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.
similarity index 96%
rename from src/base/rs_dimdiametric.h
rename to src/base/dimdiametric.h
index 64d6176c396edbbc61675c08a63e9452e89f531d..d3ea9590f2e32241d3d0ed60a20ce3f605684a98 100644 (file)
@@ -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.
similarity index 98%
rename from src/base/rs_dimension.cpp
rename to src/base/dimension.cpp
index 7537841ecf34b9df975f79aba660ea0c2b818c80..56f73bd610ae57f1eb80520ca479a7430c53e704 100644 (file)
@@ -1,4 +1,4 @@
-// rs_dimension.cpp
+// dimension.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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.
similarity index 98%
rename from src/base/rs_dimension.h
rename to src/base/dimension.h
index 7477a45ce31963096d6638a16df6fbc6e7946331..fadc601540bf0752bdbf6b16f37f3e8f0af82134 100644 (file)
@@ -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.
similarity index 98%
rename from src/base/rs_dimlinear.cpp
rename to src/base/dimlinear.cpp
index d64f50533e05105054f57999dc93ee75c519bbce..9ce80df3a8ec950d789a03d8ffe8e52105be4976 100644 (file)
@@ -1,4 +1,4 @@
-// rs_dimlinear.cpp
+// dimlinear.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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.
similarity index 97%
rename from src/base/rs_dimlinear.h
rename to src/base/dimlinear.h
index b8c761c74da1339c4238f1abb8cd6218ce797502..80ed0b19800419066cd19381eca2571ec3af58db 100644 (file)
@@ -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.
similarity index 98%
rename from src/base/rs_dimradial.cpp
rename to src/base/dimradial.cpp
index aa0006408eae74ef8918abbbd2e439ac16f3192d..d2d48dc76ca80b29a0860953f646876faaac78bd 100644 (file)
@@ -1,4 +1,4 @@
-// rs_dimradial.cpp
+// dimradial.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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.
similarity index 96%
rename from src/base/rs_dimradial.h
rename to src/base/dimradial.h
index a194b52df4296853f6e6b41f13cc7d7008f5d165..4570d96aa672dcd65bc3cd5580b9a02514a639e5 100644 (file)
@@ -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.
similarity index 97%
rename from src/base/rs_document.cpp
rename to src/base/document.cpp
index 8279b38457f41c491cc970145977b0f499eb42f4..cd8503e1f79a813a41ff7e981476e4df2fb7e306 100644 (file)
@@ -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.
similarity index 93%
rename from src/base/rs_document.h
rename to src/base/document.h
index 8519c4db8e7c9c9ad18fc631fe126a72597b708b..dd5463c4624f30ced91669a2be50b4936d63b656 100644 (file)
@@ -1,9 +1,9 @@
-#ifndef RS_DOCUMENT_H
-#define RS_DOCUMENT_H
+#ifndef __DOCUMENT_H__
+#define __DOCUMENT_H__
 
 #include <QtCore>
-#include "rs_entitycontainer.h"
-#include "rs_undo.h"
+#include "entitycontainer.h"
+#include "undo.h"
 
 class RS_BlockList;
 class RS_LayerList;
index 283586a076e4820f2557efef5f85b4541650c716..4193ae52af46ca5924be31749555b315305aa361 100644 (file)
 
 #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"
 
 /**
index a79447422afb1196fcbd73d4c9a0fe856f8f4773..1190f71038eaf2de2fdbb4f7869236bb9c5fcdaf 100644 (file)
@@ -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;
similarity index 99%
rename from src/base/rs_ellipse.cpp
rename to src/base/ellipse.cpp
index 8b0fea2c521bf561664cfa6e1ebdcd7674a8c85c..030a73311819cbbfeda5887446678b519d1364e2 100644 (file)
@@ -1,4 +1,4 @@
-// rs_ellipse.cpp
+// ellipse.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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"
 
 /**
similarity index 97%
rename from src/base/rs_ellipse.h
rename to src/base/ellipse.h
index dc0588c6b64418e3126a34f9d793e6ec961d89f3..2ed0f989f461c52e88f556f8ac3be78b3d395509 100644 (file)
@@ -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.
similarity index 98%
rename from src/base/rs_entity.cpp
rename to src/base/entity.cpp
index ff86b6bb8d914b5db9100946fd0e61e1f6d85ec9..bf5be9cff0eaf6b824fcaf2cf9298756c9cc01d1 100644 (file)
@@ -1,4 +1,4 @@
-// rs_entity.cpp
+// entity.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // JLH  05/28/2010  Added this text. :-)
 //
 
-#include "rs_entity.h"
+#include "entity.h"
 
 #include <iostream>
-#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.
similarity index 98%
rename from src/base/rs_entity.h
rename to src/base/entity.h
index bd1060ec1d9ef2c44eb50f08c1a88045ed6757c4..8aad2465c6d5f2862ef4deb51d1c8fa5586fcfc0 100644 (file)
@@ -1,12 +1,12 @@
-#ifndef RS_ENTITY_H
-#define RS_ENTITY_H
+#ifndef __ENTITY_H__
+#define __ENTITY_H__
 
 #include <QtCore>
 #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<QString, QString *> varList;
 };
 
-#endif
+#endif // __ENTITY_H__
similarity index 99%
rename from src/base/rs_entitycontainer.cpp
rename to src/base/entitycontainer.cpp
index e3c409193fa6b0c36cf51510d44c49c173e3f0d6..238c5a8b3f239508520f97655eda934eb59762f7 100644 (file)
@@ -1,4 +1,4 @@
-// rs_entitycontainer.cpp
+// entitycontainer.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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"
 
similarity index 95%
rename from src/base/rs_entitycontainer.h
rename to src/base/entitycontainer.h
index a55733e35ecd903a5fdc07b8d548d84da36bac23..a8c4d9ebbea6ddb3a7e83eea4a946584da212fa6 100644 (file)
@@ -1,13 +1,13 @@
-#ifndef RS_ENTITYCONTAINER_H
-#define RS_ENTITYCONTAINER_H
+#ifndef __ENTITYCONTAINER_H__
+#define __ENTITYCONTAINER_H__
 
 #include <QtCore>
-#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<RS_Entity *> entityIterator;
 };
 
-#endif
+#endif // __ENTITYCONTAINER_H__
similarity index 99%
rename from src/base/rs_eventhandler.cpp
rename to src/base/eventhandler.cpp
index fa89eff725573f007b96697744b18476d1bd1d75..58334af9958ac11b3b2afef28d4d4aadf9be4be6 100644 (file)
@@ -1,4 +1,4 @@
-// rs_eventhandler.cpp
+// eventhandler.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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.
similarity index 94%
rename from src/base/rs_eventhandler.h
rename to src/base/eventhandler.h
index 55e0dc7ffcf20572227800ef1383e2bbb417571f..aab7f3931d2eed39ed2800a025e0b498902504c2 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_EVENTHANDLER_H
-#define RS_EVENTHANDLER_H
+#ifndef __EVENTHANDLER_H__
+#define __EVENTHANDLER_H__
 
 #include <QtGui>
 #include "rs.h"
@@ -53,4 +53,4 @@ class RS_EventHandler
                bool coordinateInputEnabled;
 };
 
-#endif
+#endif // __EVENTHANDLER_H__
similarity index 96%
rename from src/base/rs_fileio.cpp
rename to src/base/fileio.cpp
index dc29997524d716cf30ba82a81cc1fbca75d60f66..3187bedfe0b5533d85c2b93befbeabe4d5f0ec89 100644 (file)
@@ -1,4 +1,4 @@
-// rs_fileio.cpp
+// fileio.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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;
 
similarity index 90%
rename from src/base/rs_fileio.h
rename to src/base/fileio.h
index fa0e8c3eaa756914ee43614805193a1931a54cd2..a564f782d9fa3b7e4854c1dbc46d056bab39fb5d 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_FILEIO_H
-#define RS_FILEIO_H
+#ifndef __FILEIO_H__
+#define __FILEIO_H__
 
 #include <QtCore>
 #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<RS_FilterInterface *> filterList;
 };
 
-#endif
+#endif // __FILEIO_H__
similarity index 98%
rename from src/base/rs_filtercxf.cpp
rename to src/base/filtercxf.cpp
index 09a0e723ca5a3af2b6ee14697a0dd9b0add02543..31c80e72b92a7d49fe74f643e44c66522f59826b 100644 (file)
@@ -1,4 +1,4 @@
-// rs_filtercxf.cpp
+// filtercxf.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // JLH  05/28/2010  Added this text. :-)
 //
 
-#include "rs_filtercxf.h"
+#include "filtercxf.h"
 
 #include <iostream>
 #include <fstream>
 #include <QtCore>
 
-#include "rs_font.h"
-#include "rs_utility.h"
-#include "rs_system.h"
+#include "font.h"
+#include "utility.h"
+#include "system.h"
 
 /**
  * Default constructor.
similarity index 90%
rename from src/base/rs_filtercxf.h
rename to src/base/filtercxf.h
index 85e81dc988701c4cde1cab873d9e366016e3ede1..973af92eb3a2abf02608d858b9e663ffb9da5227 100644 (file)
@@ -1,8 +1,8 @@
-#ifndef RS_FILTERCXF_H
-#define RS_FILTERCXF_H
+#ifndef __FILTERCXF_H__
+#define __FILTERCXF_H__
 
 #include <fstream>
-#include "rs_filterinterface.h"
+#include "filterinterface.h"
 
 /**
  * This format filter class can import and export CXF (CAM Expert Font) files.
similarity index 99%
rename from src/base/rs_filterdxf.cpp
rename to src/base/filterdxf.cpp
index c1b73c438920517dfd4dc9c265c677f11481977e..18fb3f9586926c6a038d525ccbebd121ccd5a6c9 100644 (file)
@@ -1,4 +1,4 @@
-// rs_filterdxf.cpp
+// filterdxf.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // JLH  05/28/2010  Added this text. :-)
 //
 
-#include "rs_filterdxf.h"
+#include "filterdxf.h"
 
 #include <stdio.h>
 #include <QtCore>
 #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.
similarity index 94%
rename from src/base/rs_filterdxf.h
rename to src/base/filterdxf.h
index ce3d57420841cbdfe2ce26705af3d2da587ec141..1287da10d6e6afccb8cc13ecd77655e1e091a1e1 100644 (file)
@@ -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__
similarity index 99%
rename from src/base/rs_filterdxf1.cpp
rename to src/base/filterdxf1.cpp
index c50d38248a2c13300e3deda7e55b702906555209..4a03ad5a4eb765df7c6a088fb7da6fe1de6bfd98 100644 (file)
@@ -1,4 +1,4 @@
-// rs_filterdxf1.cpp
+// filterdxf1.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // JLH  05/28/2010  Added this text. :-)
 //
 
-#include "rs_filterdxf1.h"
+#include "filterdxf1.h"
 
 #include <iostream>
-#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.
similarity index 95%
rename from src/base/rs_filterdxf1.h
rename to src/base/filterdxf1.h
index 5f86af52548573ab70f3222fd9e3dbdff5dc38b3..422fa2c98e661bf56b56d89f3a9741434b318768 100644 (file)
@@ -1,10 +1,10 @@
-#ifndef RS_FILTERDXF1_H
-#define RS_FILTERDXF1_H
+#ifndef __FILTERDXF1_H__
+#define __FILTERDXF1_H__
 
 #include <fstream>
 
-#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
similarity index 95%
rename from src/base/rs_filterinterface.cpp
rename to src/base/filterinterface.cpp
index d3a0f45696e2305b43ec67161a3880ca4611395b..4b7a09151c1ba28693074ccd993205c94c441b28 100644 (file)
@@ -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.
similarity index 96%
rename from src/base/rs_filterinterface.h
rename to src/base/filterinterface.h
index 730203bce5a3b4682a336184d91dfac69ffee864..7addd6eb064ea66d32e4e3cbd99e8abd910a45ef 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_FILTERINTERFACE_H
-#define RS_FILTERINTERFACE_H
+#ifndef __FILTERINTERFACE_H__
+#define __FILTERINTERFACE_H__
 
 #include <QtCore>
 #include "drawing.h"
similarity index 96%
rename from src/base/rs_flags.cpp
rename to src/base/flags.cpp
index 2dcba42d9a1467ffca3ae949c13adec0ee423142..32617955a2f58e97b538a39f56dd315c88c6e905 100644 (file)
@@ -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()
similarity index 91%
rename from src/base/rs_flags.h
rename to src/base/flags.h
index e127a40a1eda36f6750636d783ea2d6d83603b1b..d8a7133eb7c43bab29a76e39b4d4314197a78341 100644 (file)
@@ -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.
similarity index 98%
rename from src/base/rs_font.cpp
rename to src/base/font.cpp
index a7156cedb5446ae93f61104473ded43a342c1539..b5a13035fccabd6bba9d9b56109cc26ad21ebc9a 100644 (file)
@@ -1,4 +1,4 @@
-// rs_font.cpp
+// font.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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.
similarity index 96%
rename from src/base/rs_font.h
rename to src/base/font.h
index 61eee2299b0a580c2a543654a9a9a17f6ae642fb..f47d0cf949a9e9a18cca18bd2ea9d3e3dbce6560 100644 (file)
@@ -1,9 +1,9 @@
-#ifndef RS_FONT_H
-#define RS_FONT_H
+#ifndef __FONT_H__
+#define __FONT_H__
 
 #include <iostream>
 #include <QtCore>
-#include "rs_blocklist.h"
+#include "blocklist.h"
 
 /**
  * Class for representing a font. This is implemented as a Drawing
similarity index 93%
rename from src/base/rs_fontchar.h
rename to src/base/fontchar.h
index 11fc761878026502ab41651c7cb30a964c0a0da4..df74ae57d40bf3e6dfd58e4c22300dbfc15998c8 100644 (file)
@@ -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.
similarity index 97%
rename from src/base/rs_fontlist.cpp
rename to src/base/fontlist.cpp
index c9106715eeb94ebb65d3e58a9b93d617d0f029ea..80527a48738f59f2986c34c46f7f3b916735e4a3 100644 (file)
@@ -1,4 +1,4 @@
-// rs_fontlist.cpp
+// fontlist.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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 !!!"
 
similarity index 84%
rename from src/base/rs_fontlist.h
rename to src/base/fontlist.h
index e955d7bd020167185644d8f93a7eb2b3216ac107..403049365dd3b923fb8845f063aad573117e90b9 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_FONTLIST_H
-#define RS_FONTLIST_H
+#ifndef __FONTLIST_H__
+#define __FONTLIST_H__
 
 #include <QtCore>
 
@@ -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<RS_Font> fonts;
                QList<RS_Font *> fonts;
                QListIterator<RS_Font *> fontIterator;
 };
 
-#endif
+#endif // __FONTLIST_H__
similarity index 99%
rename from src/base/rs_grid.cpp
rename to src/base/grid.cpp
index b12f7c81ca31bbb7c334c7c844a5b724a7221e73..d6e5fbd719b8ec52270d3a58896ae43a21de60f0 100644 (file)
@@ -1,4 +1,4 @@
-// rs_grid.cpp
+// grid.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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 !!!"
similarity index 96%
rename from src/base/rs_grid.h
rename to src/base/grid.h
index d2ba69a76b157aca5b573412624454106e2637c8..62c28086f43d43bd337b4ac433bdf3271f301454 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_GRID_H
-#define RS_GRID_H
+#ifndef __GRID_H__
+#define __GRID_H__
 
 #include <QtCore>
 
similarity index 99%
rename from src/base/rs_hatch.cpp
rename to src/base/hatch.cpp
index ef1fa550752ed3f660aa996ae4af1046268e10f3..1ff09027d1520d598dd7fa39c4b03ce25c335482 100644 (file)
@@ -1,4 +1,4 @@
-// rs_hatch.cpp
+// hatch.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // JLH  05/28/2010  Added this text. :-)
 //
 
-#include "rs_hatch.h"
+#include "hatch.h"
 
 #include <QtCore>
 #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.
similarity index 89%
rename from src/base/rs_hatch.h
rename to src/base/hatch.h
index ba560ed4b3a17ad86655d11f92424bbcc0f186d5..298f38c8fee13c2deaa4e5d7957fe35225fc2f57 100644 (file)
@@ -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__
similarity index 98%
rename from src/base/rs_image.cpp
rename to src/base/image.cpp
index 75672978b19c61c2498e62eb5c093b204493131d..fa493ecde6a963cf707f3c7bcc47a805eb0049de 100644 (file)
@@ -1,4 +1,4 @@
-// rs_image.cpp
+// image.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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"
 
 /**
similarity index 98%
rename from src/base/rs_image.h
rename to src/base/image.h
index 5076a3e543098a6b503616e2d2f2ede7fab18488..082c26cef336e8841a489e61f440aa77ca4cdde4 100644 (file)
@@ -1,8 +1,8 @@
-#ifndef RS_IMAGE_H
-#define RS_IMAGE_H
+#ifndef __IMAGE_H__
+#define __IMAGE_H__
 
 #include <QtCore>
-#include "rs_atomicentity.h"
+#include "atomicentity.h"
 
 /**
  * Holds the data that defines a line.
similarity index 97%
rename from src/base/rs_infoarea.cpp
rename to src/base/infoarea.cpp
index e93eeaa9617ba74700bf3cc2c5c67d4e0fa6ecbc..1046349d95ef72f22fee3e817cc244ff114e763e 100644 (file)
@@ -1,4 +1,4 @@
-// rs_infoarea.cpp
+// infoarea.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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.
similarity index 92%
rename from src/base/rs_infoarea.h
rename to src/base/infoarea.h
index 4bc2fb24ee4801556ebbbc3aff33cd88b46268a4..607a5c75aad30a2edbd26fa1d41571aef28f9d9b 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_INFOAREA_H
-#define RS_INFOAREA_H
+#ifndef __INFOAREA_H__
+#define __INFOAREA_H__
 
 #include <QtCore>
 #include "vector.h"
similarity index 99%
rename from src/base/rs_information.cpp
rename to src/base/information.cpp
index 54a31809be2e6c9803b43e694a2fd6cef0864050..ee95485fc182ed8b18d973061628af4c6a3109d1 100644 (file)
@@ -1,4 +1,4 @@
-// rs_information.cpp
+// information.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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.
similarity index 92%
rename from src/base/rs_information.h
rename to src/base/information.h
index 57175e24960c4de1207e29bc14e8ba2200a9c3e4..4af79949024416d953a9c2c395b4ced58e16ab00 100644 (file)
@@ -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
similarity index 99%
rename from src/base/rs_insert.cpp
rename to src/base/insert.cpp
index 3b42e69f7564b9986cb902f763da88cbe1de9f2e..5365b008d0e11bc00b40fc4a089607bdb3830d00 100644 (file)
@@ -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"
 
 /**
similarity index 97%
rename from src/base/rs_insert.h
rename to src/base/insert.h
index aafb2f4ca2c7d3de560897dd42dbd40b1928b254..b6e17ae1971b9845ad6b6bdbaa8c3d9f4aa68a4b 100644 (file)
@@ -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"
 
 /**
similarity index 97%
rename from src/base/rs_layer.cpp
rename to src/base/layer.cpp
index ee468fef416549ad00d88570d2e6f0400a0be34e..4146aa2efaaedb481d72aacc137602ff719eba43 100644 (file)
@@ -1,4 +1,4 @@
-// rs_layer.cpp
+// layer.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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.
similarity index 94%
rename from src/base/rs_layer.h
rename to src/base/layer.h
index 36e8da7d39fdd19ec01ea68dd1f8db0ac5913e7e..187b675e0cf5d01c5924e64e0ea8703dcfa4bf10 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_LAYER_H
-#define RS_LAYER_H
+#ifndef __LAYER_H__
+#define __LAYER_H__
 
 #include <stddef.h>
 
@@ -10,8 +10,8 @@
 #include <iostream>
 #include <QtCore>
 
-#include "rs_flags.h"
-#include "rs_pen.h"
+#include "flags.h"
+#include "pen.h"
 
 /**
  * Holds the data that defines a layer.
similarity index 98%
rename from src/base/rs_layerlist.cpp
rename to src/base/layerlist.cpp
index 56c169e8c26ac58a0500875dca1ffee3205ee9a1..d46890488f44866ff582ae957493765151b10596 100644 (file)
@@ -1,4 +1,4 @@
-// rs_layerlist.cpp
+// layerlist.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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.
similarity index 96%
rename from src/base/rs_layerlist.h
rename to src/base/layerlist.h
index 0dcdfbda7616901d6707aeca3bf6317253e4aab0..2ee231e3832a0b316879a6425c499c8ca528cf8b 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_LAYERLIST_H
-#define RS_LAYERLIST_H
+#ifndef __LAYERLIST_H__
+#define __LAYERLIST_H__
 
 #include <iostream>
 #include <QtCore>
similarity index 97%
rename from src/base/rs_leader.cpp
rename to src/base/leader.cpp
index 73c12880ed55cbe2c9ac9cda270b1dac43093bb3..945e3df95b476f7049b5d0c572e969e377dfe114 100644 (file)
@@ -1,4 +1,4 @@
-// rs_leader.cpp
+// leader.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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.
similarity index 93%
rename from src/base/rs_leader.h
rename to src/base/leader.h
index ca6074017880703129707e1149b5aa36022ffb44..521093eacd11138a274677fcfb747362cc2b9e28 100644 (file)
@@ -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.
similarity index 99%
rename from src/base/rs_line.cpp
rename to src/base/line.cpp
index d571aa670ed16eb12109ae003ecb177429a12f33..7b8404c2b46f9208268fb793a94bb7fced4620e0 100644 (file)
@@ -1,4 +1,4 @@
-// rs_line.cpp
+// line.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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"
 
 /**
similarity index 97%
rename from src/base/rs_line.h
rename to src/base/line.h
index 7b3cdcd4646fe9fcd027f6fac8c6a5667ceea2d9..695bec7276ee79116c0f16aa6224572f246f9630 100644 (file)
@@ -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.
similarity index 93%
rename from src/base/rs_linetypepattern.cpp
rename to src/base/linetypepattern.cpp
index e1f2efc203dc5df64bd4f7b92f8e0f0e6db76683..8488a222701afad2a6377e8f2edaae7f64cb4e18 100644 (file)
@@ -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 ...)
 {
similarity index 96%
rename from src/base/rs_linetypepattern.h
rename to src/base/linetypepattern.h
index 93ef8b7e6d05a215b0b095df4d49fcb0cf0a435f..767417737d5e92ada9fd5b77ef52be28cdad8486 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_LINETYPEPATTERN_H
-#define RS_LINETYPEPATTERN_H
+#ifndef __LINETYPEPATTERN_H__
+#define __LINETYPEPATTERN_H__
 
 #include <stdarg.h>
 
similarity index 87%
rename from src/base/rs_mainwindowinterface.h
rename to src/base/mainwindowinterface.h
index e1ad32f8e8658eda661ed2168dcd880422c623fa..eefd0e2b81a5ececc5ac6f4b27b51c57e866dd81 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_MAINWINDOWINTERFACE_H
-#define RS_MAINWINDOWINTERFACE_H
+#ifndef __MAINWINDOWINTERFACE_H__
+#define __MAINWINDOWINTERFACE_H__
 
 class GraphicView;
 class RS_Document;
similarity index 90%
rename from src/base/rs_math.cpp
rename to src/base/mathextra.cpp
index 1d2f848ddf321ad47b76b44997f3498c7396de92..7646bf0291aedb1cf74beb63f3bd5396eb73c70b 100644 (file)
@@ -1,4 +1,4 @@
-// rs_math.cpp
+// mathextra.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // JLH  06/01/2010  Added this text. :-)
 //
 
-#include "rs_math.h"
+#include "mathextra.h"
 
 #include <assert.h>                                                            // For test()
 #include <math.h>
 #include <errno.h>
 #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));
similarity index 86%
rename from src/base/rs_math.h
rename to src/base/mathextra.h
index 4f8f87483ce2f47d39c5fe2bd1ce1e4dc444407d..eeb1ea62d97d777a2d540c82ed483f3b361f3941 100644 (file)
@@ -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 <QtCore>
 
@@ -40,4 +34,4 @@ public:
        static void test();
 };
 
-#endif
+#endif // __MATHEXTRA_H__
similarity index 99%
rename from src/base/rs_modification.cpp
rename to src/base/modification.cpp
index c43ae64b1eff4dc141fabdd8e1947d006d504fe8..c93ea261eebb0e9786df1add7941006b414ce6b3 100644 (file)
@@ -1,4 +1,4 @@
-// rs_modification.cpp
+// modification.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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.
similarity index 98%
rename from src/base/rs_modification.h
rename to src/base/modification.h
index c4183f9369d90a08a5035a6f5b3d918b35f6c7f7..fc139dd7cbdf42c480ac7ab3122425336b8036b9 100644 (file)
@@ -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.
index d98db849261454baad24bd36c4a69d7f2e851925..1fd77511ada5b3d6e28a6893d4f1d3c0c905671d 100644 (file)
@@ -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))
index acd0ad490d2f2213f957cc31982d2b160cd0807c..072d33336b18969a5f77b512af4d0cb65f4aeaf2 100644 (file)
@@ -1,11 +1,11 @@
-#ifndef __PAINTINTERFACE_H__
-#define __PAINTINTERFACE_H__
+#ifndef ____PAINTINTERFACE_H____
+#define ____PAINTINTERFACE_H____
 
 #include <QtGui>
 #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____
similarity index 97%
rename from src/base/rs_pattern.cpp
rename to src/base/pattern.cpp
index 9cfa3a9526f9dba791b29af2ac50552cbb910e8a..5d14519ac524c21b790b143b8ba2eb81aa463363 100644 (file)
@@ -1,4 +1,4 @@
-// rs_pattern.cpp
+// pattern.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // JLH  06/01/2010  Added this text. :-)
 //
 
-#include "rs_pattern.h"
+#include "pattern.h"
 
 #include <QtCore>
-#include "rs_system.h"
-#include "rs_fileio.h"
+#include "system.h"
+#include "fileio.h"
 #include "drawing.h"
 
 /**
similarity index 86%
rename from src/base/rs_pattern.h
rename to src/base/pattern.h
index 98344ecccd812be73de13a947afe61e5641b5988..985257308dc7aec730c14b30306e807cc45045e1 100644 (file)
@@ -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;
 
similarity index 98%
rename from src/base/rs_patternlist.cpp
rename to src/base/patternlist.cpp
index 76eb7ca02435f9acf627d42862dcf6fc8d757783..c9f1499510f377f8cbc181f501ddbb3ed6a80cf6 100644 (file)
@@ -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;
 
similarity index 78%
rename from src/base/rs_patternlist.h
rename to src/base/patternlist.h
index f5c1061460d934c9a2bebc34db8e63fe0e2e71a4..06902037957a86319556edc35a7f86effeef5bbf 100644 (file)
@@ -1,9 +1,9 @@
-#ifndef RS_PATTERNLIST_H
-#define RS_PATTERNLIST_H
+#ifndef __PATTERNLIST_H__
+#define __PATTERNLIST_H__
 
 #include <QtCore>
-#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<RS_Pattern> patterns;
                QList<RS_Pattern *> patterns;
                QListIterator<RS_Pattern *> patternIterator;
-               //! List of registered PatternListListeners
-               //Q3PtrList<RS_PatternListListener> patternListListeners;
 };
 
-#endif
+#endif // __PATTERNLIST_H__
similarity index 98%
rename from src/base/rs_pen.cpp
rename to src/base/pen.cpp
index 2423cf4bf43ca7c0f91ee823f878bd59f9f5b7ac..ee68475fe3e9372ea2a9f4d34455b20795ca349e 100644 (file)
@@ -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).
similarity index 92%
rename from src/base/rs_pen.h
rename to src/base/pen.h
index 4d6c9c07dad228b8a2b64885b035198d45d3c11d..526dadec7afbf1640eff2d7acb8c0f5142ef6b5e 100644 (file)
@@ -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,
similarity index 98%
rename from src/base/rs_point.cpp
rename to src/base/point.cpp
index 825659ba4763e966fd8d2e4cb9194166c9bf125c..6a680db54a0ea3d14309a20b17622aa7b98c176d 100644 (file)
@@ -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"
similarity index 96%
rename from src/base/rs_point.h
rename to src/base/point.h
index e25c25bf7a392c76631d01ed0645c74123ab8fc2..20fb95e5b41830c19e1027cb9d19ef81d6d0ebe6 100644 (file)
@@ -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.
similarity index 99%
rename from src/base/rs_polyline.cpp
rename to src/base/polyline.cpp
index 8fb107443cd6d33f309cf66e515b98d418485ff4..77fdbabfc108f0ab9522011be627198faf60b60e 100644 (file)
@@ -1,4 +1,4 @@
-// rs_polyline.cpp
+// polyline.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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"
 
similarity index 96%
rename from src/base/rs_polyline.h
rename to src/base/polyline.h
index 00668479a31a7fbee04cab2d47d3fd7941742e24..49c9b094b3a9add002f751636d65f736bd4a416e 100644 (file)
@@ -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.
similarity index 97%
rename from src/base/rs_preview.cpp
rename to src/base/preview.cpp
index 2c38235a0cbaf5fdab787741e75e087885f71cb5..1a873b81c7b4413a9ad701292b9910cf5ffd9c54 100644 (file)
@@ -1,4 +1,4 @@
-// rs_preview.cpp
+// preview.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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"
 
similarity index 92%
rename from src/base/rs_preview.h
rename to src/base/preview.h
index e1151de3efaae88f51163a13cf03da0deab00899..42ed4d0d2e16540aba38e1bfaf54858207795a93 100644 (file)
@@ -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;
similarity index 98%
rename from src/base/rs_python.cpp
rename to src/base/python.cpp
index ded57422280c9ea912bb0c4cd8838b7b0b46faa9..b3a92d3cd4fa773f227f5b0001cd77ced5a17bf4 100644 (file)
@@ -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
 
similarity index 85%
rename from src/base/rs_python.h
rename to src/base/python.h
index cea41f9dd38e80c7a3d4f1e81bd76a8cd02218e9..7e1a7dbf39ac0cb47d672c093a0fd216c598b6aa 100644 (file)
@@ -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.
similarity index 97%
rename from src/base/rs_python_wrappers.cpp
rename to src/base/python_wrappers.cpp
index 9af577ac2c8c7f337e9ba0a164ac441aaeb20a97..68901f4983a2ea073097ad3d3d514ed54e1fefb5 100644 (file)
 #include <boost/python.hpp>
 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(); }
index 6d7424af77e0df9d4563121fda643c66b3a748b4..d0bfc411e7eba9cd451cc5d2aa79860b588bbcc8 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_H
-#define RS_H
+#ifndef __RS_H__
+#define __RS_H__
 
 #include <QtGui>
 #include <QPrinter>
 #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__
similarity index 95%
rename from src/base/rs_script.cpp
rename to src/base/script.cpp
index 24cb0d3408b8d598ada53bd86c6576ad7e4a4b3e..5cb583a5c4287e5e7cbec321c93faf4c6c4b69bd 100644 (file)
@@ -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.
similarity index 91%
rename from src/base/rs_script.h
rename to src/base/script.h
index 9db7d02abdab5a7827c626c3c7f1bcc6d5f891e4..18a3bb628c76bae8248c92af3893ec2efad197b1 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_SCRIPT_H
-#define RS_SCRIPT_H
+#ifndef __SCRIPT_H__
+#define __SCRIPT_H__
 
 #include <QtCore>
 
similarity index 98%
rename from src/base/rs_scriptlist.cpp
rename to src/base/scriptlist.cpp
index ce5c1733e18fa69cfa7c381741822c9857a7ca7b..4b6b007f9f2d4afb31fae39fecd6e597741f64ca 100644 (file)
@@ -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;
 
similarity index 85%
rename from src/base/rs_scriptlist.h
rename to src/base/scriptlist.h
index ca45ec3823dbbf06162e9b4a5c5e06489410600c..417d00a925a514dc8014023edb705973258e187a 100644 (file)
@@ -1,10 +1,11 @@
-#ifndef RS_SCRIPTLIST_H
-#define RS_SCRIPTLIST_H
+#ifndef __SCRIPTLIST_H__
+#define __SCRIPTLIST_H__
 
 #include <QtCore>
-#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<RS_Script *> scriptIterator;
 };
 
-#endif
+#endif // __SCRIPTLIST_H__
similarity index 98%
rename from src/base/rs_selection.cpp
rename to src/base/selection.cpp
index d2ab97d69e7514078ded5051ac480729846d70e9..1261f7098325549366d71d4d9443e0ed9cab1978 100644 (file)
@@ -1,4 +1,4 @@
-// rs_selection.cpp
+// selection.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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.
similarity index 93%
rename from src/base/rs_selection.h
rename to src/base/selection.h
index 2e6ffb3271f779486c516c06ca49edefc8cb1f86..3a39ebed6ef9c73ec0f68118502ab5c1703d2d9e 100644 (file)
@@ -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;
similarity index 98%
rename from src/base/rs_simplepython.cpp
rename to src/base/simplepython.cpp
index 0ea2e1b48f27c45f6ddcaf3a46071f9b330e0c65..522a2e994e04181054192fffff80312ab75f2a14 100644 (file)
@@ -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;
similarity index 88%
rename from src/base/rs_simplepython.h
rename to src/base/simplepython.h
index 9466165c29d8187ea212cd800835da15f461c57f..031a82e5f24d9ade899a7d16c507d0d78c6cd75b 100644 (file)
@@ -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.
similarity index 98%
rename from src/base/rs_snapper.cpp
rename to src/base/snapper.cpp
index 2aa4f25dccabd04d86573bab1b781b554ee82f58..dd6e8bc903a95ff784926bda382671deabafe8ed 100644 (file)
@@ -1,4 +1,4 @@
-// rs_snapper.cpp
+// snapper.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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"
 
similarity index 98%
rename from src/base/rs_snapper.h
rename to src/base/snapper.h
index 52bd4f791de78ceb8d6c07a8c25e9d66f1548983..990e4aea1170d0300ad9c807a182baec904a43a5 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_SNAPPER_H
-#define RS_SNAPPER_H
+#ifndef __SNAPPER_H__
+#define __SNAPPER_H__
 
 #include <QtCore>
 #include "rs.h"
similarity index 98%
rename from src/base/rs_solid.cpp
rename to src/base/solid.cpp
index 8e3814ea6386c6404c5ca3a79bff442e5d61b817..5fcb0440ffcfaf6cfd1cd5a2d7ae7aad091eff9e 100644 (file)
@@ -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"
 
similarity index 97%
rename from src/base/rs_solid.h
rename to src/base/solid.h
index d2f8761a020c36a131d685f9e35724f55d72f2b1..a4b457895be161c77fcc83678995ce731cbec5d6 100644 (file)
@@ -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"
 
 /**
similarity index 99%
rename from src/base/rs_spline.cpp
rename to src/base/spline.cpp
index ec686c21b31fdfeef2987b4da6003e3c93142196..c28a2323d59a4e428ff40cd18bcbe97199dd6dd6 100644 (file)
@@ -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"
similarity index 97%
rename from src/base/rs_spline.h
rename to src/base/spline.h
index 30e613a7792df0d135549d9498a0a8de6ba0e078..dd6470bf86fca47857d0f538aa335ad25bf20a3b 100644 (file)
@@ -1,8 +1,8 @@
-#ifndef RS_SPLINE_H
-#define RS_SPLINE_H
+#ifndef __SPLINE_H__
+#define __SPLINE_H__
 
 #include <QtCore>
-#include "rs_entitycontainer.h"
+#include "entitycontainer.h"
 
 /**
  * Holds the data that defines a line.
similarity index 96%
rename from src/base/rs_staticgraphicview.cpp
rename to src/base/staticgraphicview.cpp
index 4064573066e17b64f2df09628055c2662163a582..76896efcbc8f1a857ac5245bca5c50905b83f143 100644 (file)
@@ -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.
similarity index 91%
rename from src/base/rs_staticgraphicview.h
rename to src/base/staticgraphicview.h
index 6347c193c68a92b4852f308e639571def1282553..e9341082a283140476641b9a024733b31586924d 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_STATICGRAPHICVIEW_H
-#define RS_STATICGRAPHICVIEW_H
+#ifndef __STATICGRAPHICVIEW_H__
+#define __STATICGRAPHICVIEW_H__
 
 #include "graphicview.h"
 
similarity index 99%
rename from src/base/rs_system.cpp
rename to src/base/system.cpp
index 2a85c838a8d40663e2219e39a0daa4bd976bfe68..c581e717d31ee3c73fadf3f80840f52e4d21588c 100644 (file)
@@ -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 <QTranslator>
 #include "settings.h"
similarity index 89%
rename from src/base/rs_system.h
rename to src/base/system.h
index 0ed26128488ba74be95dad11facbaac3a0b39807..be9c72952d18f947d4577f73621d1eb675ab8218 100644 (file)
@@ -1,17 +1,18 @@
-#ifndef RS_SYSTEM_H
-#define RS_SYSTEM_H
+#ifndef __SYSTEM_H__
+#define __SYSTEM_H__
 
 #include <iostream>
 #include <QtCore>
-#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__
similarity index 99%
rename from src/base/rs_text.cpp
rename to src/base/text.cpp
index 59915160c1cb3c12bbe3f71ddae95f458330d7df..5a9df7aae4e19ceb6a6ab7b0d9536c66f28cd8f5 100644 (file)
@@ -1,4 +1,4 @@
-// rs_text.cpp
+// text.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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.
similarity index 98%
rename from src/base/rs_text.h
rename to src/base/text.h
index 626d0ab587c6ea8e9a091c6084c8025c06b2cd06..4149b71d54b1908cf28d64f59e35fa3e184d33d3 100644 (file)
@@ -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.
similarity index 98%
rename from src/base/rs_undo.cpp
rename to src/base/undo.cpp
index 742a2776fba2103c322532c6a4812db2df588e75..703449320e813cc0d2c9332eb444cbbe072e9966 100644 (file)
@@ -1,4 +1,4 @@
-// rs_undo.cpp
+// undo.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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.
similarity index 96%
rename from src/base/rs_undo.h
rename to src/base/undo.h
index 701f06f998e311df77dcb90d81214d7416f4f12b..f464d52e784674a6661069b157d991d10265195b 100644 (file)
@@ -1,8 +1,8 @@
-#ifndef RS_UNDO_H
-#define RS_UNDO_H
+#ifndef __UNDO_H__
+#define __UNDO_H__
 
 #include <QtCore>
-#include "rs_undocycle.h"
+#include "undocycle.h"
 
 /**
  * Undo / redo functionality. The internal undo list consists of
similarity index 96%
rename from src/base/rs_undoable.cpp
rename to src/base/undoable.cpp
index e11a34452d286d6d077c5509da61b94ec01bbe1d..04b8501ab408679b1fd9ebd352c6ba19ba9d97c9 100644 (file)
@@ -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.
similarity index 90%
rename from src/base/rs_undoable.h
rename to src/base/undoable.h
index 87e44039453b55e26f52c3e37bef8bb6b6d65814..c17a6b3c2863de21e77ef576f8d3ac335a8c523c 100644 (file)
@@ -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;
 
similarity index 95%
rename from src/base/rs_undocycle.cpp
rename to src/base/undocycle.cpp
index 313fb3155561e09ee780beef99f789e622f52b3f..979911aca70227e66ff71d991a63f45e7cc290ad 100644 (file)
@@ -1,4 +1,4 @@
-// rs_undocycle.cpp
+// undocycle.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // 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.
similarity index 94%
rename from src/base/rs_undocycle.h
rename to src/base/undocycle.h
index 4247542a78a8cb75b63776fe33e87765f591b6e7..e51285eacf070c57fbf3f31f8eb8855e04a81ff4 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_UNDOLISTITEM_H
-#define RS_UNDOLISTITEM_H
+#ifndef __UNDOLISTITEM_H__
+#define __UNDOLISTITEM_H__
 
 #include <iostream>
 #include <QtCore>
similarity index 99%
rename from src/base/rs_units.cpp
rename to src/base/units.cpp
index 0c193fdc783e8dc61cdd415340bdfd41dc18e6b7..eb34a077fe82381ba69412bd34bd6225ce57d1bb 100644 (file)
@@ -1,4 +1,4 @@
-// rs_units.cpp
+// units.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // JLH  05/05/2010  Moved implementation from header to this file. :-)
 //
 
-#include "rs_units.h"
+#include "units.h"
 
 #include <stdio.h>
-#include "rs_math.h"
-#include "rs_debug.h"
+#include "mathextra.h"
+#include "debug.h"
 
 /**
  * Converts a DXF integer () to a Unit enum.
similarity index 97%
rename from src/base/rs_units.h
rename to src/base/units.h
index a10c54f99e134cbc8f852c2ad551fa77ac98e705..f90c2d228cba39cc41897cbb8383d65c48f17194 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_UNITS_H
-#define RS_UNITS_H
+#ifndef __UNITS_H__
+#define __UNITS_H__
 
 #include <QtCore>
 #include "rs.h"
similarity index 96%
rename from src/base/rs_utility.cpp
rename to src/base/utility.cpp
index abef2913ee332c2e3e1b04268ca3463181e08d5f..e7b332ea1e8ef12571c9cbfcee15d10bce561e04 100644 (file)
@@ -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.
similarity index 80%
rename from src/base/rs_utility.h
rename to src/base/utility.h
index 7ca446dc77cd3b7186a3a59445513756eeba37fe..c6e176dc4fa4781e74b1b899feca43855ca4acb8 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef RS_UTILITY_H
-#define RS_UTILITY_H
+#ifndef __UTILITY_H__
+#define __UTILITY_H__
 
 #include <QtCore>
 
similarity index 97%
rename from src/base/rs_variable.cpp
rename to src/base/variable.cpp
index 9a4cd3dfd572be72bbdec529d3c2bec922e11a5d..edc0245677841765e6a239990d516e29b810ab2b 100644 (file)
@@ -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()
 {
similarity index 93%
rename from src/base/rs_variable.h
rename to src/base/variable.h
index 74b180d8eeba22a81844e73d458db41f29d2fa1f..68319dd282bbb2d8575359e40ebbbebd4dafadef 100644 (file)
@@ -1,10 +1,10 @@
-#ifndef RS_VARIABLE_H
-#define RS_VARIABLE_H
+#ifndef __VARIABLE_H__
+#define __VARIABLE_H__
 
 #include <QtCore>
 #include "rs.h"
 #include "vector.h"
-#include "rs_debug.h"
+#include "debug.h"
 
 /**
  * A variable of type int, double, string or vector.
similarity index 99%
rename from src/base/rs_variabledict.cpp
rename to src/base/variabledict.cpp
index a85bb523eea16446a58b18f463c5ceecdf91db6c..e3a32d50c14d2495757ee2c5a40c72c8caa88f5d 100644 (file)
@@ -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.
similarity index 92%
rename from src/base/rs_variabledict.h
rename to src/base/variabledict.h
index ac8ca528a9c8213acae86028a870b2da039c4706..5ac8f7a371fe95d427f9730ea9b22b0c344701f8 100644 (file)
@@ -1,9 +1,9 @@
-#ifndef RS_VARIABLEDICT_H
-#define RS_VARIABLEDICT_H
+#ifndef __VARIABLEDICT_H__
+#define __VARIABLEDICT_H__
 
 #include <QtCore>
-#include "rs_variable.h"
-#include "rs_debug.h"
+#include "variable.h"
+#include "debug.h"
 
 /**
  * Dictionary of variables. The variables are stored as key / value
index 3f0125b8b738a17385d156b18abce9978e402a70..a733e732af4ddfeb671ab27ee9ceb79848cd7c76 100644 (file)
@@ -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.
index b57d2595ebbaef02f0aad9f969a6b4097f5082d3..9eaae76c327e3d5aaacc2ceb357da22c87d48aec 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef __VECTOR_H__
-#define __VECTOR_H__
+#ifndef ____VECTOR_H____
+#define ____VECTOR_H____
 
 #include <iostream>                                                            // Needed for 'friend ostream' below
 
@@ -71,4 +71,4 @@ class Vector
                bool valid;
 };
 
-#endif // __VECTOR_H__
+#endif // __VECTOR_H____
index a8f206f4b6e84d4eb070a9f88f22f7712c18ec7a..d72a72a63ae1769b0f6de4751640f9860aa929cc 100644 (file)
@@ -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.
index 72ab42dfaaf6540bac1b100f5ccf3c12fa212f0c..fcb6508f322be24fef3c10b0d6c20be2cc025b78 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef __VECTORSOLUTIONS_H__
-#define __VECTORSOLUTIONS_H__
+#ifndef ____VECTORSOLUTIONS_H____
+#define ____VECTORSOLUTIONS_H____
 
 #include <iostream>                                                            // Needed for 'friend ostream' below
 #include "vector.h"
@@ -46,4 +46,4 @@ class VectorSolutions
                bool tangent;
 };
 
-#endif // __VECTORSOLUTIONS_H__
+#endif // __VECTORSOLUTIONS_H____
index cada2cddad07a133bd94945c372c8516135cd63a..c241d1756254fee76b53a0f138fc9b32601d1e93 100644 (file)
@@ -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*/):
index 67d64200b583e46d5cff7856f1babfd16bd6a4f0..23137ba9320a30e40c7a1b830fa56fecc3c390bb 100644 (file)
@@ -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*/):
index bbfbd71994d344d2016a79df4b5b5c8c9f2beac6..6d987374aa2add9301aed27bb743e9a6386b7e8b 100644 (file)
@@ -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*/):
index 99d8d674d380abad149bad119f0212f27aa16928..335e5497b004fb8f7a3ccb98f308f5ad2151e45b 100644 (file)
@@ -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)
index fe25bb7330d8991509bbab4022ed96761e7455b5..04863b2ba50ba0c37651ace10c03c255070079ea 100644 (file)
@@ -2,7 +2,7 @@
 #define __BLOCKDIALOG_H__
 
 #include "ui_blockdialog.h"
-#include "rs_block.h"
+#include "block.h"
 
 class RS_BlockList;
 
index 90c3d9891ee002bb90dd86e631ba7d978f0e2929..85070233be56c1d699c2c124be328a23bec9b527 100644 (file)
@@ -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*/):
index ea612fe732de152628c4f31c0fa3972b1a1aa4f0..8cbf7bbe93f19c4fb38d4e5e2a9f3362a92f6b20 100644 (file)
@@ -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);
 }
index ab5e11a6eeb2cadc811b2bb1062c8d7ca646532e..08ca011ef75743cd043bc6cfdc9a94b5b03b3ef7 100644 (file)
@@ -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)
index 08f30f5f426486a5968c3dd55b39236cf0dc9c9d..9ec74b66f2a38c0668d1b4070e402cc1b92fa49e 100644 (file)
@@ -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*/):
index 0e8c51dd83598bddf811562404cf76f8716d48f9..7ea2c88b86cb8bf791dfa0e9afcf61cbb0bd343d 100644 (file)
@@ -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*/):
index b96e7ad0b8bccbe7434972842e24ca92f85cce88..b5a194a548a0650b753693ebae8a9333411acde0 100644 (file)
@@ -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)
index 4f18d61e49eec9d62f20193c63e0c3b56cac8122..322ae48fba1424d33511865a7dd19031a31cd957 100644 (file)
@@ -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)
index c701daeeb2d06c336bddeda5d2a0526d411b9836..85de35c1cc51b7d4c6ff7faf7fee0727fc1402f7 100644 (file)
@@ -2,7 +2,7 @@
 #define __DLGATTRIBUTES_H__
 
 #include "ui_dlgattributes.h"
-#include "rs_pen.h"
+#include "pen.h"
 
 class RS_AttributesData;
 class RS_LayerList;
index 396ffae03efb7c6ab0fc2adb5b4a061d33aeab98..277405dbc1e1d0645978b8bfa57fdec950ffed03 100644 (file)
@@ -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)
index 8428a837c9b0bc9e63dbb9c2ce32af8c47d8ca89..23720c1229abf209e1d7431b9ad60648b9b2e6e9 100644 (file)
@@ -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*/):
index c7829463dadefe90025b180da9834a228d804352..b1f2cc7433c8063a030ed413c1944ffabc895c5a 100644 (file)
@@ -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)
index 9bb72ba5f4593ac795f16f60407431671736eb1f..ea82592190d3936ed151f0e29e1e0966e2de254b 100644 (file)
@@ -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)
index 780b5bfe7219aa56db34cb9005a4d67c414b9269..fa634d1790bc31d9c1feae51e861559ad8f7386b 100644 (file)
 
 #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*/):
index b1329f753576c7043542cbb5fd7feb8763a6f590..19e5f92f70231a379e91ad89e8c09ac906f4a70c 100644 (file)
@@ -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*/):
index fc453b056c9f088b2a67d3c2be258a481eb23fa3..3f0f19f4b6e0dc4c37bd4c94be3414e7ec87912b 100644 (file)
@@ -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)
index 9c1f17f4f3482eb9e2026554f0391014d3424362..a9b82448911027e7d29b7c6e8df1553d9456f065 100644 (file)
@@ -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)
index d6a94d5c5bb026b1c52ff2fb294b3d545b6b6136..8493fd9fd5a77e42713f60bde5cfbf2a42541618 100644 (file)
@@ -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)
index 2cfee32152e7ff75ec2381e2426dd70ca07607e8..68b79a80bd61750f453c5c52647d23a3550fa7a7 100644 (file)
@@ -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*/):
index a9045ab89c4e82b4946a1787dd174dc3966bc93c..7ccb2e1d792f4015bcd5bb95e749d805fb74bad4 100644 (file)
@@ -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*/):
index 64665daaee8172c33e32100ee36a006e0c435f6b..53b1928c291ece06ee2bb4b85142992c9e592f75 100644 (file)
@@ -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*/):
index 12ec5db833f5556f99bb31a01707e1b9baa34bd1..2ac2a87d178944ab25dcb09702036c92ebc242fb 100644 (file)
 #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*/):
index 28aa123854531fd49763fe7acf483f03a398a2ad..03f45521cfac7323b5b9a7deb089fa9b16fb8f32 100644 (file)
 #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)
index 81c306066a41c472eb2c3a745ebfca6dadc6e6dd..d5761696dbd40f461335d187b58e889d7ed833e2 100644 (file)
@@ -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)
index 46c624ae0112c722ec43407cafdcb19e0eb3de6a..39573bc57a98de2c76ce6a99adf71872ff4ba98c 100644 (file)
@@ -2,7 +2,7 @@
 #define __DLGPOINT_H__
 
 #include "ui_dlgpoint.h"
-#include "rs_pen.h"
+#include "pen.h"
 
 class RS_Point;
 
index 6c7ea60917148ca59188bddce5db5d057232a982..d030ee87ad45a441b49989eab7a7cb1ba68d6666 100644 (file)
@@ -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*/):
index 04f0f2fd39126270025187aed9c27d4120d94684..97d80e516ffaae29e8da6cc4411580f13b1c2896 100644 (file)
@@ -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*/):
index 07e49fabfb9ef3975d85ff22ebc73c55b012d391..b58b3a55fcff9144a40c64220fff98ba5df33f08 100644 (file)
@@ -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*/):
index 5f5df0ddb036c0c840291406532d14e2020f253a..783f68e8585a33a0f752ad252d9594e7c40d14be 100644 (file)
@@ -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)
index ca8ed2588fc55454490c96c357047fe7462f2f14..6b90d22397abbb2c44df60ddc990ac9266525fa8 100644 (file)
 
 #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*/):
index a0b6a96f78b603a8c1f3425ff1471ff62ae092f0..38033490d528981662ce7111ce3a7a04092fd825 100644 (file)
@@ -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*/):
index a3418bc0d58c8acb359852124e91568091f9eec9..aa8d73576e63ac0d73bbec65e8e56f65d8ab4572 100644 (file)
@@ -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)
index edacdc1131266cdd4844a0d2ba45dac5d4388638..607b5a1ad040d29021e1e36326c6188176f706cd 100644 (file)
@@ -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*/):
index 626d0a4395c0cdefa17f72e8fee1778a3d974d90..5fd69d5121ca1d5c03e8532ce390b53bdb271b7c 100644 (file)
@@ -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*/):
index 7a83da7322857e0328294553b18b494133cdfffc..f6031382874c34584f19249f8d48f11a0c0e3a8d 100644 (file)
@@ -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*/):
index 937bec45257d0ca880fe1c9aae6fdff172faed38..5f3696ceab82dfea6fcaf3b6b0196758669053ea 100644 (file)
@@ -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),
index 573c627716a88bf63881261b85508c6e95e982bb..ba4f27d3f7d9edb52d08d1cc3d894b4e373e2a32 100644 (file)
@@ -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*/):
index aed9775513889c64661d0cad4590c100e66c0a16..782f31b76af3e91c5610c16b0a52bebbc886aed0 100644 (file)
@@ -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*/):
index ac4d93feb843f63adf1f0a4c6dfbf0890bc685da..f43e70daf7c54dc9df27854d99e8403c983a3ee5 100644 (file)
@@ -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*/):
index efeb418760dc969821be7625fa5ed96177d1a7ae..69b8f62d806552439f796ceaf75831a91acf0ed8 100644 (file)
@@ -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*/):
index 2c49d76c2c94933d284f9d0999f4e41668175859..ed197694d9d25ea2e64e5ca7cad7098eb1276f3d 100644 (file)
@@ -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*/):
index d4b4e8454352b0c157dc70c5756ec7bfb401e9d8..174ba5988a3b4fb028561483074996a183349c60 100644 (file)
@@ -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()
index 8cba0063e3d2f033fbc166d28287186bcd009e85..56b8e3e9fb0cb94f214e982f5eef75f104223ff8 100644 (file)
       </size>
      </property>
      <property name="pixmap">
-      <pixmap>image0</pixmap>
+      <pixmap resource="res/architektonas.qrc">:/res/mouse.xpm</pixmap>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
- <resources/>
+ <resources>
+  <include location="res/architektonas.qrc"/>
+ </resources>
  <connections/>
 </ui>
index 56d5aa04dd5dc00e3a63e774a2eafe9b9a28c916..de280f525d940fb0c21b5b0a393583fc06a9b548 100644 (file)
@@ -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*/):
index fa7bbb6e352792a19e565c27d1e76112f0138d48..a5e6893581671210038717772486de5983517c0b 100644 (file)
@@ -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*/):
index 9fce0ee31078f8b7f8328f74d139279173c610f4..6b4fdc0d51b81d20cefb8b92c1dd7b27aba77d44 100644 (file)
@@ -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*/):
index 1b5954efdfa93b75725e7295938c07252049ac71..21bb70d8c5db2635cb831c83e005c2a7337aaf0d 100644 (file)
@@ -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()
index a231b3b522dd2e790516d9caf32723f394f9590b..759b27cb3a605ef783ea61aa0dd2d5b4089c867c 100644 (file)
 
 #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);
 }
-
index b0a1de23d7ce01d5fa8fb11d16403ab7258a2fdd..dad1687ba03ff33b90e1399827de926f18764c0e 100644 (file)
@@ -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*/):
index 00dbeaca28f0d054a7c73f0179dae97b5b8313cf..86af4219cfeda9204f0ce522a5fad5019fa35bd3 100644 (file)
@@ -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)
index 5d6cb54df54bf92ae5d289311230b0c6363f1d6a..45b325c2edfbcfa9398b72e208256eb4d05d91c9 100644 (file)
@@ -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*/):
index e6757a64031b34704be306d30d078fd0cc699e1f..996bbf913fd63ad0e9973023cac4332f21de0005 100644 (file)
@@ -2,7 +2,7 @@
 #define __WIDGETPEN_H__
 
 #include "ui_widgetpen.h"
-#include "rs_pen.h"
+#include "pen.h"
 
 class WidgetPen: public QWidget
 {
index 0566beb287f12d6aba77a1d1c78b6f1d4cac238e..baf8ffc115e881543fc3ad47aede841520568f6e 100644 (file)
 #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"
index 3e2a1347203c37929c42ef0cc9e269177a2093f9..82273ed8b4adfbd0825d1dc5a79d899ee8e8d7ee 100644 (file)
@@ -3,7 +3,7 @@
 
 #include <QtGui>
 
-#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;
index 52b720811ececa6585c00b7d2da4cb88784f18bf..f2460e013db010800bcc6c795023fe13e3c31b68 100644 (file)
@@ -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;
index 77c74042ec3198c1e1f34f68f00662f54c53cbad..afb20a0d1ecc3ef133c6cb6cf77995eaf4f009d6 100644 (file)
 
 #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.
index 90e30b21208b64b3eb30105e0e3ccbb17504c06b..4b997de3a8f1939aa3111ad5410a7268c3f9d6a9 100644 (file)
@@ -3,9 +3,9 @@
 
 #include <QtGui>
 #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;
index 48074843d7acfdcc6e90d856dacbaf6977dc2ff9..72eac0e96f335bfe51968eaa6aa566569330d86f 100644 (file)
@@ -28,23 +28,23 @@ QSplashScreen * splash = 0;
 #include <qsproject.h>
 #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
index 1e7dc797f7e582a624251eed1c8aa0315eb589e8..1bac26e838ce5b48c90c2eabc144cdd583df6b2b 100644 (file)
@@ -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"
index 6b66aef8fedd100544c1ab91c658e75c66b45dd6..13afe6c7d0b365f1d5c2f88af28becf9cc3c211c 100644 (file)
@@ -2,7 +2,7 @@
 #define QC_MDIWINDOW_H
 
 #include <QtGui>
-#include "rs_document.h"
+#include "document.h"
 #include "layerwidget.h"
 #include "pentoolbar.h"
 
index 2f81da97a83b5fa8ff6e1b9ca319af17dadc0005..6f8bdcf9e8fc4aa9cc0e05746f5db549ad51a8b4 100644 (file)
@@ -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)
index 689db382e4fefbcd4e10ea7e40f01a71543b6207..d26327ba746cb2a26190a6a787bbf0e423dd15dd 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "actionhandler.h"
 
-#include "rs_commandevent.h"
+#include "commandevent.h"
 #include "commands.h"
 #include "actionblocksadd.h"
 #include "actionblocksattributes.h"
 #endif
 
 #ifdef RS_CAM
-#include "rs_actioncamexportauto.h"
-#include "rs_actioncamreorder.h"
+#include "actioncamexportauto.h"
+#include "actioncamreorder.h"
 #endif
 
 #include "qg_mainwindowinterface.h"
index 813bebf64f2a2669244357fe7f05c3ca492013ed..34e0542f5ad3cb3d1315844c8071946c9bb2cff4 100644 (file)
@@ -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.
index cbd9412183d8eaab4c6485031c98692b8f58dd46..1db675fccc1469c398929fa7aafff3614d0adfde 100644 (file)
@@ -2,7 +2,7 @@
 #define __COLORBOX_H__
 
 #include <QtGui>
-#include "rs_color.h"
+#include "color.h"
 
 /**
  * A combobox for choosing a color.
index f470009dbd5773f3ce1e888d5db4e9340b12acd5..7cf1eb7098c275bf4520d09b160906ed7864bb98 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "commandedit.h"
 
-#include "rs_debug.h"
+#include "debug.h"
 
 /**
  * Default Constructor. You must call init manually if you choose
index 5d36c605bafe65219882b02a2ada8cbe9306289f..6af5269c77ae08661ff71536b865d66da21fb0ae 100644 (file)
@@ -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
index ba06a48e543bf2ffe455a02fab930e3077814858..b12812b406ef2588a5d06cc0fcb9ec043a310850 100644 (file)
@@ -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
index 360d30ce70598a517cfc4be9a0297ca73922b48e..8024476fbf27765806d0be33f453a0b73bb834ea 100644 (file)
@@ -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
index a590f01ed3741c17228f29af4fc7f7a09d1dc784..0a5c4d55691ccbc07d73182b0e094e0bd2d83835 100644 (file)
@@ -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.
index 8657dfc664a76a532794a5ea05b20673034f14af..52a92b65d0f06065cfcfa565f63fda68d407395a 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "linetypebox.h"
 
-#include "rs_debug.h"
+#include "debug.h"
 
 /**
  * Default Constructor. You must call init manually if you choose
index 94f4d9375a839ecc7f0cfc8da4f022aa21106372..fb92c4c4923360d04816f22e8ea52f1c05e534b1 100644 (file)
@@ -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
index fd96c6cba4459f5348ae0534cb2bc63374190200..8897167cb2cdfa09c27c982fac63d2ce45e22300 100644 (file)
@@ -21,7 +21,7 @@
 #include "colorbox.h"
 #include "widthbox.h"
 #include "linetypebox.h"
-#include "rs_layer.h"
+#include "layer.h"
 
 /**
  * Constructor.
index c08f006e610c5556e6bd631cf6ce5e30b6e7b7ed..1a3b5fb68388269a8f13d804fcda9d4a767fad56 100644 (file)
@@ -2,8 +2,8 @@
 #define __PENTOOLBAR_H__
 
 #include <QtGui>
-//#include "rs_layerlistlistener.h"
-#include "rs_pen.h"
+//#include "layerlistlistener.h"
+#include "pen.h"
 
 class ColorBox;
 class WidthBox;
index b5093ceed36a5d899ca325a28969ffbe280762bb..7a4f7b44f093af30b15a6f495a72e1e19efadf9b 100644 (file)
 #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;
index c2d08c64d20092be9594ead5c50192201e81bdfe..79f72314891e8e24f64f02bcad18dbf4c84a39f9 100644 (file)
@@ -2,9 +2,9 @@
 #define QG_DIALOGFACTORY_H
 
 #include <QtGui>
-#include "rs_dialogfactoryinterface.h"
+#include "dialogfactoryinterface.h"
 #include "vector.h"
-#include "rs_debug.h"
+#include "debug.h"
 
 class ActionInterface;
 class CadToolBar;
index 963738c4d09c2274a61002589eb971c6c6d91fbc..a12e67cdd9ed4173bb0a7f8bb1472eee96b38fb0 100644 (file)
 #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
 
index 2e6e6985be685955d92198332d83367cc1cfd69a..1fba382e64718c28963e80a6348a0f2fb0d19032 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef QG_MAINWINDOWINTERFACE_H
 #define QG_MAINWINDOWINTERFACE_H
 
-#include "rs_mainwindowinterface.h"
+#include "mainwindowinterface.h"
 
 class QMainWindow;
 class ActionHandler;
index c614601c90bd633681d88d4bc38f4734068930f7..4e445a215a8858f83f538e2ea721714b2decab6b 100644 (file)
@@ -17,7 +17,7 @@
 #include "recentfiles.h"
 
 #include "applicationwindow.h"
-#include "rs_debug.h"
+#include "debug.h"
 
 /**
  * Constructor
index 3af0de38fc761d2faf9de5fe7cb3778a17661a13..f175aabaa8c22278243d768fdd0003ca08e62381 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "widthbox.h"
 
-#include "rs_debug.h"
+#include "debug.h"
 
 /**
  * Default Constructor. You must call init manually if you choose