From: Shamus Hammons Date: Wed, 4 Aug 2010 13:29:09 +0000 (+0000) Subject: Sanity check stage II: rename classes... X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48105dec9198cf5a81dd9286010d0d45e28f70c3;p=architektonas Sanity check stage II: rename classes... --- diff --git a/architektonas.pro b/architektonas.pro index 2e54521..7d4bb33 100644 --- a/architektonas.pro +++ b/architektonas.pro @@ -236,9 +236,9 @@ HEADERS += \ src/actions/actionfilesaveas.h \ src/actions/actioninfoangle.h \ src/actions/actioninfoarea.h \ - src/actions/actioninfoinside.h \ src/actions/actioninfodist.h \ src/actions/actioninfodist2.h \ + src/actions/actioninfoinside.h \ src/actions/actioninfototallength.h \ src/actions/actionlayersadd.h \ src/actions/actionlayersedit.h \ @@ -255,6 +255,7 @@ HEADERS += \ src/actions/actionmodifydeletefree.h \ src/actions/actionmodifydeletequick.h \ src/actions/actionmodifyentity.h \ + src/actions/actionmodifyexplodetext.h \ src/actions/actionmodifymirror.h \ src/actions/actionmodifymove.h \ src/actions/actionmodifymoverotate.h \ @@ -265,7 +266,6 @@ HEADERS += \ src/actions/actionmodifystretch.h \ src/actions/actionmodifytrim.h \ src/actions/actionmodifytrimamount.h \ - src/actions/actionmodifyexplodetext.h \ src/actions/actionoptionsdrawing.h \ src/actions/actionprintpreview.h \ src/actions/actionselect.h \ @@ -274,9 +274,9 @@ HEADERS += \ src/actions/actionselectcontour.h \ src/actions/actionselectintersected.h \ src/actions/actionselectinvert.h \ + src/actions/actionselectlayer.h \ src/actions/actionselectsingle.h \ src/actions/actionselectwindow.h \ - src/actions/actionselectlayer.h \ src/actions/actionsetrelativezero.h \ src/actions/actionsetsnapmode.h \ src/actions/actionsetsnaprestriction.h \ @@ -344,9 +344,9 @@ SOURCES += \ src/actions/actionfilesaveas.cpp \ src/actions/actioninfoangle.cpp \ src/actions/actioninfoarea.cpp \ - src/actions/actioninfoinside.cpp \ src/actions/actioninfodist.cpp \ src/actions/actioninfodist2.cpp \ + src/actions/actioninfoinside.cpp \ src/actions/actioninfototallength.cpp \ src/actions/actionlayersadd.cpp \ src/actions/actionlayersedit.cpp \ @@ -363,6 +363,7 @@ SOURCES += \ src/actions/actionmodifydeletefree.cpp \ src/actions/actionmodifydeletequick.cpp \ src/actions/actionmodifyentity.cpp \ + src/actions/actionmodifyexplodetext.cpp \ src/actions/actionmodifymirror.cpp \ src/actions/actionmodifymove.cpp \ src/actions/actionmodifymoverotate.cpp \ @@ -373,7 +374,6 @@ SOURCES += \ src/actions/actionmodifystretch.cpp \ src/actions/actionmodifytrim.cpp \ src/actions/actionmodifytrimamount.cpp \ - src/actions/actionmodifyexplodetext.cpp \ src/actions/actionoptionsdrawing.cpp \ src/actions/actionprintpreview.cpp \ src/actions/actionselect.cpp \ @@ -382,9 +382,9 @@ SOURCES += \ 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/actionselectlayer.cpp \ src/actions/actionsetrelativezero.cpp \ src/actions/actionsetsnapmode.cpp \ src/actions/actionsetsnaprestriction.cpp \ @@ -449,8 +449,8 @@ HEADERS += \ src/forms/exitdialog.h \ src/forms/imageoptions.h \ src/forms/insertoptions.h \ - src/forms/libraryinsertoptions.h \ src/forms/layerdialog.h \ + src/forms/libraryinsertoptions.h \ src/forms/librarywidget.h \ src/forms/lineangleoptions.h \ src/forms/linebisectoroptions.h \ @@ -538,8 +538,8 @@ SOURCES += \ src/forms/exitdialog.cpp \ src/forms/imageoptions.cpp \ src/forms/insertoptions.cpp \ - src/forms/libraryinsertoptions.cpp \ src/forms/layerdialog.cpp \ + src/forms/libraryinsertoptions.cpp \ src/forms/librarywidget.cpp \ src/forms/lineangleoptions.cpp \ src/forms/linebisectoroptions.cpp \ diff --git a/src/actions/actiondefault.cpp b/src/actions/actiondefault.cpp index c58d2ba..19e0bc1 100644 --- a/src/actions/actiondefault.cpp +++ b/src/actions/actiondefault.cpp @@ -18,6 +18,7 @@ #include "rs.h" #include "rs_commandevent.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "rs_line.h" #include "rs_modification.h" diff --git a/src/actions/actiondimaligned.cpp b/src/actions/actiondimaligned.cpp index c14324d..278b2e3 100644 --- a/src/actions/actiondimaligned.cpp +++ b/src/actions/actiondimaligned.cpp @@ -18,6 +18,7 @@ #include "rs_commandevent.h" #include "rs_constructionline.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondimangular.cpp b/src/actions/actiondimangular.cpp index 63970a0..dcac4a5 100644 --- a/src/actions/actiondimangular.cpp +++ b/src/actions/actiondimangular.cpp @@ -17,6 +17,7 @@ #include "actiondimangular.h" #include "rs_commandevent.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_information.h" diff --git a/src/actions/actiondimdiametric.cpp b/src/actions/actiondimdiametric.cpp index ed094f5..6de5c21 100644 --- a/src/actions/actiondimdiametric.cpp +++ b/src/actions/actiondimdiametric.cpp @@ -17,6 +17,7 @@ #include "actiondimdiametric.h" #include "rs_commandevent.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondimleader.cpp b/src/actions/actiondimleader.cpp index bcb31a0..31cd29e 100644 --- a/src/actions/actiondimleader.cpp +++ b/src/actions/actiondimleader.cpp @@ -17,6 +17,7 @@ #include "actiondimleader.h" #include "rs_commandevent.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondimlinear.cpp b/src/actions/actiondimlinear.cpp index 8a03806..6603284 100644 --- a/src/actions/actiondimlinear.cpp +++ b/src/actions/actiondimlinear.cpp @@ -18,6 +18,7 @@ #include "rs_commandevent.h" #include "rs_constructionline.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondimradial.cpp b/src/actions/actiondimradial.cpp index 2c2e336..5cc5241 100644 --- a/src/actions/actiondimradial.cpp +++ b/src/actions/actiondimradial.cpp @@ -17,6 +17,7 @@ #include "actiondimradial.h" #include "rs_commandevent.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondrawarc.cpp b/src/actions/actiondrawarc.cpp index 8782be8..184781c 100644 --- a/src/actions/actiondrawarc.cpp +++ b/src/actions/actiondrawarc.cpp @@ -18,6 +18,7 @@ #include "rs_commandevent.h" #include "commands.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondrawarctangential.cpp b/src/actions/actiondrawarctangential.cpp index adb7f52..7cf9e11 100644 --- a/src/actions/actiondrawarctangential.cpp +++ b/src/actions/actiondrawarctangential.cpp @@ -17,6 +17,7 @@ #include "actiondrawarctangential.h" #include "rs_commandevent.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondrawcircle.cpp b/src/actions/actiondrawcircle.cpp index 5e2b702..d00973f 100644 --- a/src/actions/actiondrawcircle.cpp +++ b/src/actions/actiondrawcircle.cpp @@ -17,6 +17,7 @@ #include "actiondrawcircle.h" #include "rs_commandevent.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondrawcirclecr.cpp b/src/actions/actiondrawcirclecr.cpp index 8622a16..a84a93d 100644 --- a/src/actions/actiondrawcirclecr.cpp +++ b/src/actions/actiondrawcirclecr.cpp @@ -17,6 +17,7 @@ #include "actiondrawcirclecr.h" #include "rs_commandevent.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondrawellipseaxis.cpp b/src/actions/actiondrawellipseaxis.cpp index bd089d3..717fc37 100644 --- a/src/actions/actiondrawellipseaxis.cpp +++ b/src/actions/actiondrawellipseaxis.cpp @@ -17,6 +17,7 @@ #include "actiondrawellipseaxis.h" #include "rs_commandevent.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondrawhatch.cpp b/src/actions/actiondrawhatch.cpp index e2332b5..a12530e 100644 --- a/src/actions/actiondrawhatch.cpp +++ b/src/actions/actiondrawhatch.cpp @@ -16,6 +16,7 @@ #include "actiondrawhatch.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_information.h" diff --git a/src/actions/actiondrawline.cpp b/src/actions/actiondrawline.cpp index ecb5b1c..9817bba 100644 --- a/src/actions/actiondrawline.cpp +++ b/src/actions/actiondrawline.cpp @@ -19,6 +19,7 @@ #include "actioneditundo.h" #include "rs_commandevent.h" #include "commands.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondrawlineangle.cpp b/src/actions/actiondrawlineangle.cpp index fc08356..0022d6f 100644 --- a/src/actions/actiondrawlineangle.cpp +++ b/src/actions/actiondrawlineangle.cpp @@ -18,6 +18,7 @@ #include "actiondrawlineangle.h" #include "rs_commandevent.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondrawlinebisector.cpp b/src/actions/actiondrawlinebisector.cpp index deb7580..78b8581 100644 --- a/src/actions/actiondrawlinebisector.cpp +++ b/src/actions/actiondrawlinebisector.cpp @@ -18,6 +18,7 @@ #include "rs_commandevent.h" #include "rs_creation.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondrawlinefree.cpp b/src/actions/actiondrawlinefree.cpp index 1f6683d..a54c4c2 100644 --- a/src/actions/actiondrawlinefree.cpp +++ b/src/actions/actiondrawlinefree.cpp @@ -16,6 +16,7 @@ #include "actiondrawlinefree.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_polyline.h" diff --git a/src/actions/actiondrawlinehorvert.cpp b/src/actions/actiondrawlinehorvert.cpp index 294b2f0..7dad93c 100644 --- a/src/actions/actiondrawlinehorvert.cpp +++ b/src/actions/actiondrawlinehorvert.cpp @@ -16,6 +16,7 @@ #include "actiondrawlinehorvert.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondrawlineparallel.cpp b/src/actions/actiondrawlineparallel.cpp index 8701b6a..3d1c0ff 100644 --- a/src/actions/actiondrawlineparallel.cpp +++ b/src/actions/actiondrawlineparallel.cpp @@ -20,6 +20,7 @@ #include "rs_commandevent.h" #include "commands.h" #include "rs_creation.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondrawlineparallelthrough.cpp b/src/actions/actiondrawlineparallelthrough.cpp index 612677d..a974edd 100644 --- a/src/actions/actiondrawlineparallelthrough.cpp +++ b/src/actions/actiondrawlineparallelthrough.cpp @@ -18,6 +18,7 @@ #include "rs_commandevent.h" #include "rs_creation.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondrawlinepolygon.cpp b/src/actions/actiondrawlinepolygon.cpp index 7654e1b..00d1e66 100644 --- a/src/actions/actiondrawlinepolygon.cpp +++ b/src/actions/actiondrawlinepolygon.cpp @@ -18,6 +18,7 @@ #include "rs_commandevent.h" #include "rs_creation.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondrawlinepolygon2.cpp b/src/actions/actiondrawlinepolygon2.cpp index afb25d8..c2c404f 100644 --- a/src/actions/actiondrawlinepolygon2.cpp +++ b/src/actions/actiondrawlinepolygon2.cpp @@ -18,6 +18,7 @@ #include "rs_commandevent.h" #include "rs_creation.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondrawlinerectangle.cpp b/src/actions/actiondrawlinerectangle.cpp index 950d72c..f3c4190 100644 --- a/src/actions/actiondrawlinerectangle.cpp +++ b/src/actions/actiondrawlinerectangle.cpp @@ -17,6 +17,7 @@ #include "actiondrawlinerectangle.h" #include "rs_commandevent.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondrawlinerelangle.cpp b/src/actions/actiondrawlinerelangle.cpp index d98d26a..e56e41d 100644 --- a/src/actions/actiondrawlinerelangle.cpp +++ b/src/actions/actiondrawlinerelangle.cpp @@ -18,6 +18,7 @@ #include "rs_commandevent.h" #include "rs_creation.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondrawlinetangent1.cpp b/src/actions/actiondrawlinetangent1.cpp index 90ffa30..426fc9f 100644 --- a/src/actions/actiondrawlinetangent1.cpp +++ b/src/actions/actiondrawlinetangent1.cpp @@ -17,6 +17,7 @@ #include "actiondrawlinetangent1.h" #include "rs_creation.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondrawlinetangent2.cpp b/src/actions/actiondrawlinetangent2.cpp index 82d36a3..0238dfa 100644 --- a/src/actions/actiondrawlinetangent2.cpp +++ b/src/actions/actiondrawlinetangent2.cpp @@ -17,6 +17,7 @@ #include "actiondrawlinetangent2.h" #include "rs_creation.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondrawspline.cpp b/src/actions/actiondrawspline.cpp index 9d06bf7..b509432 100644 --- a/src/actions/actiondrawspline.cpp +++ b/src/actions/actiondrawspline.cpp @@ -18,6 +18,7 @@ #include "rs_commandevent.h" #include "commands.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actiondrawtext.cpp b/src/actions/actiondrawtext.cpp index 0657671..2de93f3 100644 --- a/src/actions/actiondrawtext.cpp +++ b/src/actions/actiondrawtext.cpp @@ -19,6 +19,7 @@ #include "actiondrawtext.h" #include "rs_commandevent.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actioninfoangle.cpp b/src/actions/actioninfoangle.cpp index 94221ed..e0dff35 100644 --- a/src/actions/actioninfoangle.cpp +++ b/src/actions/actioninfoangle.cpp @@ -16,6 +16,7 @@ #include "actioninfoangle.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_information.h" diff --git a/src/actions/actioninfoarea.cpp b/src/actions/actioninfoarea.cpp index 04dff28..8d6af6d 100644 --- a/src/actions/actioninfoarea.cpp +++ b/src/actions/actioninfoarea.cpp @@ -16,6 +16,7 @@ #include "actioninfoarea.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actioninfodist.cpp b/src/actions/actioninfodist.cpp index f14006c..a9bb31b 100644 --- a/src/actions/actioninfodist.cpp +++ b/src/actions/actioninfodist.cpp @@ -16,6 +16,7 @@ #include "actioninfodist.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actioninfodist2.cpp b/src/actions/actioninfodist2.cpp index cfab90d..ed462d7 100644 --- a/src/actions/actioninfodist2.cpp +++ b/src/actions/actioninfodist2.cpp @@ -16,6 +16,7 @@ #include "actioninfodist2.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/actions/actioninfototallength.cpp b/src/actions/actioninfototallength.cpp index 0155270..deee369 100644 --- a/src/actions/actioninfototallength.cpp +++ b/src/actions/actioninfototallength.cpp @@ -16,6 +16,7 @@ #include "actioninfototallength.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" ActionInfoTotalLength::ActionInfoTotalLength(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Info Total Length", diff --git a/src/actions/actionmodifybevel.cpp b/src/actions/actionmodifybevel.cpp index 3efc215..4c0a6f3 100644 --- a/src/actions/actionmodifybevel.cpp +++ b/src/actions/actionmodifybevel.cpp @@ -17,6 +17,7 @@ #include "actionmodifybevel.h" #include "rs_commandevent.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "rs_information.h" diff --git a/src/actions/actionmodifycut.cpp b/src/actions/actionmodifycut.cpp index 000c75a..bcfceb5 100644 --- a/src/actions/actionmodifycut.cpp +++ b/src/actions/actionmodifycut.cpp @@ -16,6 +16,7 @@ #include "actionmodifycut.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_modification.h" diff --git a/src/actions/actionmodifydelete.cpp b/src/actions/actionmodifydelete.cpp index a416798..dfe2251 100644 --- a/src/actions/actionmodifydelete.cpp +++ b/src/actions/actionmodifydelete.cpp @@ -16,6 +16,7 @@ #include "actionmodifydelete.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_modification.h" diff --git a/src/actions/actionmodifydeletequick.cpp b/src/actions/actionmodifydeletequick.cpp index eeeddf7..b2d6a46 100644 --- a/src/actions/actionmodifydeletequick.cpp +++ b/src/actions/actionmodifydeletequick.cpp @@ -16,6 +16,7 @@ #include "actionmodifydeletequick.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" diff --git a/src/actions/actionmodifyentity.cpp b/src/actions/actionmodifyentity.cpp index 93cf996..8b82565 100644 --- a/src/actions/actionmodifyentity.cpp +++ b/src/actions/actionmodifyentity.cpp @@ -16,6 +16,7 @@ #include "actionmodifyentity.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" diff --git a/src/actions/actionmodifymirror.cpp b/src/actions/actionmodifymirror.cpp index e6a239b..44cc340 100644 --- a/src/actions/actionmodifymirror.cpp +++ b/src/actions/actionmodifymirror.cpp @@ -16,6 +16,7 @@ #include "actionmodifymirror.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "rs_preview.h" diff --git a/src/actions/actionmodifymove.cpp b/src/actions/actionmodifymove.cpp index 070f65b..aaf0251 100644 --- a/src/actions/actionmodifymove.cpp +++ b/src/actions/actionmodifymove.cpp @@ -16,6 +16,7 @@ #include "actionmodifymove.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "rs_preview.h" diff --git a/src/actions/actionmodifymoverotate.cpp b/src/actions/actionmodifymoverotate.cpp index e09db72..961ab2a 100644 --- a/src/actions/actionmodifymoverotate.cpp +++ b/src/actions/actionmodifymoverotate.cpp @@ -17,6 +17,7 @@ #include "actionmodifymoverotate.h" #include "rs_commandevent.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "rs_preview.h" diff --git a/src/actions/actionmodifyrotate.cpp b/src/actions/actionmodifyrotate.cpp index 893b36b..70b4ae5 100644 --- a/src/actions/actionmodifyrotate.cpp +++ b/src/actions/actionmodifyrotate.cpp @@ -16,6 +16,7 @@ #include "actionmodifyrotate.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" ActionModifyRotate::ActionModifyRotate(RS_EntityContainer & container, GraphicView & graphicView): diff --git a/src/actions/actionmodifyrotate2.cpp b/src/actions/actionmodifyrotate2.cpp index 51530e5..d859214 100644 --- a/src/actions/actionmodifyrotate2.cpp +++ b/src/actions/actionmodifyrotate2.cpp @@ -16,6 +16,7 @@ #include "actionmodifyrotate2.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" ActionModifyRotate2::ActionModifyRotate2( diff --git a/src/actions/actionmodifyround.cpp b/src/actions/actionmodifyround.cpp index 6ff5a09..87d2ddc 100644 --- a/src/actions/actionmodifyround.cpp +++ b/src/actions/actionmodifyround.cpp @@ -17,6 +17,7 @@ #include "actionmodifyround.h" #include "rs_commandevent.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "rs_information.h" #include "rs_preview.h" diff --git a/src/actions/actionmodifyscale.cpp b/src/actions/actionmodifyscale.cpp index e4d8dce..8e2aa38 100644 --- a/src/actions/actionmodifyscale.cpp +++ b/src/actions/actionmodifyscale.cpp @@ -16,6 +16,7 @@ #include "actionmodifyscale.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" ActionModifyScale::ActionModifyScale(RS_EntityContainer & container, GraphicView & graphicView): diff --git a/src/actions/actionmodifystretch.cpp b/src/actions/actionmodifystretch.cpp index de95114..a61f07c 100644 --- a/src/actions/actionmodifystretch.cpp +++ b/src/actions/actionmodifystretch.cpp @@ -16,6 +16,7 @@ #include "actionmodifystretch.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "rs_modification.h" #include "rs_preview.h" diff --git a/src/actions/actionmodifytrim.cpp b/src/actions/actionmodifytrim.cpp index 4560106..884aea5 100644 --- a/src/actions/actionmodifytrim.cpp +++ b/src/actions/actionmodifytrim.cpp @@ -16,6 +16,7 @@ #include "actionmodifytrim.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "rs_modification.h" diff --git a/src/actions/actionmodifytrimamount.cpp b/src/actions/actionmodifytrimamount.cpp index 7d2e461..21f2aca 100644 --- a/src/actions/actionmodifytrimamount.cpp +++ b/src/actions/actionmodifytrimamount.cpp @@ -17,6 +17,7 @@ #include "actionmodifytrimamount.h" #include "rs_commandevent.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "rs_modification.h" diff --git a/src/actions/actionselectcontour.cpp b/src/actions/actionselectcontour.cpp index ebedace..51477af 100644 --- a/src/actions/actionselectcontour.cpp +++ b/src/actions/actionselectcontour.cpp @@ -16,7 +16,9 @@ #include "actionselectcontour.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" +#include "graphicview.h" #include "rs_selection.h" ActionSelectContour::ActionSelectContour(RS_EntityContainer & container, diff --git a/src/actions/actionselectintersected.cpp b/src/actions/actionselectintersected.cpp index 27b3fd5..b571d2b 100644 --- a/src/actions/actionselectintersected.cpp +++ b/src/actions/actionselectintersected.cpp @@ -16,7 +16,9 @@ #include "actionselectintersected.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" +#include "graphicview.h" #include "rs_selection.h" #include "rs_preview.h" diff --git a/src/actions/actionselectlayer.cpp b/src/actions/actionselectlayer.cpp index bc235ed..0418156 100644 --- a/src/actions/actionselectlayer.cpp +++ b/src/actions/actionselectlayer.cpp @@ -16,7 +16,9 @@ #include "actionselectlayer.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" +#include "graphicview.h" #include "rs_selection.h" ActionSelectLayer::ActionSelectLayer(RS_EntityContainer & container, GraphicView & graphicView): diff --git a/src/actions/actionselectsingle.cpp b/src/actions/actionselectsingle.cpp index 9a54b6f..daffbf0 100644 --- a/src/actions/actionselectsingle.cpp +++ b/src/actions/actionselectsingle.cpp @@ -16,7 +16,9 @@ #include "actionselectsingle.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" +#include "graphicview.h" #include "rs_selection.h" ActionSelectSingle::ActionSelectSingle(RS_EntityContainer & container, GraphicView & graphicView): diff --git a/src/actions/actionselectwindow.cpp b/src/actions/actionselectwindow.cpp index c4f76b7..06d0ba1 100644 --- a/src/actions/actionselectwindow.cpp +++ b/src/actions/actionselectwindow.cpp @@ -16,7 +16,9 @@ #include "actionselectwindow.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" +#include "graphicview.h" #include "rs_selection.h" #include "rs_preview.h" diff --git a/src/actions/actionsnapintersectionmanual.cpp b/src/actions/actionsnapintersectionmanual.cpp index dc692df..df4e13b 100644 --- a/src/actions/actionsnapintersectionmanual.cpp +++ b/src/actions/actionsnapintersectionmanual.cpp @@ -16,6 +16,7 @@ #include "actionsnapintersectionmanual.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_information.h" diff --git a/src/actions/actiontoolregeneratedimensions.cpp b/src/actions/actiontoolregeneratedimensions.cpp index a1d9d5f..0494e06 100644 --- a/src/actions/actiontoolregeneratedimensions.cpp +++ b/src/actions/actiontoolregeneratedimensions.cpp @@ -16,6 +16,7 @@ #include "actiontoolregeneratedimensions.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "rs_dimension.h" #include "graphicview.h" diff --git a/src/actions/actionzoomwindow.cpp b/src/actions/actionzoomwindow.cpp index 1bdde37..c204847 100644 --- a/src/actions/actionzoomwindow.cpp +++ b/src/actions/actionzoomwindow.cpp @@ -16,6 +16,7 @@ #include "actionzoomwindow.h" +#include "rs_debug.h" #include "rs_dialogfactory.h" #include "graphicview.h" #include "rs_preview.h" diff --git a/src/base/rs_staticgraphicview.cpp b/src/base/rs_staticgraphicview.cpp index 83d9deb..2451576 100644 --- a/src/base/rs_staticgraphicview.cpp +++ b/src/base/rs_staticgraphicview.cpp @@ -23,6 +23,8 @@ just me. >:-) #include "rs_staticgraphicview.h" +#include "rs_debug.h" + /** * Constructor. * diff --git a/src/base/rs_variabledict.cpp b/src/base/rs_variabledict.cpp index d03aef0..a85bb52 100644 --- a/src/base/rs_variabledict.cpp +++ b/src/base/rs_variabledict.cpp @@ -286,13 +286,11 @@ std::ostream & operator<<(std::ostream & os, RS_VariableDict & d) // Q3DictIterator it(d.variables); QHashIterator it(d.variables); -// for(; it.current(); ++it) while (it.hasNext()) { it.next(); -//Hmm, not sure about this... -#warning "Not sure if this is correct usage (.toAscii().data())... !!! FIX !!!" os << it.key().toAscii().data() << ": "; + switch (it.value()->getType()) { case RS2::VariableVoid: diff --git a/src/forms/arcoptions.cpp b/src/forms/arcoptions.cpp index 4811be2..cada2cd 100644 --- a/src/forms/arcoptions.cpp +++ b/src/forms/arcoptions.cpp @@ -19,6 +19,7 @@ #include "actiondrawarc.h" #include "actioninterface.h" +#include "rs_debug.h" #include "settings.h" ArcOptions::ArcOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/arctangentialoptions.cpp b/src/forms/arctangentialoptions.cpp index e35c445..67d6420 100644 --- a/src/forms/arctangentialoptions.cpp +++ b/src/forms/arctangentialoptions.cpp @@ -17,6 +17,7 @@ #include "arctangentialoptions.h" #include "actiondrawarctangential.h" +#include "rs_debug.h" #include "settings.h" ArcTangentialOptions::ArcTangentialOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/beveloptions.cpp b/src/forms/beveloptions.cpp index a99f7f2..bbfbd71 100644 --- a/src/forms/beveloptions.cpp +++ b/src/forms/beveloptions.cpp @@ -19,6 +19,7 @@ #include "rs.h" #include "actioninterface.h" #include "actionmodifybevel.h" +#include "rs_debug.h" #include "settings.h" BevelOptions::BevelOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/blockdialog.cpp b/src/forms/blockdialog.cpp index a3666d2..99d8d67 100644 --- a/src/forms/blockdialog.cpp +++ b/src/forms/blockdialog.cpp @@ -17,6 +17,7 @@ #include "blockdialog.h" #include "rs_blocklist.h" +#include "rs_debug.h" BlockDialog::BlockDialog(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): QDialog(parent, flags), blockList(NULL) diff --git a/src/forms/cadtoolbar.cpp b/src/forms/cadtoolbar.cpp index 5680f1d..d1ace02 100644 --- a/src/forms/cadtoolbar.cpp +++ b/src/forms/cadtoolbar.cpp @@ -59,7 +59,7 @@ CadToolBar::~CadToolBar() /** * @return Pointer to action handler or NULL. */ -QG_ActionHandler * CadToolBar::getActionHandler() +ActionHandler * CadToolBar::getActionHandler() { return actionHandler; } @@ -100,7 +100,7 @@ void CadToolBar::contextMenuEvent(QContextMenuEvent * e) * * @param ah Pointer to action handler which will deal with the actions in this tool bar. */ -void CadToolBar::createSubToolBars(QG_ActionHandler * ah) +void CadToolBar::createSubToolBars(ActionHandler * ah) { actionHandler = ah; tbMain = new CadToolBarMain(this); diff --git a/src/forms/cadtoolbar.h b/src/forms/cadtoolbar.h index dcf03f8..2810f61 100644 --- a/src/forms/cadtoolbar.h +++ b/src/forms/cadtoolbar.h @@ -4,7 +4,7 @@ #include class ActionInterface; -class QG_ActionHandler; +class ActionHandler; class CadToolBarSplines; class CadToolBarInfo; class CadToolBarMain; @@ -27,14 +27,14 @@ class CadToolBar: public QWidget CadToolBar(QWidget * parent = 0, Qt::WindowFlags flags = 0); ~CadToolBar(); - QG_ActionHandler * getActionHandler(); + ActionHandler * getActionHandler(); public slots: void back(); void forceNext(); void mouseReleaseEvent(QMouseEvent * e); void contextMenuEvent(QContextMenuEvent * e); - void createSubToolBars(QG_ActionHandler * ah); + void createSubToolBars(ActionHandler * ah); void showToolBar(int id); void showToolBarMain(); void showToolBarPoints(); @@ -58,7 +58,7 @@ class CadToolBar: public QWidget void signalNext(); protected: - QG_ActionHandler * actionHandler; + ActionHandler * actionHandler; QWidget * currentTb; CadToolBarSplines * tbSplines; CadToolBarInfo * tbInfo; diff --git a/src/forms/cadtoolbarmain.cpp b/src/forms/cadtoolbarmain.cpp index 8afef2d..ab47b21 100644 --- a/src/forms/cadtoolbarmain.cpp +++ b/src/forms/cadtoolbarmain.cpp @@ -18,13 +18,13 @@ #include "cadtoolbarmain.h" -#include "qg_actionhandler.h" +#include "actionhandler.h" #include "cadtoolbar.h" CadToolBarMain::CadToolBarMain(CadToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): QWidget((QWidget *)parent, flags) { - QG_ActionHandler * actionHandler = parent->getActionHandler(); + ActionHandler * actionHandler = parent->getActionHandler(); gridLayout = new QGridLayout(this); gridLayout->setSpacing(0); diff --git a/src/forms/cadtoolbarselect.cpp b/src/forms/cadtoolbarselect.cpp index 7fffd10..adf8a03 100644 --- a/src/forms/cadtoolbarselect.cpp +++ b/src/forms/cadtoolbarselect.cpp @@ -16,7 +16,7 @@ #include "cadtoolbarselect.h" -#include "qg_actionhandler.h" +#include "actionhandler.h" #include "actioninterface.h" #include "cadtoolbar.h" #include "createqtactions.h" diff --git a/src/forms/cadtoolbarselect.h b/src/forms/cadtoolbarselect.h index 4ba9aa1..34ea313 100644 --- a/src/forms/cadtoolbarselect.h +++ b/src/forms/cadtoolbarselect.h @@ -4,7 +4,7 @@ #include class CadToolBar; -class QG_ActionHandler; +class ActionHandler; class ActionInterface; class CadToolBarSelect: public QWidget @@ -23,7 +23,7 @@ class CadToolBarSelect: public QWidget private: QToolButton * doit; - QG_ActionHandler * actionHandler; + ActionHandler * actionHandler; ActionInterface * selectAction; int nextAction; }; diff --git a/src/forms/circleoptions.cpp b/src/forms/circleoptions.cpp index 348e3fe..90c3d98 100644 --- a/src/forms/circleoptions.cpp +++ b/src/forms/circleoptions.cpp @@ -19,6 +19,7 @@ #include "rs.h" #include "actioninterface.h" #include "actiondrawcirclecr.h" +#include "rs_debug.h" #include "settings.h" CircleOptions::CircleOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/commandwidget.cpp b/src/forms/commandwidget.cpp index ab2a912..d4c342e 100644 --- a/src/forms/commandwidget.cpp +++ b/src/forms/commandwidget.cpp @@ -17,7 +17,7 @@ #include "commandwidget.h" #include "commands.h" -#include "qg_actionhandler.h" +#include "actionhandler.h" CommandWidget::CommandWidget(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): QWidget(parent, flags), actionHandler(NULL) @@ -120,7 +120,7 @@ void CommandWidget::escape() } }*/ -void CommandWidget::setActionHandler(QG_ActionHandler * ah) +void CommandWidget::setActionHandler(ActionHandler * ah) { actionHandler = ah; } diff --git a/src/forms/commandwidget.h b/src/forms/commandwidget.h index 76c7cc6..defeb71 100644 --- a/src/forms/commandwidget.h +++ b/src/forms/commandwidget.h @@ -3,7 +3,7 @@ #include "ui_commandwidget.h" -class QG_ActionHandler; +class ActionHandler; class CommandWidget: public QWidget { @@ -22,12 +22,12 @@ class CommandWidget: public QWidget void trigger(); void tabPressed(); void escape(); - void setActionHandler(QG_ActionHandler * ah); + void setActionHandler(ActionHandler * ah); void setCommandMode(); void setNormalMode(); private: - QG_ActionHandler * actionHandler; + ActionHandler * actionHandler; private: Ui::CommandWidget ui; diff --git a/src/forms/commandwidget.ui b/src/forms/commandwidget.ui index c91bf12..801cd85 100644 --- a/src/forms/commandwidget.ui +++ b/src/forms/commandwidget.ui @@ -52,7 +52,7 @@ - + 0 @@ -68,9 +68,9 @@ - QG_CommandEdit + CommandEdit QWidget -
qg_commandedit.h
+
commandedit.h
 diff --git a/src/forms/dimlinearoptions.cpp b/src/forms/dimlinearoptions.cpp index e4a30bb..08f30f5 100644 --- a/src/forms/dimlinearoptions.cpp +++ b/src/forms/dimlinearoptions.cpp @@ -18,6 +18,7 @@ #include "actiondimlinear.h" #include "actioninterface.h" +#include "rs_debug.h" #include "settings.h" DimLinearOptions::DimLinearOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/dimoptions.cpp b/src/forms/dimoptions.cpp index b479299..0e8c51d 100644 --- a/src/forms/dimoptions.cpp +++ b/src/forms/dimoptions.cpp @@ -18,6 +18,7 @@ #include "actiondimension.h" #include "actioninterface.h" +#include "rs_debug.h" #include "settings.h" DimOptions::DimOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/dlgarc.ui b/src/forms/dlgarc.ui index f3d0928..7c8f788 100644 --- a/src/forms/dlgarc.ui +++ b/src/forms/dlgarc.ui @@ -49,7 +49,7 @@ - + @@ -263,9 +263,9 @@ - QG_LayerBox + LayerBox QWidget -
qg_layerbox.h
+
layerbox.h
 WidgetPen diff --git a/src/forms/dlgattributes.ui b/src/forms/dlgattributes.ui index f93b4db..b63eabf 100644 --- a/src/forms/dlgattributes.ui +++ b/src/forms/dlgattributes.ui @@ -49,7 +49,7 @@ - + @@ -120,9 +120,9 @@
widgetpen.h
 - QG_LayerBox + LayerBox QWidget -
qg_layerbox.h
+
layerbox.h
 diff --git a/src/forms/dlgcircle.ui b/src/forms/dlgcircle.ui index 7e4d626..346775a 100644 --- a/src/forms/dlgcircle.ui +++ b/src/forms/dlgcircle.ui @@ -49,7 +49,7 @@ - + @@ -216,9 +216,9 @@ - QG_LayerBox + LayerBox QWidget -
qg_layerbox.h
+
layerbox.h
 WidgetPen diff --git a/src/forms/dlgdimension.ui b/src/forms/dlgdimension.ui index 37336e9..b6d1992 100644 --- a/src/forms/dlgdimension.ui +++ b/src/forms/dlgdimension.ui @@ -52,7 +52,7 @@ - + @@ -127,9 +127,9 @@ - QG_LayerBox + LayerBox QWidget -
qg_layerbox.h
+
layerbox.h
 WidgetPen diff --git a/src/forms/dlgdimlinear.ui b/src/forms/dlgdimlinear.ui index 1aeed2c..f5c8299 100644 --- a/src/forms/dlgdimlinear.ui +++ b/src/forms/dlgdimlinear.ui @@ -52,7 +52,7 @@ - + @@ -187,9 +187,9 @@ - QG_LayerBox + LayerBox QWidget -
qg_layerbox.h
+
layerbox.h
 WidgetPen diff --git a/src/forms/dlgellipse.ui b/src/forms/dlgellipse.ui index 6f8df07..8958162 100644 --- a/src/forms/dlgellipse.ui +++ b/src/forms/dlgellipse.ui @@ -49,7 +49,7 @@ - + @@ -303,9 +303,9 @@ - QG_LayerBox + LayerBox QWidget -
qg_layerbox.h
+
layerbox.h
 WidgetPen diff --git a/src/forms/dlghatch.ui b/src/forms/dlghatch.ui index 556c86d..89145e3 100644 --- a/src/forms/dlghatch.ui +++ b/src/forms/dlghatch.ui @@ -49,7 +49,7 @@ - + @@ -142,9 +142,9 @@ - QG_PatternBox + PatternBox QWidget -
qg_patternbox.h
+
patternbox.h
 QG_GraphicView diff --git a/src/forms/dlginsert.ui b/src/forms/dlginsert.ui index 60ef49f..51537e1 100644 --- a/src/forms/dlginsert.ui +++ b/src/forms/dlginsert.ui @@ -49,7 +49,7 @@ - + @@ -313,9 +313,9 @@ - QG_LayerBox + LayerBox QWidget -
qg_layerbox.h
+
layerbox.h
 WidgetPen diff --git a/src/forms/dlgline.ui b/src/forms/dlgline.ui index b5140d0..17c959c 100644 --- a/src/forms/dlgline.ui +++ b/src/forms/dlgline.ui @@ -49,7 +49,7 @@ - + @@ -233,9 +233,9 @@ - QG_LayerBox + LayerBox QWidget -
qg_layerbox.h
+
layerbox.h
 WidgetPen diff --git a/src/forms/dlgpoint.ui b/src/forms/dlgpoint.ui index 1a670d7..a9f8c9f 100644 --- a/src/forms/dlgpoint.ui +++ b/src/forms/dlgpoint.ui @@ -49,7 +49,7 @@ - + @@ -193,9 +193,9 @@ - QG_LayerBox + LayerBox QWidget -
qg_layerbox.h
+
layerbox.h
 WidgetPen diff --git a/src/forms/dlgspline.ui b/src/forms/dlgspline.ui index 84a025b..1736648 100644 --- a/src/forms/dlgspline.ui +++ b/src/forms/dlgspline.ui @@ -49,7 +49,7 @@ - + @@ -209,9 +209,9 @@
widgetpen.h
 - QG_LayerBox + LayerBox QWidget -
qg_layerbox.h
+
layerbox.h
 diff --git a/src/forms/dlgtext.ui b/src/forms/dlgtext.ui index 6a49fe7..af6ffe9 100644 --- a/src/forms/dlgtext.ui +++ b/src/forms/dlgtext.ui @@ -76,7 +76,7 @@ - + 0 @@ -1391,9 +1391,9 @@ - QG_FontBox + FontBox QWidget -
qg_fontbox.h
+
fontbox.h
 diff --git a/src/forms/imageoptions.cpp b/src/forms/imageoptions.cpp index a47e841..a0b6a96 100644 --- a/src/forms/imageoptions.cpp +++ b/src/forms/imageoptions.cpp @@ -17,9 +17,10 @@ #include "imageoptions.h" #include "rs.h" -#include "settings.h" #include "actiondrawimage.h" #include "actioninterface.h" +#include "rs_debug.h" +#include "settings.h" ImageOptions::ImageOptions(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): QWidget(parent, flags) diff --git a/src/forms/librarywidget.cpp b/src/forms/librarywidget.cpp index a776438..75b0527 100644 --- a/src/forms/librarywidget.cpp +++ b/src/forms/librarywidget.cpp @@ -36,7 +36,7 @@ LibraryWidget::~LibraryWidget() { } -void LibraryWidget::setActionHandler(QG_ActionHandler * ah) +void LibraryWidget::setActionHandler(ActionHandler * ah) { actionHandler = ah; } @@ -100,7 +100,7 @@ void LibraryWidget::insert() * Appends the given directory to the given list view item. Called recursively until all * library directories are appended. */ -void LibraryWidget::appendTree(QG_ListViewItem * item, QString directory) +void LibraryWidget::appendTree(ListViewItem * item, QString directory) { #if 0 QStringList::Iterator it; @@ -111,8 +111,8 @@ void LibraryWidget::appendTree(QG_ListViewItem * item, QString directory) { QStringList lDirectoryList = dir.entryList(QDir::Dirs, QDir::Name); - QG_ListViewItem* newItem; - QG_ListViewItem* searchItem; + ListViewItem* newItem; + ListViewItem* searchItem; for(it=lDirectoryList.begin(); it!=lDirectoryList.end(); ++it) { @@ -123,9 +123,9 @@ void LibraryWidget::appendTree(QG_ListViewItem * item, QString directory) // Look for an item already existing and take this // instead of making a new one: if (item != NULL) - searchItem = (QG_ListViewItem *)item->firstChild(); + searchItem = (ListViewItem *)item->firstChild(); else - searchItem = (QG_ListViewItem *)lvDirectory->firstChild(); + searchItem = (ListViewItem *)lvDirectory->firstChild(); while (searchItem != NULL) { @@ -135,16 +135,16 @@ void LibraryWidget::appendTree(QG_ListViewItem * item, QString directory) break; } - searchItem = (QG_ListViewItem *)searchItem->nextSibling(); + searchItem = (ListViewItem *)searchItem->nextSibling(); } // Create new item if no existing was found: if (newItem == NULL) { if (item) - newItem = new QG_ListViewItem(item, (*it)); + newItem = new ListViewItem(item, (*it)); else - newItem = new QG_ListViewItem(lvDirectory, (*it)); + newItem = new ListViewItem(lvDirectory, (*it)); } appendTree(newItem, directory + "/" + (*it)); diff --git a/src/forms/librarywidget.h b/src/forms/librarywidget.h index 4677ba8..6cf96ef 100644 --- a/src/forms/librarywidget.h +++ b/src/forms/librarywidget.h @@ -4,8 +4,8 @@ #include "ui_librarywidget.h" class QListWidgetItem; -class QG_ActionHandler; -class QG_ListViewItem; +class ActionHandler; +class ListViewItem; class LibraryWidget: public QWidget { @@ -23,10 +23,10 @@ class LibraryWidget: public QWidget QString getPathToPixmap(const QString & dir, const QString & dxfFile, const QString & dxfPath); public slots: - void setActionHandler(QG_ActionHandler * ah); + void setActionHandler(ActionHandler * ah); void keyPressEvent(QKeyEvent * e); void insert(); - void appendTree(QG_ListViewItem * item, QString directory); + void appendTree(ListViewItem * item, QString directory); // void updatePreview(Q3ListViewItem * item); void updatePreview(QListWidgetItem * item); @@ -34,7 +34,7 @@ class LibraryWidget: public QWidget void escape(); private: - QG_ActionHandler * actionHandler; + ActionHandler * actionHandler; private: Ui::LibraryWidget ui; diff --git a/src/forms/lineangleoptions.cpp b/src/forms/lineangleoptions.cpp index e2e75b1..dca00ae 100644 --- a/src/forms/lineangleoptions.cpp +++ b/src/forms/lineangleoptions.cpp @@ -17,6 +17,7 @@ #include "lineangleoptions.h" #include "actiondrawlineangle.h" +#include "rs_debug.h" #include "settings.h" LineAngleOptions::LineAngleOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/linebisectoroptions.cpp b/src/forms/linebisectoroptions.cpp index 520b5bb..7a83da7 100644 --- a/src/forms/linebisectoroptions.cpp +++ b/src/forms/linebisectoroptions.cpp @@ -17,6 +17,7 @@ #include "linebisectoroptions.h" #include "actiondrawlinebisector.h" +#include "rs_debug.h" #include "settings.h" LineBisectorOptions::LineBisectorOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/lineoptions.cpp b/src/forms/lineoptions.cpp index 4011668..937bec4 100644 --- a/src/forms/lineoptions.cpp +++ b/src/forms/lineoptions.cpp @@ -19,6 +19,7 @@ #include "rs.h" #include "actiondrawline.h" #include "actioninterface.h" +#include "rs_debug.h" LineOptions::LineOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): QWidget(parent, flags), action(NULL), diff --git a/src/forms/lineparalleloptions.cpp b/src/forms/lineparalleloptions.cpp index c09af48..573c627 100644 --- a/src/forms/lineparalleloptions.cpp +++ b/src/forms/lineparalleloptions.cpp @@ -17,6 +17,7 @@ #include "lineparalleloptions.h" #include "actiondrawlineparallel.h" +#include "rs_debug.h" #include "settings.h" LineParallelOptions::LineParallelOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/lineparallelthroughoptions.cpp b/src/forms/lineparallelthroughoptions.cpp index a34da18..aed9775 100644 --- a/src/forms/lineparallelthroughoptions.cpp +++ b/src/forms/lineparallelthroughoptions.cpp @@ -17,6 +17,7 @@ #include "lineparallelthroughoptions.h" #include "actiondrawlineparallelthrough.h" +#include "rs_debug.h" #include "settings.h" LineParallelThroughOptions::LineParallelThroughOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/linerelangleoptions.cpp b/src/forms/linerelangleoptions.cpp index 0861cda..2c49d76 100644 --- a/src/forms/linerelangleoptions.cpp +++ b/src/forms/linerelangleoptions.cpp @@ -17,6 +17,7 @@ #include "linerelangleoptions.h" #include "actiondrawlinerelangle.h" +#include "rs_debug.h" #include "settings.h" LineRelAngleOptions::LineRelAngleOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/moverotateoptions.cpp b/src/forms/moverotateoptions.cpp index 1018f6a..56d5aa0 100644 --- a/src/forms/moverotateoptions.cpp +++ b/src/forms/moverotateoptions.cpp @@ -17,6 +17,7 @@ #include "moverotateoptions.h" #include "actionmodifymoverotate.h" +#include "rs_debug.h" #include "settings.h" MoveRotateOptions::MoveRotateOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/roundoptions.cpp b/src/forms/roundoptions.cpp index 115a69b..9fce0ee 100644 --- a/src/forms/roundoptions.cpp +++ b/src/forms/roundoptions.cpp @@ -17,6 +17,7 @@ #include "roundoptions.h" #include "actionmodifyround.h" +#include "rs_debug.h" #include "settings.h" RoundOptions::RoundOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/splineoptions.cpp b/src/forms/splineoptions.cpp index 2de99f6..b0a1de2 100644 --- a/src/forms/splineoptions.cpp +++ b/src/forms/splineoptions.cpp @@ -18,6 +18,7 @@ #include "actiondrawspline.h" #include "actioninterface.h" +#include "rs_debug.h" #include "settings.h" SplineOptions::SplineOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): diff --git a/src/forms/textoptions.cpp b/src/forms/textoptions.cpp index bbb293a..00dbeac 100644 --- a/src/forms/textoptions.cpp +++ b/src/forms/textoptions.cpp @@ -18,6 +18,7 @@ #include "actiondrawtext.h" #include "actioninterface.h" +#include "rs_debug.h" TextOptions::TextOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): QWidget(parent, flags) diff --git a/src/forms/widgetpen.ui b/src/forms/widgetpen.ui index 568138d..71da83b 100644 --- a/src/forms/widgetpen.ui +++ b/src/forms/widgetpen.ui @@ -52,7 +52,7 @@ - + 0 @@ -78,7 +78,7 @@ - + 0 @@ -104,7 +104,7 @@ - + 0 @@ -120,25 +120,25 @@ - QG_ColorBox + ColorBox QWidget -
qg_colorbox.h
+
colorbox.h
 - QG_WidthBox + WidthBox QWidget -
qg_widthbox.h
+
widthbox.h
 - QG_LineTypeBox + LineTypeBox QWidget -
qg_linetypebox.h
+
linetypebox.h
 - qg_linetypebox.h - qg_colorbox.h - qg_widthbox.h + linetypebox.h + colorbox.h + widthbox.h diff --git a/src/mainapp/applicationwindow.cpp b/src/mainapp/applicationwindow.cpp index 42c90cc..22580a0 100644 --- a/src/mainapp/applicationwindow.cpp +++ b/src/mainapp/applicationwindow.cpp @@ -47,9 +47,9 @@ #include "rs_simulationcontrols.h" #endif -#include "qg_colorbox.h" -#include "qg_filedialog.h" -#include "qg_pentoolbar.h" +#include "colorbox.h" +#include "filedialog.h" +#include "pentoolbar.h" #include "recentfiles.h" #include "cadtoolbar.h" #include "cadtoolbarmain.h" @@ -95,7 +95,7 @@ ApplicationWindow::ApplicationWindow(): CreateQtActions(this); RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating action handler"); - actionHandler = new QG_ActionHandler(this); + actionHandler = new ActionHandler(this); RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating action handler: OK"); #ifdef RS_SCRIPTING @@ -1285,7 +1285,7 @@ void ApplicationWindow::initToolBar() // zoomToolBar = new Q3ToolBar(this, "Zoom Operations"); zoomToolBar = addToolBar(tr("Zoom Operations")); zoomToolBar->setObjectName("zoom"); - penToolBar = new QG_PenToolBar(this, "Pen Selection"); + penToolBar = new PenToolBar(this, "Pen Selection"); penToolBar->setObjectName("pen"); connect(penToolBar, SIGNAL(penChanged(RS_Pen)), this, SLOT(slotPenChanged(RS_Pen))); @@ -1450,7 +1450,7 @@ void ApplicationWindow::initView() // dw = new QDockWidget(QDockWidget::InDock, this, "Layer"); dw = new QDockWidget(tr("Layer List"), this); dw->setObjectName("layer"); - layerWidget = new QG_LayerWidget(actionHandler, dw, "Layer"); + layerWidget = new LayerWidget(actionHandler, dw, "Layer"); layerWidget->setFocusPolicy(Qt::NoFocus); connect(layerWidget, SIGNAL(escape()), this, SLOT(slotFocus())); connect(this, SIGNAL(windowsChanged(bool)), layerWidget, SLOT(setEnabled(bool))); @@ -1467,7 +1467,7 @@ void ApplicationWindow::initView() // dw = new QDockWidget(QDockWidget::InDock, this, "Block"); dw = new QDockWidget(tr("Block List"), this); dw->setObjectName("block"); - blockWidget = new QG_BlockWidget(actionHandler, dw, "Block"); + blockWidget = new BlockWidget(actionHandler, dw, "Block"); blockWidget->setFocusPolicy(Qt::NoFocus); connect(blockWidget, SIGNAL(escape()), this, SLOT(slotFocus())); connect(this, SIGNAL(windowsChanged(bool)), blockWidget, SLOT(setEnabled(bool))); @@ -1973,7 +1973,7 @@ void ApplicationWindow::slotFileOpen() RS_DEBUG->print("ApplicationWindow::slotFileOpen() 001"); RS2::FormatType type = RS2::FormatUnknown; RS_DEBUG->print("ApplicationWindow::slotFileOpen() 002"); - QString fileName = QG_FileDialog::getOpenFileName(this, &type); + QString fileName = FileDialog::getOpenFileName(this, &type); RS_DEBUG->print("ApplicationWindow::slotFileOpen() 003"); slotFileOpen(fileName, type); RS_DEBUG->print("ApplicationWindow::slotFileOpen(): OK"); @@ -4177,7 +4177,7 @@ MDIWindow * ApplicationWindow::getMDIWindow() /** * @return Pointer to action handler. Implementation from QG_MainWindowInterface. */ -/*virtual*/ QG_ActionHandler * ApplicationWindow::getActionHandler() +/*virtual*/ ActionHandler * ApplicationWindow::getActionHandler() { return actionHandler; } diff --git a/src/mainapp/applicationwindow.h b/src/mainapp/applicationwindow.h index a8834af..588de6d 100644 --- a/src/mainapp/applicationwindow.h +++ b/src/mainapp/applicationwindow.h @@ -6,11 +6,11 @@ #include "rs_document.h" #include "qc_dialogfactory.h" #include "mdiwindow.h" -#include "qg_actionhandler.h" -#include "qg_blockwidget.h" -#include "qg_layerwidget.h" +#include "actionhandler.h" +#include "blockwidget.h" +#include "layerwidget.h" #include "qg_mainwindowinterface.h" -#include "qg_pentoolbar.h" +#include "pentoolbar.h" #include "cadtoolbar.h" #include "commandwidget.h" #include "librarywidget.h" @@ -180,7 +180,7 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface virtual RS_Document * getDocument(); virtual void createNewDocument(const QString & fileName = QString::null, RS_Document * doc = NULL); virtual QMainWindow * GetMainWindow(); - virtual QG_ActionHandler * getActionHandler(); + virtual ActionHandler * getActionHandler(); virtual void showSimulationControls(); //virtual QToolBar* createToolBar(const QString& name); @@ -216,9 +216,9 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface QC_DialogFactory * dialogFactory; /** Layer list widget */ - QG_LayerWidget * layerWidget; + LayerWidget * layerWidget; /** Block list widget */ - QG_BlockWidget * blockWidget; + BlockWidget * blockWidget; /** Library browser widget */ LibraryWidget * libraryWidget; #ifdef RS_CAM @@ -255,7 +255,7 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface RecentFiles * recentFiles; /** Action handler. */ - QG_ActionHandler * actionHandler; + ActionHandler * actionHandler; #ifdef RS_SCRIPTING /** Scripting interface. */ @@ -274,7 +274,7 @@ class ApplicationWindow: public QMainWindow, public QG_MainWindowInterface QToolBar * zoomToolBar; // Toolbar for selecting the current pen - QG_PenToolBar * penToolBar; + PenToolBar * penToolBar; // Toolbar for CAD tools CadToolBar * cadToolBar; diff --git a/src/mainapp/mdiwindow.cpp b/src/mainapp/mdiwindow.cpp index 02b1d43..1e7dc79 100644 --- a/src/mainapp/mdiwindow.cpp +++ b/src/mainapp/mdiwindow.cpp @@ -19,7 +19,7 @@ #include "drawing.h" #include "rs_eventhandler.h" #include "exitdialog.h" -#include "qg_filedialog.h" +#include "filedialog.h" #include "qg_graphicview.h" // Class variable @@ -348,7 +348,7 @@ bool MDIWindow::slotFileSaveAs(bool & cancelled) cancelled = false; RS2::FormatType t = RS2::FormatDXF; - QString fn = QG_FileDialog::getSaveFileName(this, &t); + QString fn = FileDialog::getSaveFileName(this, &t); if (document != NULL && !fn.isEmpty()) { diff --git a/src/mainapp/mdiwindow.h b/src/mainapp/mdiwindow.h index d6ca611..6b66aef 100644 --- a/src/mainapp/mdiwindow.h +++ b/src/mainapp/mdiwindow.h @@ -2,9 +2,9 @@ #define QC_MDIWINDOW_H #include -#include "qg_layerwidget.h" -#include "qg_pentoolbar.h" #include "rs_document.h" +#include "layerwidget.h" +#include "pentoolbar.h" class RS_EventHandler; class QG_GraphicView; diff --git a/src/mainapp/qc_dialogfactory.cpp b/src/mainapp/qc_dialogfactory.cpp index f34ad8b..2f81da9 100644 --- a/src/mainapp/qc_dialogfactory.cpp +++ b/src/mainapp/qc_dialogfactory.cpp @@ -17,6 +17,7 @@ #include "qc_dialogfactory.h" #include "applicationwindow.h" +#include "rs_blocklist.h" #include "qg_graphicview.h" QC_DialogFactory::QC_DialogFactory(QWidget * parent, QToolBar * ow): QG_DialogFactory(parent, ow) diff --git a/src/widgets/actionhandler.cpp b/src/widgets/actionhandler.cpp index e65a520..90731bb 100644 --- a/src/widgets/actionhandler.cpp +++ b/src/widgets/actionhandler.cpp @@ -139,9 +139,9 @@ /** * Constructor */ -QG_ActionHandler::QG_ActionHandler(QG_MainWindowInterface * mw) +ActionHandler::ActionHandler(QG_MainWindowInterface * mw) { - RS_DEBUG->print("QG_ActionHandler::QG_ActionHandler"); + RS_DEBUG->print("ActionHandler::ActionHandler"); mainWindow = mw; snapFree = NULL; @@ -158,23 +158,23 @@ QG_ActionHandler::QG_ActionHandler(QG_MainWindowInterface * mw) restrictVertical = NULL; lockRelativeZero = NULL; - RS_DEBUG->print("QG_ActionHandler::QG_ActionHandler: OK"); + RS_DEBUG->print("ActionHandler::ActionHandler: OK"); } /** * Destructor */ -QG_ActionHandler::~QG_ActionHandler() +ActionHandler::~ActionHandler() { - RS_DEBUG->print("QG_ActionHandler::~QG_ActionHandler"); - RS_DEBUG->print("QG_ActionHandler::~QG_ActionHandler: OK"); + RS_DEBUG->print("ActionHandler::~ActionHandler"); + RS_DEBUG->print("ActionHandler::~ActionHandler: OK"); } /** * Kills all running selection actions. Called when a selection action * is launched to reduce confusion. */ -void QG_ActionHandler::killSelectActions() +void ActionHandler::killSelectActions() { GraphicView * gv = mainWindow->getGraphicView(); @@ -185,7 +185,7 @@ void QG_ActionHandler::killSelectActions() /** * @return Current action or NULL. */ -ActionInterface * QG_ActionHandler::getCurrentAction() +ActionInterface * ActionHandler::getCurrentAction() { GraphicView * gv = mainWindow->getGraphicView(); @@ -197,7 +197,7 @@ ActionInterface * QG_ActionHandler::getCurrentAction() #if 0 Instead of the following giant switch statement, you could something like the following: -ActionInterface * QG_ActionHandler::setCurrentAction(ActionInterface * action) +ActionInterface * ActionHandler::setCurrentAction(ActionInterface * action) { GraphicView * gv = mainWindow->getGraphicView(); RS_Document * doc = mainWindow->getDocument(); @@ -231,9 +231,9 @@ Well... The problem is the action, they're all different... * * @return Pointer to the created action or NULL. */ -ActionInterface * QG_ActionHandler::setCurrentAction(RS2::ActionType id) +ActionInterface * ActionHandler::setCurrentAction(RS2::ActionType id) { - RS_DEBUG->print("QG_ActionHandler::setCurrentAction()"); + RS_DEBUG->print("ActionHandler::setCurrentAction()"); GraphicView * gv = mainWindow->getGraphicView(); RS_Document * doc = mainWindow->getDocument(); @@ -243,7 +243,7 @@ ActionInterface * QG_ActionHandler::setCurrentAction(RS2::ActionType id) if (gv == NULL || doc == NULL) { RS_DEBUG->print(RS_Debug::D_WARNING, - "QG_ActionHandler::setCurrentAction: graphic view or document is NULL"); + "ActionHandler::setCurrentAction: graphic view or document is NULL"); return NULL; } @@ -776,14 +776,14 @@ ActionInterface * QG_ActionHandler::setCurrentAction(RS2::ActionType id) default: RS_DEBUG->print(RS_Debug::D_WARNING, - "QG_ActionHandler::setCurrentAction(): No such action found."); + "ActionHandler::setCurrentAction(): No such action found."); break; } if (a) gv->setCurrentAction(a); - RS_DEBUG->print("QG_ActionHandler::setCurrentAction(): OK"); + RS_DEBUG->print("ActionHandler::setCurrentAction(): OK"); return a; } @@ -791,7 +791,7 @@ ActionInterface * QG_ActionHandler::setCurrentAction(RS2::ActionType id) /** * @return Available commands of the application or the current action. */ -QStringList QG_ActionHandler::getAvailableCommands() +QStringList ActionHandler::getAvailableCommands() { ActionInterface * currentAction = getCurrentAction(); @@ -813,7 +813,7 @@ QStringList QG_ActionHandler::getAvailableCommands() * false: the command is not known and was probably intended for a * running action. */ -bool QG_ActionHandler::keycode(const QString & code) +bool ActionHandler::keycode(const QString & code) { QString c = code.toLower(); @@ -894,9 +894,9 @@ bool QG_ActionHandler::keycode(const QString & code) * false: the command is not known and was probably intended for a * running action. */ -bool QG_ActionHandler::command(const QString & cmd) +bool ActionHandler::command(const QString & cmd) { - RS_DEBUG->print("QG_ActionHandler::command: %s", cmd.toLatin1().data()); + RS_DEBUG->print("ActionHandler::command: %s", cmd.toLatin1().data()); QString c = cmd.toLower(); if (c == "\n") @@ -906,7 +906,7 @@ bool QG_ActionHandler::command(const QString & cmd) if (gv) gv->back(); - RS_DEBUG->print("QG_ActionHandler::command: back"); + RS_DEBUG->print("ActionHandler::command: back"); return true; } @@ -917,7 +917,7 @@ bool QG_ActionHandler::command(const QString & cmd) if (gv) { - RS_DEBUG->print("QG_ActionHandler::command: trigger command event in graphic view"); + RS_DEBUG->print("ActionHandler::command: trigger command event in graphic view"); gv->commandEvent(&e); } @@ -925,498 +925,498 @@ bool QG_ActionHandler::command(const QString & cmd) // it might be intended to launch a new command if (!e.isAccepted()) { - RS_DEBUG->print("QG_ActionHandler::command: convert cmd to action type"); + RS_DEBUG->print("ActionHandler::command: convert cmd to action type"); // command for new action: RS2::ActionType type = RS_COMMANDS->cmdToAction(cmd); if (type != RS2::ActionNone) { - RS_DEBUG->print("QG_ActionHandler::command: setting current action"); + RS_DEBUG->print("ActionHandler::command: setting current action"); setCurrentAction(type); - RS_DEBUG->print("QG_ActionHandler::command: current action set"); + RS_DEBUG->print("ActionHandler::command: current action set"); return true; } } - RS_DEBUG->print("QG_ActionHandler::command: current action not set"); + RS_DEBUG->print("ActionHandler::command: current action not set"); return false; } -//void QG_ActionHandler::slotFileNew() { +//void ActionHandler::slotFileNew() { // setCurrentAction(RS2::ActionFileNew); //} -void QG_ActionHandler::slotFileOpen() +void ActionHandler::slotFileOpen() { setCurrentAction(RS2::ActionFileOpen); } /* -void QG_ActionHandler::slotFileSave() { +void ActionHandler::slotFileSave() { setCurrentAction(RS2::ActionFileSave); } */ -void QG_ActionHandler::slotFileSaveAs() +void ActionHandler::slotFileSaveAs() { setCurrentAction(RS2::ActionFileSaveAs); } /* -void QG_ActionHandler::slotFileClose() +void ActionHandler::slotFileClose() { setCurrentAction(RS2::ActionFileClose); } -void QG_ActionHandler::slotFilePrint() +void ActionHandler::slotFilePrint() { setCurrentAction(RS2::ActionFilePrint); } */ -void QG_ActionHandler::slotZoomIn() +void ActionHandler::slotZoomIn() { setCurrentAction(RS2::ActionZoomIn); } -void QG_ActionHandler::slotZoomOut() +void ActionHandler::slotZoomOut() { setCurrentAction(RS2::ActionZoomOut); } -void QG_ActionHandler::slotZoomAuto() +void ActionHandler::slotZoomAuto() { setCurrentAction(RS2::ActionZoomAuto); } -void QG_ActionHandler::slotZoomWindow() +void ActionHandler::slotZoomWindow() { setCurrentAction(RS2::ActionZoomWindow); } -void QG_ActionHandler::slotZoomPan() +void ActionHandler::slotZoomPan() { setCurrentAction(RS2::ActionZoomPan); } -void QG_ActionHandler::slotZoomPrevious() +void ActionHandler::slotZoomPrevious() { setCurrentAction(RS2::ActionZoomPrevious); } -void QG_ActionHandler::slotZoomRedraw() +void ActionHandler::slotZoomRedraw() { setCurrentAction(RS2::ActionZoomRedraw); } -void QG_ActionHandler::slotToolRegenerateDimensions() +void ActionHandler::slotToolRegenerateDimensions() { setCurrentAction(RS2::ActionToolRegenerateDimensions); } -void QG_ActionHandler::slotEditUndo() +void ActionHandler::slotEditUndo() { setCurrentAction(RS2::ActionEditUndo); } -void QG_ActionHandler::slotEditRedo() +void ActionHandler::slotEditRedo() { setCurrentAction(RS2::ActionEditRedo); } -void QG_ActionHandler::slotEditCut() +void ActionHandler::slotEditCut() { setCurrentAction(RS2::ActionEditCut); } -void QG_ActionHandler::slotEditCopy() +void ActionHandler::slotEditCopy() { setCurrentAction(RS2::ActionEditCopy); } -void QG_ActionHandler::slotEditPaste() +void ActionHandler::slotEditPaste() { setCurrentAction(RS2::ActionEditPaste); } -void QG_ActionHandler::slotSelectSingle() +void ActionHandler::slotSelectSingle() { setCurrentAction(RS2::ActionSelectSingle); } -void QG_ActionHandler::slotSelectContour() +void ActionHandler::slotSelectContour() { setCurrentAction(RS2::ActionSelectContour); } -void QG_ActionHandler::slotSelectWindow() +void ActionHandler::slotSelectWindow() { setCurrentAction(RS2::ActionSelectWindow); } -void QG_ActionHandler::slotDeselectWindow() +void ActionHandler::slotDeselectWindow() { setCurrentAction(RS2::ActionDeselectWindow); } -void QG_ActionHandler::slotSelectAll() +void ActionHandler::slotSelectAll() { setCurrentAction(RS2::ActionSelectAll); } -void QG_ActionHandler::slotDeselectAll() +void ActionHandler::slotDeselectAll() { setCurrentAction(RS2::ActionDeselectAll); } -void QG_ActionHandler::slotSelectInvert() +void ActionHandler::slotSelectInvert() { setCurrentAction(RS2::ActionSelectInvert); } -void QG_ActionHandler::slotSelectIntersected() +void ActionHandler::slotSelectIntersected() { setCurrentAction(RS2::ActionSelectIntersected); } -void QG_ActionHandler::slotDeselectIntersected() +void ActionHandler::slotDeselectIntersected() { setCurrentAction(RS2::ActionDeselectIntersected); } -void QG_ActionHandler::slotSelectLayer() +void ActionHandler::slotSelectLayer() { setCurrentAction(RS2::ActionSelectLayer); } -void QG_ActionHandler::slotDrawPoint() +void ActionHandler::slotDrawPoint() { setCurrentAction(RS2::ActionDrawPoint); } -void QG_ActionHandler::slotDrawLine() +void ActionHandler::slotDrawLine() { setCurrentAction(RS2::ActionDrawLine); } -void QG_ActionHandler::slotDrawLineAngle() +void ActionHandler::slotDrawLineAngle() { setCurrentAction(RS2::ActionDrawLineAngle); } -void QG_ActionHandler::slotDrawLineHorizontal() +void ActionHandler::slotDrawLineHorizontal() { setCurrentAction(RS2::ActionDrawLineHorizontal); } -void QG_ActionHandler::slotDrawLineHorVert() +void ActionHandler::slotDrawLineHorVert() { setCurrentAction(RS2::ActionDrawLineHorVert); } -void QG_ActionHandler::slotDrawLineVertical() +void ActionHandler::slotDrawLineVertical() { setCurrentAction(RS2::ActionDrawLineVertical); } -void QG_ActionHandler::slotDrawLineFree() +void ActionHandler::slotDrawLineFree() { setCurrentAction(RS2::ActionDrawLineFree); } -void QG_ActionHandler::slotDrawLineParallel() +void ActionHandler::slotDrawLineParallel() { setCurrentAction(RS2::ActionDrawLineParallel); } -void QG_ActionHandler::slotDrawLineParallelThrough() +void ActionHandler::slotDrawLineParallelThrough() { setCurrentAction(RS2::ActionDrawLineParallelThrough); } -void QG_ActionHandler::slotDrawLineRectangle() +void ActionHandler::slotDrawLineRectangle() { setCurrentAction(RS2::ActionDrawLineRectangle); } -void QG_ActionHandler::slotDrawLineBisector() +void ActionHandler::slotDrawLineBisector() { setCurrentAction(RS2::ActionDrawLineBisector); } -void QG_ActionHandler::slotDrawLineTangent1() +void ActionHandler::slotDrawLineTangent1() { setCurrentAction(RS2::ActionDrawLineTangent1); } -void QG_ActionHandler::slotDrawLineTangent2() +void ActionHandler::slotDrawLineTangent2() { setCurrentAction(RS2::ActionDrawLineTangent2); } -void QG_ActionHandler::slotDrawLineOrthogonal() +void ActionHandler::slotDrawLineOrthogonal() { setCurrentAction(RS2::ActionDrawLineOrthogonal); } -void QG_ActionHandler::slotDrawLineRelAngle() +void ActionHandler::slotDrawLineRelAngle() { setCurrentAction(RS2::ActionDrawLineRelAngle); } -void QG_ActionHandler::slotDrawPolyline() +void ActionHandler::slotDrawPolyline() { setCurrentAction(RS2::ActionDrawPolyline); } -void QG_ActionHandler::slotPolylineAdd() +void ActionHandler::slotPolylineAdd() { setCurrentAction(RS2::ActionPolylineAdd); } -void QG_ActionHandler::slotPolylineAppend() +void ActionHandler::slotPolylineAppend() { setCurrentAction(RS2::ActionPolylineAppend); } -void QG_ActionHandler::slotPolylineDel() +void ActionHandler::slotPolylineDel() { setCurrentAction(RS2::ActionPolylineDel); } -void QG_ActionHandler::slotPolylineDelBetween() +void ActionHandler::slotPolylineDelBetween() { setCurrentAction(RS2::ActionPolylineDelBetween); } -void QG_ActionHandler::slotPolylineTrim() +void ActionHandler::slotPolylineTrim() { setCurrentAction(RS2::ActionPolylineTrim); } -void QG_ActionHandler::slotDrawLinePolygon() +void ActionHandler::slotDrawLinePolygon() { setCurrentAction(RS2::ActionDrawLinePolygon); } -void QG_ActionHandler::slotDrawLinePolygon2() +void ActionHandler::slotDrawLinePolygon2() { setCurrentAction(RS2::ActionDrawLinePolygon2); } -void QG_ActionHandler::slotDrawCircle() +void ActionHandler::slotDrawCircle() { setCurrentAction(RS2::ActionDrawCircle); } -void QG_ActionHandler::slotDrawCircleCR() +void ActionHandler::slotDrawCircleCR() { setCurrentAction(RS2::ActionDrawCircleCR); } -void QG_ActionHandler::slotDrawCircle2P() +void ActionHandler::slotDrawCircle2P() { setCurrentAction(RS2::ActionDrawCircle2P); } -void QG_ActionHandler::slotDrawCircle3P() +void ActionHandler::slotDrawCircle3P() { setCurrentAction(RS2::ActionDrawCircle3P); } -void QG_ActionHandler::slotDrawCircleParallel() +void ActionHandler::slotDrawCircleParallel() { setCurrentAction(RS2::ActionDrawCircleParallel); } -void QG_ActionHandler::slotDrawArc() +void ActionHandler::slotDrawArc() { setCurrentAction(RS2::ActionDrawArc); } -void QG_ActionHandler::slotDrawArc3P() +void ActionHandler::slotDrawArc3P() { setCurrentAction(RS2::ActionDrawArc3P); } -void QG_ActionHandler::slotDrawArcParallel() +void ActionHandler::slotDrawArcParallel() { setCurrentAction(RS2::ActionDrawArcParallel); } -void QG_ActionHandler::slotDrawArcTangential() +void ActionHandler::slotDrawArcTangential() { setCurrentAction(RS2::ActionDrawArcTangential); } -void QG_ActionHandler::slotDrawEllipseAxis() +void ActionHandler::slotDrawEllipseAxis() { setCurrentAction(RS2::ActionDrawEllipseAxis); } -void QG_ActionHandler::slotDrawEllipseArcAxis() +void ActionHandler::slotDrawEllipseArcAxis() { setCurrentAction(RS2::ActionDrawEllipseArcAxis); } -void QG_ActionHandler::slotDrawSpline() +void ActionHandler::slotDrawSpline() { setCurrentAction(RS2::ActionDrawSpline); } -void QG_ActionHandler::slotDrawText() +void ActionHandler::slotDrawText() { setCurrentAction(RS2::ActionDrawText); } -void QG_ActionHandler::slotDrawHatch() +void ActionHandler::slotDrawHatch() { setCurrentAction(RS2::ActionDrawHatch); } -void QG_ActionHandler::slotDrawImage() +void ActionHandler::slotDrawImage() { setCurrentAction(RS2::ActionDrawImage); } -void QG_ActionHandler::slotDimAligned() +void ActionHandler::slotDimAligned() { setCurrentAction(RS2::ActionDimAligned); } -void QG_ActionHandler::slotDimLinear() +void ActionHandler::slotDimLinear() { setCurrentAction(RS2::ActionDimLinear); } -void QG_ActionHandler::slotDimLinearHor() +void ActionHandler::slotDimLinearHor() { setCurrentAction(RS2::ActionDimLinearHor); } -void QG_ActionHandler::slotDimLinearVer() +void ActionHandler::slotDimLinearVer() { setCurrentAction(RS2::ActionDimLinearVer); } -void QG_ActionHandler::slotDimRadial() +void ActionHandler::slotDimRadial() { setCurrentAction(RS2::ActionDimRadial); } -void QG_ActionHandler::slotDimDiametric() +void ActionHandler::slotDimDiametric() { setCurrentAction(RS2::ActionDimDiametric); } -void QG_ActionHandler::slotDimAngular() +void ActionHandler::slotDimAngular() { setCurrentAction(RS2::ActionDimAngular); } -void QG_ActionHandler::slotDimLeader() +void ActionHandler::slotDimLeader() { setCurrentAction(RS2::ActionDimLeader); } -void QG_ActionHandler::slotModifyAttributes() +void ActionHandler::slotModifyAttributes() { setCurrentAction(RS2::ActionModifyAttributes); } -void QG_ActionHandler::slotModifyDelete() +void ActionHandler::slotModifyDelete() { setCurrentAction(RS2::ActionModifyDelete); } -void QG_ActionHandler::slotModifyDeleteQuick() +void ActionHandler::slotModifyDeleteQuick() { //setCurrentAction(RS2::ActionModifyDeleteQuick); setCurrentAction(RS2::ActionModifyDeleteNoSelect); } -void QG_ActionHandler::slotModifyDeleteFree() +void ActionHandler::slotModifyDeleteFree() { setCurrentAction(RS2::ActionModifyDeleteFree); } -void QG_ActionHandler::slotModifyMove() +void ActionHandler::slotModifyMove() { setCurrentAction(RS2::ActionModifyMove); } -void QG_ActionHandler::slotModifyRotate() +void ActionHandler::slotModifyRotate() { setCurrentAction(RS2::ActionModifyRotate); } -void QG_ActionHandler::slotModifyScale() +void ActionHandler::slotModifyScale() { setCurrentAction(RS2::ActionModifyScale); } -void QG_ActionHandler::slotModifyStretch() +void ActionHandler::slotModifyStretch() { setCurrentAction(RS2::ActionModifyStretch); } -void QG_ActionHandler::slotModifyBevel() +void ActionHandler::slotModifyBevel() { setCurrentAction(RS2::ActionModifyBevel); } -void QG_ActionHandler::slotModifyRound() +void ActionHandler::slotModifyRound() { setCurrentAction(RS2::ActionModifyRound); } -void QG_ActionHandler::slotModifyMirror() +void ActionHandler::slotModifyMirror() { setCurrentAction(RS2::ActionModifyMirror); } -void QG_ActionHandler::slotModifyMoveRotate() +void ActionHandler::slotModifyMoveRotate() { setCurrentAction(RS2::ActionModifyMoveRotate); } -void QG_ActionHandler::slotModifyRotate2() +void ActionHandler::slotModifyRotate2() { setCurrentAction(RS2::ActionModifyRotate2); } -void QG_ActionHandler::slotModifyEntity() +void ActionHandler::slotModifyEntity() { setCurrentAction(RS2::ActionModifyEntity); } -void QG_ActionHandler::slotModifyTrim() +void ActionHandler::slotModifyTrim() { setCurrentAction(RS2::ActionModifyTrim); } -void QG_ActionHandler::slotModifyTrim2() +void ActionHandler::slotModifyTrim2() { setCurrentAction(RS2::ActionModifyTrim2); } -void QG_ActionHandler::slotModifyTrimAmount() +void ActionHandler::slotModifyTrimAmount() { setCurrentAction(RS2::ActionModifyTrimAmount); } -void QG_ActionHandler::slotModifyCut() +void ActionHandler::slotModifyCut() { setCurrentAction(RS2::ActionModifyCut); } -void QG_ActionHandler::slotModifyExplodeText() +void ActionHandler::slotModifyExplodeText() { setCurrentAction(RS2::ActionModifyExplodeText); } -void QG_ActionHandler::slotSnapFree() +void ActionHandler::slotSnapFree() { disableSnaps(); @@ -1429,7 +1429,7 @@ void QG_ActionHandler::slotSnapFree() setCurrentAction(RS2::ActionSnapFree); } -void QG_ActionHandler::slotSnapGrid() +void ActionHandler::slotSnapGrid() { disableSnaps(); @@ -1443,7 +1443,7 @@ void QG_ActionHandler::slotSnapGrid() setCurrentAction(RS2::ActionSnapGrid); } -void QG_ActionHandler::slotSnapEndpoint() +void ActionHandler::slotSnapEndpoint() { disableSnaps(); @@ -1457,7 +1457,7 @@ void QG_ActionHandler::slotSnapEndpoint() setCurrentAction(RS2::ActionSnapEndpoint); } -void QG_ActionHandler::slotSnapOnEntity() +void ActionHandler::slotSnapOnEntity() { disableSnaps(); if (snapOnEntity) @@ -1469,7 +1469,7 @@ void QG_ActionHandler::slotSnapOnEntity() setCurrentAction(RS2::ActionSnapOnEntity); } -void QG_ActionHandler::slotSnapCenter() +void ActionHandler::slotSnapCenter() { disableSnaps(); @@ -1484,7 +1484,7 @@ void QG_ActionHandler::slotSnapCenter() setCurrentAction(RS2::ActionSnapCenter); } -void QG_ActionHandler::slotSnapMiddle() +void ActionHandler::slotSnapMiddle() { disableSnaps(); @@ -1499,7 +1499,7 @@ void QG_ActionHandler::slotSnapMiddle() setCurrentAction(RS2::ActionSnapMiddle); } -void QG_ActionHandler::slotSnapDist() +void ActionHandler::slotSnapDist() { disableSnaps(); @@ -1514,7 +1514,7 @@ void QG_ActionHandler::slotSnapDist() setCurrentAction(RS2::ActionSnapDist); } -void QG_ActionHandler::slotSnapIntersection() +void ActionHandler::slotSnapIntersection() { disableSnaps(); @@ -1529,7 +1529,7 @@ void QG_ActionHandler::slotSnapIntersection() setCurrentAction(RS2::ActionSnapIntersection); } -void QG_ActionHandler::slotSnapIntersectionManual() +void ActionHandler::slotSnapIntersectionManual() { //disableSnaps(); /*if (snapIntersectionManual) { @@ -1541,7 +1541,7 @@ void QG_ActionHandler::slotSnapIntersectionManual() setCurrentAction(RS2::ActionSnapIntersectionManual); } -void QG_ActionHandler::disableSnaps() +void ActionHandler::disableSnaps() { if (snapFree) snapFree->setChecked(false); @@ -1576,7 +1576,7 @@ void QG_ActionHandler::disableSnaps() #endif } -void QG_ActionHandler::slotRestrictNothing() +void ActionHandler::slotRestrictNothing() { disableRestrictions(); @@ -1590,7 +1590,7 @@ void QG_ActionHandler::slotRestrictNothing() setCurrentAction(RS2::ActionRestrictNothing); } -void QG_ActionHandler::slotRestrictOrthogonal() +void ActionHandler::slotRestrictOrthogonal() { disableRestrictions(); @@ -1604,7 +1604,7 @@ void QG_ActionHandler::slotRestrictOrthogonal() setCurrentAction(RS2::ActionRestrictOrthogonal); } -void QG_ActionHandler::slotRestrictHorizontal() +void ActionHandler::slotRestrictHorizontal() { disableRestrictions(); @@ -1619,7 +1619,7 @@ void QG_ActionHandler::slotRestrictHorizontal() setCurrentAction(RS2::ActionRestrictHorizontal); } -void QG_ActionHandler::slotRestrictVertical() +void ActionHandler::slotRestrictVertical() { disableRestrictions(); @@ -1633,7 +1633,7 @@ void QG_ActionHandler::slotRestrictVertical() setCurrentAction(RS2::ActionRestrictVertical); } -void QG_ActionHandler::disableRestrictions() +void ActionHandler::disableRestrictions() { if (restrictNothing) restrictNothing->setChecked(false); @@ -1657,7 +1657,7 @@ void QG_ActionHandler::disableRestrictions() * Updates the snap mode for the current document from the selected menu. * Used after the active window changed. */ -void QG_ActionHandler::updateSnapMode() +void ActionHandler::updateSnapMode() { if (snapFree && snapFree->isChecked()) slotSnapFree(); @@ -1691,12 +1691,12 @@ void QG_ActionHandler::updateSnapMode() slotLockRelativeZero(lockRelativeZero->isChecked()); } -void QG_ActionHandler::slotSetRelativeZero() +void ActionHandler::slotSetRelativeZero() { setCurrentAction(RS2::ActionSetRelativeZero); } -void QG_ActionHandler::slotLockRelativeZero(bool on) +void ActionHandler::slotLockRelativeZero(bool on) { if (lockRelativeZero) lockRelativeZero->setChecked(on); @@ -1712,143 +1712,143 @@ void QG_ActionHandler::slotLockRelativeZero(bool on) #endif } -void QG_ActionHandler::slotInfoInside() +void ActionHandler::slotInfoInside() { setCurrentAction(RS2::ActionInfoInside); } -void QG_ActionHandler::slotInfoDist() +void ActionHandler::slotInfoDist() { setCurrentAction(RS2::ActionInfoDist); } -void QG_ActionHandler::slotInfoDist2() +void ActionHandler::slotInfoDist2() { setCurrentAction(RS2::ActionInfoDist2); } -void QG_ActionHandler::slotInfoAngle() +void ActionHandler::slotInfoAngle() { setCurrentAction(RS2::ActionInfoAngle); } -void QG_ActionHandler::slotInfoTotalLength() +void ActionHandler::slotInfoTotalLength() { setCurrentAction(RS2::ActionInfoTotalLength); } -void QG_ActionHandler::slotInfoArea() +void ActionHandler::slotInfoArea() { setCurrentAction(RS2::ActionInfoArea); } -void QG_ActionHandler::slotLayersDefreezeAll() +void ActionHandler::slotLayersDefreezeAll() { setCurrentAction(RS2::ActionLayersDefreezeAll); } -void QG_ActionHandler::slotLayersFreezeAll() +void ActionHandler::slotLayersFreezeAll() { setCurrentAction(RS2::ActionLayersFreezeAll); } -void QG_ActionHandler::slotLayersAdd() +void ActionHandler::slotLayersAdd() { setCurrentAction(RS2::ActionLayersAdd); } -void QG_ActionHandler::slotLayersRemove() +void ActionHandler::slotLayersRemove() { setCurrentAction(RS2::ActionLayersRemove); } -void QG_ActionHandler::slotLayersEdit() +void ActionHandler::slotLayersEdit() { setCurrentAction(RS2::ActionLayersEdit); } -void QG_ActionHandler::slotLayersToggleView() +void ActionHandler::slotLayersToggleView() { setCurrentAction(RS2::ActionLayersToggleView); } -void QG_ActionHandler::slotLayersToggleLock() +void ActionHandler::slotLayersToggleLock() { setCurrentAction(RS2::ActionLayersToggleLock); } -void QG_ActionHandler::slotBlocksDefreezeAll() +void ActionHandler::slotBlocksDefreezeAll() { setCurrentAction(RS2::ActionBlocksDefreezeAll); } -void QG_ActionHandler::slotBlocksFreezeAll() +void ActionHandler::slotBlocksFreezeAll() { setCurrentAction(RS2::ActionBlocksFreezeAll); } -void QG_ActionHandler::slotBlocksAdd() +void ActionHandler::slotBlocksAdd() { setCurrentAction(RS2::ActionBlocksAdd); } -void QG_ActionHandler::slotBlocksRemove() +void ActionHandler::slotBlocksRemove() { setCurrentAction(RS2::ActionBlocksRemove); } -void QG_ActionHandler::slotBlocksAttributes() +void ActionHandler::slotBlocksAttributes() { setCurrentAction(RS2::ActionBlocksAttributes); } -void QG_ActionHandler::slotBlocksEdit() +void ActionHandler::slotBlocksEdit() { setCurrentAction(RS2::ActionBlocksEdit); } -void QG_ActionHandler::slotBlocksInsert() +void ActionHandler::slotBlocksInsert() { setCurrentAction(RS2::ActionBlocksInsert); } -void QG_ActionHandler::slotBlocksToggleView() +void ActionHandler::slotBlocksToggleView() { setCurrentAction(RS2::ActionBlocksToggleView); } -void QG_ActionHandler::slotBlocksCreate() +void ActionHandler::slotBlocksCreate() { setCurrentAction(RS2::ActionBlocksCreate); } -void QG_ActionHandler::slotBlocksExplode() +void ActionHandler::slotBlocksExplode() { setCurrentAction(RS2::ActionBlocksExplode); } -void QG_ActionHandler::slotOptionsDrawing() +void ActionHandler::slotOptionsDrawing() { setCurrentAction(RS2::ActionOptionsDrawing); } -void QG_ActionHandler::slotCamExportAuto() +void ActionHandler::slotCamExportAuto() { #ifdef RS_CAM setCurrentAction(RS2::ActionCamExportAuto); #endif } -void QG_ActionHandler::slotCamReorder() +void ActionHandler::slotCamReorder() { #ifdef RS_CAM setCurrentAction(RS2::ActionCamReorder); #endif } -void QG_ActionHandler::slotFocusNormal() +void ActionHandler::slotFocusNormal() { //QG_GraphicView* gv = mainWindow->getGraphicView(); //if (gv) { @@ -1857,72 +1857,72 @@ void QG_ActionHandler::slotFocusNormal() //} } -void QG_ActionHandler::setActionSnapFree(QAction * a) +void ActionHandler::setActionSnapFree(QAction * a) { snapFree = a; } -void QG_ActionHandler::setActionSnapGrid(QAction * a) +void ActionHandler::setActionSnapGrid(QAction * a) { snapGrid = a; } -void QG_ActionHandler::setActionSnapEndpoint(QAction * a) +void ActionHandler::setActionSnapEndpoint(QAction * a) { snapEndpoint = a; } -void QG_ActionHandler::setActionSnapOnEntity(QAction * a) +void ActionHandler::setActionSnapOnEntity(QAction * a) { snapOnEntity = a; } -void QG_ActionHandler::setActionSnapCenter(QAction * a) +void ActionHandler::setActionSnapCenter(QAction * a) { snapCenter = a; } -void QG_ActionHandler::setActionSnapMiddle(QAction * a) +void ActionHandler::setActionSnapMiddle(QAction * a) { snapMiddle = a; } -void QG_ActionHandler::setActionSnapDist(QAction * a) +void ActionHandler::setActionSnapDist(QAction * a) { snapDist = a; } -void QG_ActionHandler::setActionSnapIntersection(QAction * a) +void ActionHandler::setActionSnapIntersection(QAction * a) { snapIntersection = a; } -void QG_ActionHandler::setActionSnapIntersectionManual(QAction * a) +void ActionHandler::setActionSnapIntersectionManual(QAction * a) { snapIntersectionManual = a; } -void QG_ActionHandler::setActionRestrictNothing(QAction * a) +void ActionHandler::setActionRestrictNothing(QAction * a) { restrictNothing = a; } -void QG_ActionHandler::setActionRestrictOrthogonal(QAction * a) +void ActionHandler::setActionRestrictOrthogonal(QAction * a) { restrictOrthogonal = a; } -void QG_ActionHandler::setActionRestrictHorizontal(QAction * a) +void ActionHandler::setActionRestrictHorizontal(QAction * a) { restrictHorizontal = a; } -void QG_ActionHandler::setActionRestrictVertical(QAction * a) +void ActionHandler::setActionRestrictVertical(QAction * a) { restrictVertical = a; } -void QG_ActionHandler::setActionLockRelativeZero(QAction * a) +void ActionHandler::setActionLockRelativeZero(QAction * a) { lockRelativeZero = a; } @@ -1931,7 +1931,7 @@ void QG_ActionHandler::setActionLockRelativeZero(QAction * a) * Creates link to snap tool bar so we can update the button * state if the snapping action changes. */ -void QG_ActionHandler::setCadToolBarSnap(CadToolBarSnap * tb) +void ActionHandler::setCadToolBarSnap(CadToolBarSnap * tb) { cadToolBarSnap = tb; } diff --git a/src/widgets/actionhandler.h b/src/widgets/actionhandler.h index 5d3792e..1d9ce52 100644 --- a/src/widgets/actionhandler.h +++ b/src/widgets/actionhandler.h @@ -11,13 +11,13 @@ class ActionInterface; /** * This class can trigger actions (from menus, buttons, ...). */ -class QG_ActionHandler: public QObject +class ActionHandler: public QObject { Q_OBJECT public: - QG_ActionHandler(QG_MainWindowInterface * mw); - virtual ~QG_ActionHandler(); + ActionHandler(QG_MainWindowInterface * mw); + virtual ~ActionHandler(); ActionInterface * getCurrentAction(); ActionInterface * setCurrentAction(RS2::ActionType id); diff --git a/src/widgets/blockwidget.cpp b/src/widgets/blockwidget.cpp index ff518bd..50f6a42 100644 --- a/src/widgets/blockwidget.cpp +++ b/src/widgets/blockwidget.cpp @@ -24,7 +24,7 @@ /** * Constructor. */ -QG_BlockWidget::QG_BlockWidget(QG_ActionHandler * ah, QWidget * parent, const char * name, Qt::WFlags f): +BlockWidget::BlockWidget(ActionHandler * ah, QWidget * parent, const char * name, Qt::WFlags f): // QWidget(parent, name, f), QWidget(parent, f), pxmVisible(":/res/visibleblock.xpm"), @@ -150,18 +150,18 @@ QG_BlockWidget::QG_BlockWidget(QG_ActionHandler * ah, QWidget * parent, const ch /** * Destructor */ -QG_BlockWidget::~QG_BlockWidget() +BlockWidget::~BlockWidget() { delete listBox; } -void QG_BlockWidget::setBlockList(RS_BlockList * blockList) +void BlockWidget::setBlockList(RS_BlockList * blockList) { this->blockList = blockList; update(); } -RS_BlockList * QG_BlockWidget::getBlockList() +RS_BlockList * BlockWidget::getBlockList() { return blockList; } @@ -169,9 +169,9 @@ RS_BlockList * QG_BlockWidget::getBlockList() /** * Updates the block box from the blocks in the graphic. */ -void QG_BlockWidget::update() +void BlockWidget::update() { - RS_DEBUG->print("QG_BlockWidget::update()"); + RS_DEBUG->print("BlockWidget::update()"); #warning "!!!" // int yPos = listBox->contentsY(); @@ -185,7 +185,7 @@ void QG_BlockWidget::update() if (!blockList) { - RS_DEBUG->print("QG_BlockWidget::update(): blockList is NULL"); + RS_DEBUG->print("BlockWidget::update(): blockList is NULL"); return; } @@ -212,16 +212,16 @@ void QG_BlockWidget::update() //highlightBlock(blockList->getActiveBlock()); //listBox->setContentsPos(0, yPos); - RS_DEBUG->print("QG_BlockWidget::update() done"); + RS_DEBUG->print("BlockWidget::update() done"); } /** * Highlights (activates) the given block and makes it * the active block in the blocklist. */ -void QG_BlockWidget::highlightBlock(RS_Block * block) +void BlockWidget::highlightBlock(RS_Block * block) { - RS_DEBUG->print("QG_BlockWidget::highlightBlock()"); + RS_DEBUG->print("BlockWidget::highlightBlock()"); if (!block || !listBox) return; @@ -241,22 +241,22 @@ void QG_BlockWidget::highlightBlock(RS_Block * block) } } -/*virtual*/ void QG_BlockWidget::blockAdded(RS_Block *) +/*virtual*/ void BlockWidget::blockAdded(RS_Block *) { update(); } -/*virtual*/ void QG_BlockWidget::blockEdited(RS_Block *) +/*virtual*/ void BlockWidget::blockEdited(RS_Block *) { update(); } -/*virtual*/ void QG_BlockWidget::blockRemoved(RS_Block *) +/*virtual*/ void BlockWidget::blockRemoved(RS_Block *) { update(); } -/*virtual*/ void QG_BlockWidget::blockToggled(RS_Block *) +/*virtual*/ void BlockWidget::blockToggled(RS_Block *) { update(); } @@ -266,8 +266,8 @@ void QG_BlockWidget::highlightBlock(RS_Block * block) * an item is double clicked. */ /* -void QG_BlockWidget::slotToggleView(QListBoxItem* item) { - RS_DEBUG->print("QG_BlockWidget::slotToggleView()"); +void BlockWidget::slotToggleView(QListBoxItem* item) { + RS_DEBUG->print("BlockWidget::slotToggleView()"); if (item==NULL || blockList==NULL) { return; @@ -291,11 +291,11 @@ void QG_BlockWidget::slotToggleView(QListBoxItem* item) { /** * Called when the user activates (highlights) a block. */ -//void QG_BlockWidget::slotActivated(const QString & blockName) -void QG_BlockWidget::slotActivated(void) +//void BlockWidget::slotActivated(const QString & blockName) +void BlockWidget::slotActivated(void) { QString blockName = listBox->currentItem()->text(); - RS_DEBUG->print("QG_BlockWidget::slotActivated(): %s", blockName.toLatin1().data()); + RS_DEBUG->print("BlockWidget::slotActivated(): %s", blockName.toLatin1().data()); if (!blockList) return; @@ -307,8 +307,8 @@ void QG_BlockWidget::slotActivated(void) /** * Called for every mouse click. */ -//void QG_BlockWidget::slotMouseButtonClicked(int /*button*/, Q3ListBoxItem* item, const QPoint& pos) -void QG_BlockWidget::slotMouseButtonClicked(QListWidgetItem * item) +//void BlockWidget::slotMouseButtonClicked(int /*button*/, Q3ListBoxItem* item, const QPoint& pos) +void BlockWidget::slotMouseButtonClicked(QListWidgetItem * item) { QPoint p = mapFromGlobal(QCursor::pos()); RS_Block * b = lastBlock; @@ -328,7 +328,7 @@ void QG_BlockWidget::slotMouseButtonClicked(QListWidgetItem * item) /** * Shows a context menu for the block widget. Launched with a right click. */ -void QG_BlockWidget::contextMenuEvent(QContextMenuEvent * e) +void BlockWidget::contextMenuEvent(QContextMenuEvent * e) { #if 0 //QListBoxItem* item = listBox->selectedItem(); @@ -359,7 +359,7 @@ void QG_BlockWidget::contextMenuEvent(QContextMenuEvent * e) /** * Escape releases focus. */ -void QG_BlockWidget::keyPressEvent(QKeyEvent * e) +void BlockWidget::keyPressEvent(QKeyEvent * e) { switch (e->key()) { diff --git a/src/widgets/blockwidget.h b/src/widgets/blockwidget.h index 784df4b..804d4ee 100644 --- a/src/widgets/blockwidget.h +++ b/src/widgets/blockwidget.h @@ -5,20 +5,20 @@ class RS_Block; class RS_BlockList; -class QG_ActionHandler; +class ActionHandler; /** * This is the Qt implementation of a widget which can view a * block list. */ -class QG_BlockWidget: public QWidget +class BlockWidget: public QWidget { Q_OBJECT public: - QG_BlockWidget(QG_ActionHandler * ah, QWidget * parent, + BlockWidget(ActionHandler * ah, QWidget * parent, const char * name = 0, Qt::WFlags f = 0); - ~QG_BlockWidget(); + ~BlockWidget(); void setBlockList(RS_BlockList * blockList); RS_BlockList * getBlockList(); @@ -58,7 +58,7 @@ class QG_BlockWidget: public QWidget QPixmap pxmInsert; QPixmap pxmDefreezeAll; QPixmap pxmFreezeAll; - QG_ActionHandler * actionHandler; + ActionHandler * actionHandler; }; #endif // __BLOCKWIDGET_H__ diff --git a/src/widgets/colorbox.cpp b/src/widgets/colorbox.cpp index 38a7780..6be8257 100644 --- a/src/widgets/colorbox.cpp +++ b/src/widgets/colorbox.cpp @@ -22,7 +22,7 @@ * Default Constructor. You must call init manually if you choose * to use this constructor. */ -QG_ColorBox::QG_ColorBox(QWidget * parent/*= 0*/, const char */*name = 0*/): +ColorBox::ColorBox(QWidget * parent/*= 0*/, const char */*name = 0*/): QComboBox(parent) { showByLayer = false; @@ -36,7 +36,7 @@ QG_ColorBox::QG_ColorBox(QWidget * parent/*= 0*/, const char */*name = 0*/): * * @param showByLayer true: Show attribute ByLayer, ByBlock. */ -QG_ColorBox::QG_ColorBox(bool showByLayer, bool showUnchanged, QWidget * parent/*= 0*/, +ColorBox::ColorBox(bool showByLayer, bool showUnchanged, QWidget * parent/*= 0*/, const char */*name = 0*/): QComboBox(parent) { unchanged = false; @@ -46,11 +46,11 @@ QG_ColorBox::QG_ColorBox(bool showByLayer, bool showUnchanged, QWidget * parent/ /** * Destructor */ -QG_ColorBox::~QG_ColorBox() +ColorBox::~ColorBox() { } -RS_Color QG_ColorBox::getColor() +RS_Color ColorBox::getColor() { return currentColor; } @@ -61,7 +61,7 @@ RS_Color QG_ColorBox::getColor() * * @param showByLayer true: Show attribute ByLayer, ByBlock. */ -void QG_ColorBox::init(bool showByLayer, bool showUnchanged) +void ColorBox::init(bool showByLayer, bool showUnchanged) { this->showByLayer = showByLayer; this->showUnchanged = showUnchanged; @@ -111,7 +111,7 @@ void QG_ColorBox::init(bool showByLayer, bool showUnchanged) slotColorChanged(currentIndex()); } -bool QG_ColorBox::isUnchanged() +bool ColorBox::isUnchanged() { return unchanged; } @@ -119,7 +119,7 @@ bool QG_ColorBox::isUnchanged() /** * Sets the color shown in the combobox to the given color. */ -void QG_ColorBox::setColor(const RS_Color & color) +void ColorBox::setColor(const RS_Color & color) { //#warning "!!! Color is being misreported here !!!" /* @@ -163,7 +163,7 @@ Look at Red: Have to convert them all to RS_Color... * Sets the color of the pixmap next to the "By Layer" item * to the given color. */ -void QG_ColorBox::setLayerColor(const RS_Color & color) +void ColorBox::setLayerColor(const RS_Color & color) { if (showByLayer) { @@ -200,7 +200,7 @@ void QG_ColorBox::setLayerColor(const RS_Color & color) * offers a dialog to the user that allows him/ her to * choose an individual color. */ -void QG_ColorBox::slotColorChanged(int index) +void ColorBox::slotColorChanged(int index) { currentColor.resetFlags(); diff --git a/src/widgets/colorbox.h b/src/widgets/colorbox.h index a5e58b7..cbd9412 100644 --- a/src/widgets/colorbox.h +++ b/src/widgets/colorbox.h @@ -7,15 +7,15 @@ /** * A combobox for choosing a color. */ -class QG_ColorBox: public QComboBox +class ColorBox: public QComboBox { Q_OBJECT public: - QG_ColorBox(QWidget * parent = 0, const char * name = 0); - QG_ColorBox(bool showByLayer, bool showUnchanged, + ColorBox(QWidget * parent = 0, const char * name = 0); + ColorBox(bool showByLayer, bool showUnchanged, QWidget * parent = 0, const char * name = 0); - virtual ~QG_ColorBox(); + virtual ~ColorBox(); RS_Color getColor(); void setColor(const RS_Color & color); diff --git a/src/widgets/commandedit.cpp b/src/widgets/commandedit.cpp index 95627ba..f470009 100644 --- a/src/widgets/commandedit.cpp +++ b/src/widgets/commandedit.cpp @@ -22,7 +22,7 @@ * Default Constructor. You must call init manually if you choose * to use this constructor. */ -QG_CommandEdit::QG_CommandEdit(QWidget * parent, const char */*name*/): +CommandEdit::CommandEdit(QWidget * parent, const char */*name*/): // QLineEdit(parent, name) QLineEdit(parent) { @@ -31,7 +31,7 @@ QG_CommandEdit::QG_CommandEdit(QWidget * parent, const char */*name*/): /** * Destructor */ -QG_CommandEdit::~QG_CommandEdit() +CommandEdit::~CommandEdit() { it = 0; } @@ -39,7 +39,7 @@ QG_CommandEdit::~QG_CommandEdit() /** * Bypass for key press events from the tab key. */ -bool QG_CommandEdit::event(QEvent * e) +bool CommandEdit::event(QEvent * e) { if (e->type() == QEvent::KeyPress) { @@ -58,7 +58,7 @@ bool QG_CommandEdit::event(QEvent * e) /** * History (arrow key up/down) support, tab. */ -void QG_CommandEdit::keyPressEvent(QKeyEvent * e) +void CommandEdit::keyPressEvent(QKeyEvent * e) { switch (e->key()) { @@ -105,14 +105,14 @@ void QG_CommandEdit::keyPressEvent(QKeyEvent * e) } } -void QG_CommandEdit::focusInEvent(QFocusEvent * e) +void CommandEdit::focusInEvent(QFocusEvent * e) { emit focusIn(); QLineEdit::focusInEvent(e); } -void QG_CommandEdit::focusOutEvent(QFocusEvent * e) +void CommandEdit::focusOutEvent(QFocusEvent * e) { emit focusOut(); QLineEdit::focusOutEvent(e); diff --git a/src/widgets/commandedit.h b/src/widgets/commandedit.h index b72369d..4134016 100644 --- a/src/widgets/commandedit.h +++ b/src/widgets/commandedit.h @@ -7,13 +7,13 @@ * A command line edit with some typical console features * (uparrow for the history, tab, ..). */ -class QG_CommandEdit: public QLineEdit +class CommandEdit: public QLineEdit { Q_OBJECT public: - QG_CommandEdit(QWidget * parent = 0, const char * name = 0); - virtual ~QG_CommandEdit(); + CommandEdit(QWidget * parent = 0, const char * name = 0); + virtual ~CommandEdit(); protected: virtual bool event(QEvent * e); diff --git a/src/widgets/filedialog.cpp b/src/widgets/filedialog.cpp index 0ee35dd..5d36c60 100644 --- a/src/widgets/filedialog.cpp +++ b/src/widgets/filedialog.cpp @@ -31,7 +31,7 @@ * @return File name with path and extension to determine the file type * or an empty string if the dialog was cancelled. */ -QString QG_FileDialog::getSaveFileName(QWidget * parent, RS2::FormatType * type) +QString FileDialog::getSaveFileName(QWidget * parent, RS2::FormatType * type) { // read default settings: settings.beginGroup("Paths"); @@ -153,9 +153,9 @@ QString QG_FileDialog::getSaveFileName(QWidget * parent, RS2::FormatType * type) * @return File name with path and extension to determine the file type * or an empty string if the dialog was cancelled. */ -QString QG_FileDialog::getOpenFileName(QWidget * parent, RS2::FormatType * type) +QString FileDialog::getOpenFileName(QWidget * parent, RS2::FormatType * type) { - RS_DEBUG->print("QG_FileDialog::getOpenFileName"); + RS_DEBUG->print("FileDialog::getOpenFileName"); // read default settings: settings.beginGroup("/Paths"); @@ -206,7 +206,7 @@ QString QG_FileDialog::getOpenFileName(QWidget * parent, RS2::FormatType * type) QG_GraphicView * prev = new QG_GraphicView(parent); prev->setContainer(gr); prev->setBorders(1, 1, 1, 1); -#warning "!!! QG_FileDialog: Commented out Qt3 previews !!!" +#warning "!!! FileDialog: Commented out Qt3 previews !!!" // fileDlg->setContentsPreviewEnabled(true); // fileDlg->setContentsPreview(prev, prev); @@ -251,8 +251,8 @@ QString QG_FileDialog::getOpenFileName(QWidget * parent, RS2::FormatType * type) settings.endGroup(); } - RS_DEBUG->print("QG_FileDialog::getOpenFileName: fileName: %s", fn.toLatin1().data()); - RS_DEBUG->print("QG_FileDialog::getOpenFileName: OK"); + RS_DEBUG->print("FileDialog::getOpenFileName: fileName: %s", fn.toLatin1().data()); + RS_DEBUG->print("FileDialog::getOpenFileName: OK"); delete prev; delete gr; diff --git a/src/widgets/filedialog.h b/src/widgets/filedialog.h index 33f3b18..6414f89 100644 --- a/src/widgets/filedialog.h +++ b/src/widgets/filedialog.h @@ -7,11 +7,11 @@ /** * File Open / Save dialogs. */ -class QG_FileDialog +class FileDialog { public: - //QG_FileDialog(QWidget* parent=0, const char* name=0, WFlags f=0); - //virtual ~QG_FileDialog(); + //FileDialog(QWidget* parent=0, const char* name=0, WFlags f=0); + //virtual ~FileDialog(); static QString getOpenFileName(QWidget * parent, RS2::FormatType * type = NULL); static QString getSaveFileName(QWidget * parent, RS2::FormatType * type = NULL); diff --git a/src/widgets/fontbox.cpp b/src/widgets/fontbox.cpp index 8ea742b..ba06a48 100644 --- a/src/widgets/fontbox.cpp +++ b/src/widgets/fontbox.cpp @@ -24,14 +24,14 @@ * Default Constructor. You must call init manually if you choose * to use this constructor. */ -QG_FontBox::QG_FontBox(QWidget * parent/*= 0*/, const char */*name = 0*/): QComboBox(parent) +FontBox::FontBox(QWidget * parent/*= 0*/, const char */*name = 0*/): QComboBox(parent) { } /** * Destructor */ -QG_FontBox::~QG_FontBox() +FontBox::~FontBox() { } @@ -39,7 +39,7 @@ QG_FontBox::~QG_FontBox() * Initialisation (called from constructor or manually but only * once). */ -void QG_FontBox::init() +void FontBox::init() { QStringList fonts; @@ -58,7 +58,7 @@ void QG_FontBox::init() slotFontChanged(currentIndex()); } -RS_Font * QG_FontBox::getFont() +RS_Font * FontBox::getFont() { return currentFont; } @@ -66,9 +66,9 @@ RS_Font * QG_FontBox::getFont() /** * Sets the currently selected width item to the given width. */ -void QG_FontBox::setFont(const QString & fName) +void FontBox::setFont(const QString & fName) { - RS_DEBUG->print("QG_FontBox::setFont %s\n", fName.toLatin1().data()); + RS_DEBUG->print("FontBox::setFont %s\n", fName.toLatin1().data()); // setCurrentText(fName); setItemText(currentIndex(), fName); // slotFontChanged(currentItem()); @@ -79,9 +79,9 @@ void QG_FontBox::setFont(const QString & fName) * Called when the font has changed. This method * sets the current font to the value chosen. */ -void QG_FontBox::slotFontChanged(int index) +void FontBox::slotFontChanged(int index) { - RS_DEBUG->print("QG_FontBox::slotFontChanged %d\n", index); + RS_DEBUG->print("FontBox::slotFontChanged %d\n", index); currentFont = RS_FONTLIST->requestFont(currentText()); if (currentFont != NULL) diff --git a/src/widgets/fontbox.h b/src/widgets/fontbox.h index e5eb61a..ef39fe5 100644 --- a/src/widgets/fontbox.h +++ b/src/widgets/fontbox.h @@ -8,13 +8,13 @@ class RS_Font; /** * A combobox for choosing a font name. */ -class QG_FontBox: public QComboBox +class FontBox: public QComboBox { Q_OBJECT public: - QG_FontBox(QWidget * parent = 0, const char * name = 0); - virtual ~QG_FontBox(); + FontBox(QWidget * parent = 0, const char * name = 0); + virtual ~FontBox(); void init(); RS_Font * getFont(); diff --git a/src/widgets/layerbox.cpp b/src/widgets/layerbox.cpp index d8a8797..f40cf92 100644 --- a/src/widgets/layerbox.cpp +++ b/src/widgets/layerbox.cpp @@ -23,7 +23,7 @@ * Default Constructor. You must call init manually before using * this class. */ -QG_LayerBox::QG_LayerBox(QWidget * parent, const char */*name*/): QComboBox(parent) +LayerBox::LayerBox(QWidget * parent, const char */*name*/): QComboBox(parent) { showByBlock = false; showUnchanged = false; @@ -35,11 +35,11 @@ QG_LayerBox::QG_LayerBox(QWidget * parent, const char */*name*/): QComboBox(pare /** * Destructor */ -QG_LayerBox::~QG_LayerBox() +LayerBox::~LayerBox() { } -RS_Layer * QG_LayerBox::getLayer() +RS_Layer * LayerBox::getLayer() { return currentLayer; } @@ -51,7 +51,7 @@ RS_Layer * QG_LayerBox::getLayer() * available. * @param showByBlock true: Show attribute ByBlock. */ -void QG_LayerBox::init(RS_LayerList & layerList, bool showByBlock, bool showUnchanged) +void LayerBox::init(RS_LayerList & layerList, bool showByBlock, bool showUnchanged) { this->showByBlock = showByBlock; this->showUnchanged = showUnchanged; @@ -78,7 +78,7 @@ void QG_LayerBox::init(RS_LayerList & layerList, bool showByBlock, bool showUnch /** * Sets the layer shown in the combobox to the given layer. */ -void QG_LayerBox::setLayer(RS_Layer & layer) +void LayerBox::setLayer(RS_Layer & layer) { currentLayer = &layer; @@ -98,7 +98,7 @@ void QG_LayerBox::setLayer(RS_Layer & layer) /** * Sets the layer shown in the combobox to the given layer. */ -void QG_LayerBox::setLayer(QString & layer) +void LayerBox::setLayer(QString & layer) { //if (layer.getName()=="ByBlock" && showByBlock) { // setCurrentItem(0); @@ -112,7 +112,7 @@ void QG_LayerBox::setLayer(QString & layer) //} } -bool QG_LayerBox::isUnchanged() +bool LayerBox::isUnchanged() { return unchanged; } @@ -123,7 +123,7 @@ bool QG_LayerBox::isUnchanged() * offers a dialog to the user that allows him/ her to * choose an individual color. */ -void QG_LayerBox::slotLayerChanged(int index) +void LayerBox::slotLayerChanged(int index) { //currentLayer.resetFlags(); diff --git a/src/widgets/layerbox.h b/src/widgets/layerbox.h index f4ebb86..678e142 100644 --- a/src/widgets/layerbox.h +++ b/src/widgets/layerbox.h @@ -9,13 +9,13 @@ class RS_LayerList; /** * A combobox for choosing a layer. */ -class QG_LayerBox: public QComboBox +class LayerBox: public QComboBox { Q_OBJECT public: - QG_LayerBox(QWidget * parent = 0, const char * name = 0); - virtual ~QG_LayerBox(); + LayerBox(QWidget * parent = 0, const char * name = 0); + virtual ~LayerBox(); RS_Layer * getLayer(); void setLayer(RS_Layer & layer); diff --git a/src/widgets/layerwidget.cpp b/src/widgets/layerwidget.cpp index 28e5f6f..447d4e7 100644 --- a/src/widgets/layerwidget.cpp +++ b/src/widgets/layerwidget.cpp @@ -24,7 +24,7 @@ /** * Constructor. */ -QG_LayerWidget::QG_LayerWidget(QG_ActionHandler * ah, QWidget * parent, +LayerWidget::LayerWidget(ActionHandler * ah, QWidget * parent, const char * name, Qt::WindowFlags f): QWidget(parent, f), pxmLayerStatus00(":/res/layerstatus_00.xpm"), @@ -125,7 +125,7 @@ QG_LayerWidget::QG_LayerWidget(QG_ActionHandler * ah, QWidget * parent, /** * Destructor */ -QG_LayerWidget::~QG_LayerWidget() +LayerWidget::~LayerWidget() { delete listBox; //delete pxmVisible; @@ -139,7 +139,7 @@ QG_LayerWidget::~QG_LayerWidget() * it exists. * false: don't show special layer "ByBlock" */ -void QG_LayerWidget::setLayerList(RS_LayerList * layerList, bool showByBlock) +void LayerWidget::setLayerList(RS_LayerList * layerList, bool showByBlock) { this->layerList = layerList; this->showByBlock = showByBlock; @@ -149,9 +149,9 @@ void QG_LayerWidget::setLayerList(RS_LayerList * layerList, bool showByBlock) /** * Updates the layer box from the layers in the graphic. */ -void QG_LayerWidget::update() +void LayerWidget::update() { - RS_DEBUG->print("QG_LayerWidget::update() begin"); + RS_DEBUG->print("LayerWidget::update() begin"); #warning "!!!" // int yPos = listBox->contentsY(); @@ -161,17 +161,17 @@ void QG_LayerWidget::update() if (layerList != NULL) activeLayer = layerList->getActive(); - RS_DEBUG->print("QG_LayerWidget::update() clearing listBox"); + RS_DEBUG->print("LayerWidget::update() clearing listBox"); listBox->clear(); if (layerList == NULL) { - RS_DEBUG->print("QG_LayerWidget::update() abort"); + RS_DEBUG->print("LayerWidget::update() abort"); return; } - RS_DEBUG->print("QG_LayerWidget::update() filling in layers"); + RS_DEBUG->print("LayerWidget::update() filling in layers"); for(uint i=0; icount(); ++i) { @@ -213,12 +213,12 @@ void QG_LayerWidget::update() } } - RS_DEBUG->print("QG_LayerWidget::update() sorting"); + RS_DEBUG->print("LayerWidget::update() sorting"); // listBox->sort(); listBox->sortItems(Qt::AscendingOrder); - RS_DEBUG->print("QG_LayerWidget::update() reactivating current layer"); + RS_DEBUG->print("LayerWidget::update() reactivating current layer"); RS_Layer * l = lastLayer; highlightLayer(activeLayer); @@ -226,40 +226,40 @@ void QG_LayerWidget::update() #warning "!!!" // listBox->setContentsPos(0, yPos); - RS_DEBUG->print("QG_LayerWidget::update() end"); + RS_DEBUG->print("LayerWidget::update() end"); } /** * Highlights (activates) the given layer and makes it * the active layer in the layerlist. */ -void QG_LayerWidget::highlightLayer(RS_Layer * layer) +void LayerWidget::highlightLayer(RS_Layer * layer) { - RS_DEBUG->print("QG_LayerWidget::highlightLayer() begin"); + RS_DEBUG->print("LayerWidget::highlightLayer() begin"); if (layer == NULL || layerList == NULL) { - RS_DEBUG->print("QG_LayerWidget::highlightLayer() abort"); + RS_DEBUG->print("LayerWidget::highlightLayer() abort"); return; } QString name = layer->getName(); highlightLayer(name); - RS_DEBUG->print("QG_LayerWidget::highlightLayer() end"); + RS_DEBUG->print("LayerWidget::highlightLayer() end"); } /** * Highlights (activates) the given layer and makes it * the active layer in the layerlist. */ -void QG_LayerWidget::highlightLayer(const QString & name) +void LayerWidget::highlightLayer(const QString & name) { - RS_DEBUG->print("QG_LayerWidget::highlightLayer(name) begin"); + RS_DEBUG->print("LayerWidget::highlightLayer(name) begin"); if (layerList == NULL) { - RS_DEBUG->print("QG_LayerWidget::highlightLayer(name) abort"); + RS_DEBUG->print("LayerWidget::highlightLayer(name) abort"); return; } @@ -277,32 +277,32 @@ void QG_LayerWidget::highlightLayer(const QString & name) } } - RS_DEBUG->print("QG_LayerWidget::highlightLayer(name) end"); + RS_DEBUG->print("LayerWidget::highlightLayer(name) end"); } -/*virtual*/ void QG_LayerWidget::layerActivated(RS_Layer * layer) +/*virtual*/ void LayerWidget::layerActivated(RS_Layer * layer) { highlightLayer(layer); } -/*virtual*/ void QG_LayerWidget::layerAdded(RS_Layer * layer) +/*virtual*/ void LayerWidget::layerAdded(RS_Layer * layer) { update(); highlightLayer(layer); } -/*virtual*/ void QG_LayerWidget::layerEdited(RS_Layer *) +/*virtual*/ void LayerWidget::layerEdited(RS_Layer *) { update(); } -/*virtual*/ void QG_LayerWidget::layerRemoved(RS_Layer *) +/*virtual*/ void LayerWidget::layerRemoved(RS_Layer *) { update(); highlightLayer(layerList->at(0)); } -/*virtual*/ void QG_LayerWidget::layerToggled(RS_Layer *) +/*virtual*/ void LayerWidget::layerToggled(RS_Layer *) { update(); } @@ -310,11 +310,11 @@ void QG_LayerWidget::highlightLayer(const QString & name) /** * Called when the user activates (highlights) a layer. */ -//void QG_LayerWidget::slotActivated(const QString & layerName) -void QG_LayerWidget::slotActivated(void) +//void LayerWidget::slotActivated(const QString & layerName) +void LayerWidget::slotActivated(void) { QString layerName = listBox->currentItem()->text(); - RS_DEBUG->print("QG_LayerWidget::slotActivated(): %s", layerName.toLatin1().data()); + RS_DEBUG->print("LayerWidget::slotActivated(): %s", layerName.toLatin1().data()); if (layerList == NULL) return; @@ -326,10 +326,10 @@ void QG_LayerWidget::slotActivated(void) /** * Called for every mouse click. */ -//void QG_LayerWidget::slotMouseButtonClicked(int /*button*/, Q3ListBoxItem * item, const QPoint & pos) -void QG_LayerWidget::slotMouseButtonClicked(QListWidgetItem * item) +//void LayerWidget::slotMouseButtonClicked(int /*button*/, Q3ListBoxItem * item, const QPoint & pos) +void LayerWidget::slotMouseButtonClicked(QListWidgetItem * item) { - RS_DEBUG->print("QG_LayerWidget::slotMouseButtonClicked()"); + RS_DEBUG->print("LayerWidget::slotMouseButtonClicked()"); QPoint p = mapFromGlobal(QCursor::pos()); // only change state / no activation RS_Layer * l = lastLayer; @@ -354,7 +354,7 @@ void QG_LayerWidget::slotMouseButtonClicked(QListWidgetItem * item) /** * Shows a context menu for the layer widget. Launched with a right click. */ -void QG_LayerWidget::contextMenuEvent(QContextMenuEvent * e) +void LayerWidget::contextMenuEvent(QContextMenuEvent * e) { #warning "Needs porting to Qt4... !!! FIX !!!" #if 0 @@ -389,7 +389,7 @@ void QG_LayerWidget::contextMenuEvent(QContextMenuEvent * e) /** * Escape releases focus. */ -void QG_LayerWidget::keyPressEvent(QKeyEvent * e) +void LayerWidget::keyPressEvent(QKeyEvent * e) { switch (e->key()) { diff --git a/src/widgets/layerwidget.h b/src/widgets/layerwidget.h index b9e4e5a..78e7d1f 100644 --- a/src/widgets/layerwidget.h +++ b/src/widgets/layerwidget.h @@ -3,7 +3,7 @@ #include -class QG_ActionHandler; +class ActionHandler; class RS_Layer; class RS_LayerList; @@ -11,14 +11,14 @@ class RS_LayerList; * This is the Qt implementation of a widget which can view a * layer list and provides a user interface for basic layer actions. */ -class QG_LayerWidget: public QWidget +class LayerWidget: public QWidget { Q_OBJECT public: - QG_LayerWidget(QG_ActionHandler * ah, QWidget * parent, + LayerWidget(ActionHandler * ah, QWidget * parent, const char * name = 0, Qt::WindowFlags f = 0); - ~QG_LayerWidget(); + ~LayerWidget(); void setLayerList(RS_LayerList *, bool showByBlock); void update(); @@ -60,7 +60,7 @@ class QG_LayerWidget: public QWidget QPixmap pxmEdit; QPixmap pxmDefreezeAll; QPixmap pxmFreezeAll; - QG_ActionHandler * actionHandler; + ActionHandler * actionHandler; }; #endif // __LAYERWIDGET_H__ diff --git a/src/widgets/linetypebox.cpp b/src/widgets/linetypebox.cpp index 7240616..8657dfc 100644 --- a/src/widgets/linetypebox.cpp +++ b/src/widgets/linetypebox.cpp @@ -22,7 +22,7 @@ * Default Constructor. You must call init manually if you choose * to use this constructor. */ -QG_LineTypeBox::QG_LineTypeBox(QWidget * parent, const char */*name*/): QComboBox(parent) +LineTypeBox::LineTypeBox(QWidget * parent, const char */*name*/): QComboBox(parent) { showByLayer = false; showUnchanged = false; @@ -35,7 +35,7 @@ QG_LineTypeBox::QG_LineTypeBox(QWidget * parent, const char */*name*/): QComboBo * * @param showByLayer true: Show attribute ByLayer, ByBlock. */ -QG_LineTypeBox::QG_LineTypeBox(bool showByLayer, bool showUnchanged, QWidget * parent, +LineTypeBox::LineTypeBox(bool showByLayer, bool showUnchanged, QWidget * parent, const char */*name*/): QComboBox(parent) { unchanged = false; @@ -45,7 +45,7 @@ QG_LineTypeBox::QG_LineTypeBox(bool showByLayer, bool showUnchanged, QWidget * p /** * Destructor */ -QG_LineTypeBox::~QG_LineTypeBox() +LineTypeBox::~LineTypeBox() { } @@ -55,7 +55,7 @@ QG_LineTypeBox::~QG_LineTypeBox() * * @param showByLayer true: Show attribute ByLayer, ByBlock. */ -void QG_LineTypeBox::init(bool showByLayer, bool showUnchanged) +void LineTypeBox::init(bool showByLayer, bool showUnchanged) { this->showByLayer = showByLayer; this->showUnchanged = showUnchanged; @@ -119,7 +119,7 @@ void QG_LineTypeBox::init(bool showByLayer, bool showUnchanged) slotLineTypeChanged(currentIndex()); } -RS2::LineType QG_LineTypeBox::getLineType() +RS2::LineType LineTypeBox::getLineType() { return currentLineType; } @@ -127,9 +127,9 @@ RS2::LineType QG_LineTypeBox::getLineType() /** * Sets the currently selected linetype item to the given linetype. */ -void QG_LineTypeBox::setLineType(RS2::LineType t) +void LineTypeBox::setLineType(RS2::LineType t) { - RS_DEBUG->print("QG_LineTypeBox::setLineType %d\n", (int)t); + RS_DEBUG->print("LineTypeBox::setLineType %d\n", (int)t); int offset = (int)showByLayer * 2 + (int)showUnchanged; @@ -139,14 +139,14 @@ void QG_LineTypeBox::setLineType(RS2::LineType t) if (showByLayer) setCurrentIndex(0 + (int)showUnchanged); else - RS_DEBUG->print(RS_Debug::D_WARNING, "QG_LineTypeBox::setLineType: " + RS_DEBUG->print(RS_Debug::D_WARNING, "LineTypeBox::setLineType: " "Combobox doesn't support linetype BYLAYER"); break; case RS2::LineByBlock: if (showByLayer) setCurrentIndex(1 + (int)showUnchanged); else - RS_DEBUG->print(RS_Debug::D_WARNING, "QG_LineTypeBox::setLineType: " + RS_DEBUG->print(RS_Debug::D_WARNING, "LineTypeBox::setLineType: " "Combobox doesn't support linetype BYBLOCK"); break; @@ -226,7 +226,7 @@ void QG_LineTypeBox::setLineType(RS2::LineType t) * * @todo needs an update, but not used currently */ -void QG_LineTypeBox::setLayerLineType(RS2::LineType t) +void LineTypeBox::setLayerLineType(RS2::LineType t) { if (showByLayer) { @@ -269,7 +269,7 @@ void QG_LineTypeBox::setLayerLineType(RS2::LineType t) } } -bool QG_LineTypeBox::isUnchanged() +bool LineTypeBox::isUnchanged() { return unchanged; } @@ -280,9 +280,9 @@ bool QG_LineTypeBox::isUnchanged() * offers a dialog to the user that allows him/ her to * choose an individual linetype. */ -void QG_LineTypeBox::slotLineTypeChanged(int index) +void LineTypeBox::slotLineTypeChanged(int index) { - RS_DEBUG->print("QG_LineTypeBox::slotLineTypeChanged %d\n", index); + RS_DEBUG->print("LineTypeBox::slotLineTypeChanged %d\n", index); unchanged = false; diff --git a/src/widgets/linetypebox.h b/src/widgets/linetypebox.h index e00ce0c..a56910b 100644 --- a/src/widgets/linetypebox.h +++ b/src/widgets/linetypebox.h @@ -7,14 +7,14 @@ /** * A combobox for choosing a line type. */ -class QG_LineTypeBox: public QComboBox +class LineTypeBox: public QComboBox { Q_OBJECT public: - QG_LineTypeBox(QWidget * parent = 0, const char * name = 0); - QG_LineTypeBox(bool showByLayer, bool showUnchanged, QWidget * parent = 0, const char * name = 0); - virtual ~QG_LineTypeBox(); + LineTypeBox(QWidget * parent = 0, const char * name = 0); + LineTypeBox(bool showByLayer, bool showUnchanged, QWidget * parent = 0, const char * name = 0); + virtual ~LineTypeBox(); void init(bool showByLayer, bool showUnchanged); RS2::LineType getLineType(); diff --git a/src/widgets/listviewitem.cpp b/src/widgets/listviewitem.cpp index c9baaa2..f260c9c 100644 --- a/src/widgets/listviewitem.cpp +++ b/src/widgets/listviewitem.cpp @@ -21,7 +21,7 @@ /** * Constructor for root items. */ -QG_ListViewItem::QG_ListViewItem(QListWidget * par, const QString & label, +ListViewItem::ListViewItem(QListWidget * par, const QString & label, bool open, int id): QListWidgetItem(par) { par = 0; @@ -35,7 +35,7 @@ QG_ListViewItem::QG_ListViewItem(QListWidget * par, const QString & label, /** * Constructor for list view items with a folder icon. */ -QG_ListViewItem::QG_ListViewItem(QG_ListViewItem * par, const QString & label, +ListViewItem::ListViewItem(ListViewItem * par, const QString & label, bool open, int id): QListWidgetItem((QListWidget *)par) { this->par = par; @@ -50,7 +50,7 @@ QG_ListViewItem::QG_ListViewItem(QG_ListViewItem * par, const QString & label, /** * Opens or closes the item. */ -void QG_ListViewItem::setOpen(bool open) +void ListViewItem::setOpen(bool open) { if (open == true) // setPixmap(0, QPixmap(folderopen_xpm)); @@ -69,7 +69,7 @@ void QG_ListViewItem::setOpen(bool open) /** * Called in the beginning. */ -void QG_ListViewItem::setup() +void ListViewItem::setup() { // Q3ListViewItem::setup(); #warning "!!!" @@ -79,7 +79,7 @@ void QG_ListViewItem::setup() /** * Returns the "path" of this item (like: "Project/Page1/Paragraph1/"). */ -QString QG_ListViewItem::getFullPath() +QString ListViewItem::getFullPath() { QString s; @@ -101,7 +101,7 @@ QString QG_ListViewItem::getFullPath() /** * Returns the text of the given column of this item. */ -QString QG_ListViewItem::text(int column) const +QString ListViewItem::text(int column) const { if (column == 0) return label; @@ -109,17 +109,17 @@ QString QG_ListViewItem::text(int column) const return "Column1"; } -QString QG_ListViewItem::getLabel() const +QString ListViewItem::getLabel() const { return label; } -void QG_ListViewItem::setId(int id) +void ListViewItem::setId(int id) { this->id = id; } -int QG_ListViewItem::getId() +int ListViewItem::getId() { return id; } diff --git a/src/widgets/listviewitem.h b/src/widgets/listviewitem.h index 87f6d6b..a09cd4a 100644 --- a/src/widgets/listviewitem.h +++ b/src/widgets/listviewitem.h @@ -6,14 +6,14 @@ /** * An item in a hierarchical list view with a nice folder icon. */ -//class QG_ListViewItem : public Q3ListViewItem -class QG_ListViewItem : public QListWidgetItem +//class ListViewItem : public Q3ListViewItem +class ListViewItem : public QListWidgetItem { public: -// QG_ListViewItem(Q3ListView * par, const QString & label, - QG_ListViewItem(QListWidget * par, const QString & label, +// ListViewItem(Q3ListView * par, const QString & label, + ListViewItem(QListWidget * par, const QString & label, bool open = false, int id = -1); - QG_ListViewItem(QG_ListViewItem * par, const QString & label, + ListViewItem(ListViewItem * par, const QString & label, bool open = false, int id = -1); QString getFullPath(); @@ -25,7 +25,7 @@ class QG_ListViewItem : public QListWidgetItem int getId(); private: - QG_ListViewItem * par; + ListViewItem * par; QString label; QString object; int id; diff --git a/src/widgets/patternbox.cpp b/src/widgets/patternbox.cpp index 0ce3a9e..94f4d93 100644 --- a/src/widgets/patternbox.cpp +++ b/src/widgets/patternbox.cpp @@ -24,21 +24,21 @@ * Default Constructor. You must call init manually if you choose * to use this constructor. */ -QG_PatternBox::QG_PatternBox(QWidget * parent, const char */*name*/): QComboBox(parent) +PatternBox::PatternBox(QWidget * parent, const char */*name*/): QComboBox(parent) { } /** * Destructor */ -QG_PatternBox::~QG_PatternBox() +PatternBox::~PatternBox() { } /** * Initialisation (called manually and only once). */ -void QG_PatternBox::init() +void PatternBox::init() { QStringList patterns; @@ -55,7 +55,7 @@ void QG_PatternBox::init() slotPatternChanged(currentIndex()); } -RS_Pattern * QG_PatternBox::getPattern() +RS_Pattern * PatternBox::getPattern() { return currentPattern; } @@ -63,9 +63,9 @@ RS_Pattern * QG_PatternBox::getPattern() /** * Sets the currently selected width item to the given width. */ -void QG_PatternBox::setPattern(const QString & pName) +void PatternBox::setPattern(const QString & pName) { - RS_DEBUG->print("QG_PatternBox::setPattern %s\n", pName.toLatin1().data()); + RS_DEBUG->print("PatternBox::setPattern %s\n", pName.toLatin1().data()); // setCurrentText(pName); setItemText(currentIndex(), pName); slotPatternChanged(currentIndex()); @@ -75,9 +75,9 @@ void QG_PatternBox::setPattern(const QString & pName) * Called when the pattern has changed. This method * sets the current pattern to the value chosen. */ -void QG_PatternBox::slotPatternChanged(int index) +void PatternBox::slotPatternChanged(int index) { - RS_DEBUG->print("QG_PatternBox::slotPatternChanged %d\n", index); + RS_DEBUG->print("PatternBox::slotPatternChanged %d\n", index); currentPattern = RS_PATTERNLIST->requestPattern(currentText()); if (currentPattern!=NULL) diff --git a/src/widgets/patternbox.h b/src/widgets/patternbox.h index aeaf819..dcc9b77 100644 --- a/src/widgets/patternbox.h +++ b/src/widgets/patternbox.h @@ -8,13 +8,13 @@ class RS_Pattern; /** * A combobox for choosing a pattern name. */ -class QG_PatternBox: public QComboBox +class PatternBox: public QComboBox { Q_OBJECT public: - QG_PatternBox(QWidget * parent = 0, const char * name = 0); - virtual ~QG_PatternBox(); + PatternBox(QWidget * parent = 0, const char * name = 0); + virtual ~PatternBox(); void init(); RS_Pattern * getPattern(); diff --git a/src/widgets/pentoolbar.cpp b/src/widgets/pentoolbar.cpp index 87bfbe4..fd96c6c 100644 --- a/src/widgets/pentoolbar.cpp +++ b/src/widgets/pentoolbar.cpp @@ -26,11 +26,11 @@ /** * Constructor. */ -QG_PenToolBar::QG_PenToolBar(QMainWindow * parent/*= NULL*/, const char * name/*= NULL*/): +PenToolBar::PenToolBar(QMainWindow * parent/*= NULL*/, const char * name/*= NULL*/): QToolBar(parent), - colorBox(new QG_ColorBox(true, false, this, "colorbox")), - widthBox(new QG_WidthBox(true, false, this, "widthbox")), - lineTypeBox(new QG_LineTypeBox(true, false, this, "lineTypebox")) + colorBox(new ColorBox(true, false, this, "colorbox")), + widthBox(new WidthBox(true, false, this, "widthbox")), + lineTypeBox(new LineTypeBox(true, false, this, "lineTypebox")) { setWindowTitle(name); @@ -57,14 +57,14 @@ QG_PenToolBar::QG_PenToolBar(QMainWindow * parent/*= NULL*/, const char * name/* /** * Destructor */ -QG_PenToolBar::~QG_PenToolBar() +PenToolBar::~PenToolBar() { delete colorBox; delete widthBox; delete lineTypeBox; } -RS_Pen QG_PenToolBar::getPen() +RS_Pen PenToolBar::getPen() { return currentPen; } @@ -73,9 +73,9 @@ RS_Pen QG_PenToolBar::getPen() * Called by the layer list if this object was added as a listener * to a layer list. */ -void QG_PenToolBar::layerActivated(RS_Layer * l) +void PenToolBar::layerActivated(RS_Layer * l) { - //printf("QG_PenToolBar::layerActivated\n"); + //printf("PenToolBar::layerActivated\n"); if (l == NULL) return; @@ -97,14 +97,14 @@ void QG_PenToolBar::layerActivated(RS_Layer * l) * Called by the layer list (if this object was previously * added as a listener to a layer list). */ -void QG_PenToolBar::layerEdited(RS_Layer *) +void PenToolBar::layerEdited(RS_Layer *) { } /** * Called when the color was changed by the user. */ -void QG_PenToolBar::slotColorChanged(const RS_Color & color) +void PenToolBar::slotColorChanged(const RS_Color & color) { currentPen.setColor(color); //printf(" color changed\n"); @@ -115,7 +115,7 @@ void QG_PenToolBar::slotColorChanged(const RS_Color & color) /** * Called when the width was changed by the user. */ -void QG_PenToolBar::slotWidthChanged(RS2::LineWidth w) +void PenToolBar::slotWidthChanged(RS2::LineWidth w) { currentPen.setWidth(w); //printf(" width changed\n"); @@ -126,7 +126,7 @@ void QG_PenToolBar::slotWidthChanged(RS2::LineWidth w) /** * Called when the linetype was changed by the user. */ -void QG_PenToolBar::slotLineTypeChanged(RS2::LineType w) +void PenToolBar::slotLineTypeChanged(RS2::LineType w) { currentPen.setLineType(w); //printf(" line type changed\n"); diff --git a/src/widgets/pentoolbar.h b/src/widgets/pentoolbar.h index 0a0fd5a..c08f006 100644 --- a/src/widgets/pentoolbar.h +++ b/src/widgets/pentoolbar.h @@ -5,21 +5,21 @@ //#include "rs_layerlistlistener.h" #include "rs_pen.h" -class QG_ColorBox; -class QG_WidthBox; -class QG_LineTypeBox; +class ColorBox; +class WidthBox; +class LineTypeBox; class RS_Layer; /** * A toolbar that offers all widgets for choosing a pen. */ -class QG_PenToolBar: public QToolBar//, public RS_LayerListListener +class PenToolBar: public QToolBar//, public RS_LayerListListener { Q_OBJECT public: - QG_PenToolBar(QMainWindow * parent = NULL, const char * name = NULL); - virtual ~QG_PenToolBar(); + PenToolBar(QMainWindow * parent = NULL, const char * name = NULL); + virtual ~PenToolBar(); RS_Pen getPen(); @@ -37,9 +37,9 @@ class QG_PenToolBar: public QToolBar//, public RS_LayerListListener private: RS_Pen currentPen; - QG_ColorBox * colorBox; - QG_WidthBox * widthBox; - QG_LineTypeBox * lineTypeBox; + ColorBox * colorBox; + WidthBox * widthBox; + LineTypeBox * lineTypeBox; }; #endif // __PENTOOLBAR_H__ diff --git a/src/widgets/qg_dialogfactory.cpp b/src/widgets/qg_dialogfactory.cpp index c7b3f0a..6398633 100644 --- a/src/widgets/qg_dialogfactory.cpp +++ b/src/widgets/qg_dialogfactory.cpp @@ -17,7 +17,7 @@ #include "qg_dialogfactory.h" #include "graphicview.h" -#include "qg_layerwidget.h" +#include "layerwidget.h" #include "qg_mainwindowinterface.h" #include "actiondimlinear.h" #include "actioninterface.h" diff --git a/src/widgets/qg_mainwindowinterface.h b/src/widgets/qg_mainwindowinterface.h index 8d00ff0..2e6e698 100644 --- a/src/widgets/qg_mainwindowinterface.h +++ b/src/widgets/qg_mainwindowinterface.h @@ -4,7 +4,7 @@ #include "rs_mainwindowinterface.h" class QMainWindow; -class QG_ActionHandler; +class ActionHandler; /** * Interface for main application windows. @@ -16,7 +16,7 @@ class QG_MainWindowInterface: public RS_MainWindowInterface virtual ~QG_MainWindowInterface() {} virtual QMainWindow * GetMainWindow() = 0; - virtual QG_ActionHandler * getActionHandler() = 0; + virtual ActionHandler * getActionHandler() = 0; virtual void setFocus2() = 0; }; diff --git a/src/widgets/widthbox.cpp b/src/widgets/widthbox.cpp index da3336d..3af0de3 100644 --- a/src/widgets/widthbox.cpp +++ b/src/widgets/widthbox.cpp @@ -21,7 +21,7 @@ * Default Constructor. You must call init manually if you choose * to use this constructor. */ -QG_WidthBox::QG_WidthBox(QWidget * parent, const char */*name*/): QComboBox(parent) +WidthBox::WidthBox(QWidget * parent, const char */*name*/): QComboBox(parent) { showByLayer = false; showUnchanged = false; @@ -34,7 +34,7 @@ QG_WidthBox::QG_WidthBox(QWidget * parent, const char */*name*/): QComboBox(pare * * @param showByLayer true: Show attributes ByLayer, ByBlock */ -QG_WidthBox::QG_WidthBox(bool showByLayer, bool showUnchanged, QWidget * parent, const char */*name*/): +WidthBox::WidthBox(bool showByLayer, bool showUnchanged, QWidget * parent, const char */*name*/): QComboBox(parent) { init(showByLayer, showUnchanged); @@ -43,7 +43,7 @@ QG_WidthBox::QG_WidthBox(bool showByLayer, bool showUnchanged, QWidget * parent, /** * Destructor */ -QG_WidthBox::~QG_WidthBox() +WidthBox::~WidthBox() { } @@ -53,7 +53,7 @@ QG_WidthBox::~QG_WidthBox() * * @param showByLayer true: Show attributes ByLayer, ByBlock */ -void QG_WidthBox::init(bool showByLayer, bool showUnchanged) +void WidthBox::init(bool showByLayer, bool showUnchanged) { this->showByLayer = showByLayer; this->showUnchanged = showUnchanged; @@ -97,7 +97,7 @@ void QG_WidthBox::init(bool showByLayer, bool showUnchanged) slotWidthChanged(currentIndex()); } -RS2::LineWidth QG_WidthBox::getWidth() +RS2::LineWidth WidthBox::getWidth() { return currentWidth; } @@ -105,9 +105,9 @@ RS2::LineWidth QG_WidthBox::getWidth() /** * Sets the currently selected width item to the given width. */ -void QG_WidthBox::setWidth(RS2::LineWidth w) +void WidthBox::setWidth(RS2::LineWidth w) { - RS_DEBUG->print("QG_WidthBox::setWidth %d\n", (int)w); + RS_DEBUG->print("WidthBox::setWidth %d\n", (int)w); int offset = (int)showByLayer * 2 + (int)showUnchanged; switch (w) @@ -116,13 +116,13 @@ void QG_WidthBox::setWidth(RS2::LineWidth w) if (showByLayer) setCurrentIndex(0 + (int)showUnchanged); else - RS_DEBUG->print(RS_Debug::D_WARNING, "QG_WidthBox::setWidth: Unsupported width."); + RS_DEBUG->print(RS_Debug::D_WARNING, "WidthBox::setWidth: Unsupported width."); break; case RS2::WidthByBlock: if (showByLayer) setCurrentIndex(1 + (int)showUnchanged); else - RS_DEBUG->print(RS_Debug::D_WARNING, "QG_WidthBox::setWidth: Unsupported width."); + RS_DEBUG->print(RS_Debug::D_WARNING, "WidthBox::setWidth: Unsupported width."); break; case RS2::WidthDefault: setCurrentIndex(0 + offset); @@ -209,7 +209,7 @@ void QG_WidthBox::setWidth(RS2::LineWidth w) /** * Sets the pixmap showing the width of the "By Layer" item. */ -void QG_WidthBox::setLayerWidth(RS2::LineWidth w) +void WidthBox::setLayerWidth(RS2::LineWidth w) { if (showByLayer) { @@ -279,7 +279,7 @@ void QG_WidthBox::setLayerWidth(RS2::LineWidth w) } } -bool QG_WidthBox::isUnchanged() +bool WidthBox::isUnchanged() { return unchanged; } @@ -290,9 +290,9 @@ bool QG_WidthBox::isUnchanged() * offers a dialog to the user that allows him/ her to * choose an individual width. */ -void QG_WidthBox::slotWidthChanged(int index) +void WidthBox::slotWidthChanged(int index) { - RS_DEBUG->print("QG_WidthBox::slotWidthChanged %d\n", index); + RS_DEBUG->print("WidthBox::slotWidthChanged %d\n", index); bool done = false; diff --git a/src/widgets/widthbox.h b/src/widgets/widthbox.h index f7a9210..34fc7ad 100644 --- a/src/widgets/widthbox.h +++ b/src/widgets/widthbox.h @@ -7,14 +7,14 @@ /** * A combobox for choosing a line width. */ -class QG_WidthBox: public QComboBox +class WidthBox: public QComboBox { Q_OBJECT public: - QG_WidthBox(QWidget * parent = 0, const char * name = 0); - QG_WidthBox(bool showByLayer, bool showUnchanged, QWidget * parent = 0, const char * name = 0); - virtual ~QG_WidthBox(); + WidthBox(QWidget * parent = 0, const char * name = 0); + WidthBox(bool showByLayer, bool showUnchanged, QWidget * parent = 0, const char * name = 0); + virtual ~WidthBox(); void init(bool showByLayer, bool showUnchanged); RS2::LineWidth getWidth();