]> Shamusworld >> Repos - architektonas/commitdiff
Sanity check stage II: rename classes...
authorShamus Hammons <jlhamm@acm.org>
Wed, 4 Aug 2010 13:29:09 +0000 (13:29 +0000)
committerShamus Hammons <jlhamm@acm.org>
Wed, 4 Aug 2010 13:29:09 +0000 (13:29 +0000)
133 files changed:
architektonas.pro
src/actions/actiondefault.cpp
src/actions/actiondimaligned.cpp
src/actions/actiondimangular.cpp
src/actions/actiondimdiametric.cpp
src/actions/actiondimleader.cpp
src/actions/actiondimlinear.cpp
src/actions/actiondimradial.cpp
src/actions/actiondrawarc.cpp
src/actions/actiondrawarctangential.cpp
src/actions/actiondrawcircle.cpp
src/actions/actiondrawcirclecr.cpp
src/actions/actiondrawellipseaxis.cpp
src/actions/actiondrawhatch.cpp
src/actions/actiondrawline.cpp
src/actions/actiondrawlineangle.cpp
src/actions/actiondrawlinebisector.cpp
src/actions/actiondrawlinefree.cpp
src/actions/actiondrawlinehorvert.cpp
src/actions/actiondrawlineparallel.cpp
src/actions/actiondrawlineparallelthrough.cpp
src/actions/actiondrawlinepolygon.cpp
src/actions/actiondrawlinepolygon2.cpp
src/actions/actiondrawlinerectangle.cpp
src/actions/actiondrawlinerelangle.cpp
src/actions/actiondrawlinetangent1.cpp
src/actions/actiondrawlinetangent2.cpp
src/actions/actiondrawspline.cpp
src/actions/actiondrawtext.cpp
src/actions/actioninfoangle.cpp
src/actions/actioninfoarea.cpp
src/actions/actioninfodist.cpp
src/actions/actioninfodist2.cpp
src/actions/actioninfototallength.cpp
src/actions/actionmodifybevel.cpp
src/actions/actionmodifycut.cpp
src/actions/actionmodifydelete.cpp
src/actions/actionmodifydeletequick.cpp
src/actions/actionmodifyentity.cpp
src/actions/actionmodifymirror.cpp
src/actions/actionmodifymove.cpp
src/actions/actionmodifymoverotate.cpp
src/actions/actionmodifyrotate.cpp
src/actions/actionmodifyrotate2.cpp
src/actions/actionmodifyround.cpp
src/actions/actionmodifyscale.cpp
src/actions/actionmodifystretch.cpp
src/actions/actionmodifytrim.cpp
src/actions/actionmodifytrimamount.cpp
src/actions/actionselectcontour.cpp
src/actions/actionselectintersected.cpp
src/actions/actionselectlayer.cpp
src/actions/actionselectsingle.cpp
src/actions/actionselectwindow.cpp
src/actions/actionsnapintersectionmanual.cpp
src/actions/actiontoolregeneratedimensions.cpp
src/actions/actionzoomwindow.cpp
src/base/rs_staticgraphicview.cpp
src/base/rs_variabledict.cpp
src/forms/arcoptions.cpp
src/forms/arctangentialoptions.cpp
src/forms/beveloptions.cpp
src/forms/blockdialog.cpp
src/forms/cadtoolbar.cpp
src/forms/cadtoolbar.h
src/forms/cadtoolbarmain.cpp
src/forms/cadtoolbarselect.cpp
src/forms/cadtoolbarselect.h
src/forms/circleoptions.cpp
src/forms/commandwidget.cpp
src/forms/commandwidget.h
src/forms/commandwidget.ui
src/forms/dimlinearoptions.cpp
src/forms/dimoptions.cpp
src/forms/dlgarc.ui
src/forms/dlgattributes.ui
src/forms/dlgcircle.ui
src/forms/dlgdimension.ui
src/forms/dlgdimlinear.ui
src/forms/dlgellipse.ui
src/forms/dlghatch.ui
src/forms/dlginsert.ui
src/forms/dlgline.ui
src/forms/dlgpoint.ui
src/forms/dlgspline.ui
src/forms/dlgtext.ui
src/forms/imageoptions.cpp
src/forms/librarywidget.cpp
src/forms/librarywidget.h
src/forms/lineangleoptions.cpp
src/forms/linebisectoroptions.cpp
src/forms/lineoptions.cpp
src/forms/lineparalleloptions.cpp
src/forms/lineparallelthroughoptions.cpp
src/forms/linerelangleoptions.cpp
src/forms/moverotateoptions.cpp
src/forms/roundoptions.cpp
src/forms/splineoptions.cpp
src/forms/textoptions.cpp
src/forms/widgetpen.ui
src/mainapp/applicationwindow.cpp
src/mainapp/applicationwindow.h
src/mainapp/mdiwindow.cpp
src/mainapp/mdiwindow.h
src/mainapp/qc_dialogfactory.cpp
src/widgets/actionhandler.cpp
src/widgets/actionhandler.h
src/widgets/blockwidget.cpp
src/widgets/blockwidget.h
src/widgets/colorbox.cpp
src/widgets/colorbox.h
src/widgets/commandedit.cpp
src/widgets/commandedit.h
src/widgets/filedialog.cpp
src/widgets/filedialog.h
src/widgets/fontbox.cpp
src/widgets/fontbox.h
src/widgets/layerbox.cpp
src/widgets/layerbox.h
src/widgets/layerwidget.cpp
src/widgets/layerwidget.h
src/widgets/linetypebox.cpp
src/widgets/linetypebox.h
src/widgets/listviewitem.cpp
src/widgets/listviewitem.h
src/widgets/patternbox.cpp
src/widgets/patternbox.h
src/widgets/pentoolbar.cpp
src/widgets/pentoolbar.h
src/widgets/qg_dialogfactory.cpp
src/widgets/qg_mainwindowinterface.h
src/widgets/widthbox.cpp
src/widgets/widthbox.h

index 2e5452183ea2a033b889f9d35ec3c9eb7ec5aea6..7d4bb33d01e4389b316bbbc5b4a4cee52044834a 100644 (file)
@@ -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 \
index c58d2ba172e2d75ff7cf85a2469a2e501c951f96..19e0bc1864d352cd2c626c09216d4a010d530ec0 100644 (file)
@@ -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"
index c14324da3b186f4165f95ddb5a116b5874e6e15d..278b2e377911765c67825864281c5f590f86c0f2 100644 (file)
@@ -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"
index 63970a01b740effa3d558a04cbb4b91fc4cb60db..dcac4a5bf8a47d5fe8f0dead7113af6ae2baf838 100644 (file)
@@ -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"
index ed094f5f32eebcdcb0f1ebd28e93d13cbf566f81..6de5c216f760b0d85e6b238f0afcaf39854fec01 100644 (file)
@@ -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"
index bcb31a05d0ab5192576bd3e0e21c85fabfb3c476..31cd29e5790f817e24f7d3da0db3290443105217 100644 (file)
@@ -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"
index 8a03806aebd8dc59f9392a250eb2e3b4391eafc2..6603284a0e25f469155d1496aeaad46a780b9967 100644 (file)
@@ -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"
index 2c2e3364f5f4fd65db0c61426de71b9680103d81..5cc524176cb846bb885283bf50f7f037193711ec 100644 (file)
@@ -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"
index 8782be83759c308894f9b216a8221425f8e357b8..184781c0873828d6f10a1d4c77d9b41f25d7dd17 100644 (file)
@@ -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"
index adb7f52051f86bfc12d6cdbc91539592abcb9b39..7cf9e1196cbb629a4ee1cd448c278316a14ed769 100644 (file)
@@ -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"
index 5e2b7028bbb8d23b7b0919203d2e846f39396e56..d00973f6dde3eb0487788ff8cb53f20c0e105fcf 100644 (file)
@@ -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"
index 8622a16b22461b1f43bb39866e32356eff8e3d33..a84a93d62110d27378e3d46ea0fdfe8b3beb4ebc 100644 (file)
@@ -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"
index bd089d3536dbaa0dd1dbe44f12c03ef633e0d990..717fc37e2ea2c51557e00c9f385a5f1c1380e673 100644 (file)
@@ -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"
index e2332b5efe2cd08886adc5fdd1f54555de611b60..a12530e9df1b9881508e583a5e91dea80fccdd60 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actiondrawhatch.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "graphicview.h"
 #include "rs_information.h"
index ecb5b1c5c2a0e6d3648ca5e12794708833be5607..9817bbaaf99ad039d437402583e69f55e5e16a8a 100644 (file)
@@ -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"
index fc08356198a4dce1fa48a32b6456a1df809d9cfa..0022d6fd3137d095c2959de82d08e38c53de08b2 100644 (file)
@@ -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"
index deb7580cd2bfbad73a1cd9d1b668efe56f8d8463..78b8581809bff58cad6cd55a5b24a3f26070bb7a 100644 (file)
@@ -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"
index 1f6683df8ef537117a1d01a72b24845449f35e24..a54c4c2956dda0ec4a834121badaaac7656b7f14 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actiondrawlinefree.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "graphicview.h"
 #include "rs_polyline.h"
index 294b2f0395b1f50ca17ad4b3fe4f78c5d9e8fc25..7dad93cf22946abb76d48d89d10db69d3f66166e 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actiondrawlinehorvert.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "graphicview.h"
 #include "rs_preview.h"
index 8701b6ad5c8f71c4ae14f35d684b95f6243b5a29..3d1c0ff96ae5f31d1bf40c46ddea05133ab62017 100644 (file)
@@ -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"
index 612677d9748655147e82c7ecee39d121a7a0ab26..a974edded82827523ccf1837227c36498e227246 100644 (file)
@@ -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"
index 7654e1b255ed1c46feed3aecd1b49b2fa9c7610f..00d1e6668f9035944551b4f8ff52a3d58b7929d2 100644 (file)
@@ -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"
index afb25d838143e6d59225afa20767aedb876e4baf..c2c404f9248e07b3a468980b9d4e43543d3ac6ba 100644 (file)
@@ -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"
index 950d72c16d5b7a646d498e793b21586b5c5e8bee..f3c4190b97575d01a27372cb73c41199a69deb70 100644 (file)
@@ -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"
index d98d26a1610e3998c41be27526496f9ee0ccd707..e56e41d6e7f56cd3079218763da465bfb9ed754c 100644 (file)
@@ -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"
index 90ffa303527b397095a0bdb4ae332dcc62515c3f..426fc9f7d4d8a5a7d1dc8a9e670e9b7f9b5cd08e 100644 (file)
@@ -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"
index 82d36a3c944955bd743708da050a208ecbb43831..0238dfa3d379a2517269794ea35ef312dccc0c6a 100644 (file)
@@ -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"
index 9d06bf7933c7fadc999497029c3150df80497abf..b50943292ae6c6a7e7e42992cd0382a2535a74e4 100644 (file)
@@ -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"
index 06576716b0d58bac1680507f3b879a8b64eb4155..2de93f39032d82cf8342961eeb40bb0338880cb5 100644 (file)
@@ -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"
index 94221ed6ee6e10fb9f6ab84765eb423f51c649e6..e0dff359196352f2b52e76e08bc9c837ae3241af 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actioninfoangle.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "graphicview.h"
 #include "rs_information.h"
index 04dff283adddd678bbd034707f65c0c2fdfc55be..8d6af6d4630693a2733b6fd3e6ff5d8706d5a80d 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actioninfoarea.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "graphicview.h"
 #include "rs_preview.h"
index f14006c1e277e653652b5e499880d1e5061745de..a9bb31bc5fc05c1b8119663fbf890f746aca7f2f 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actioninfodist.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "graphicview.h"
 #include "rs_preview.h"
index cfab90d12d7c4e684742957817128dd51a6fd134..ed462d740cdbe6b31846d40a54c8886f604f8b13 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actioninfodist2.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "graphicview.h"
 #include "rs_preview.h"
index 0155270a35ea2aa7fc4135b779468146812de26a..deee3691fba35c9146cb79b2aecf1826455e9e36 100644 (file)
@@ -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",
index 3efc2152d348cc54102265d061ac8ff0da3a6221..4c0a6f3eab76abae15492afa9645ebd1b57a636d 100644 (file)
@@ -17,6 +17,7 @@
 #include "actionmodifybevel.h"
 
 #include "rs_commandevent.h"
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "rs_information.h"
 
index 000c75a675cce393242544569d0726e649b9f085..bcfceb568ef9bbf801ea9a70e7665f66427f9ab3 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actionmodifycut.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "graphicview.h"
 #include "rs_modification.h"
index a4167983f433c2409776f685b787c0fe664b8df5..dfe22514edb7b666fac09e362af79d6e10732514 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actionmodifydelete.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "graphicview.h"
 #include "rs_modification.h"
index eeeddf7e32895482033fb90a0e99eb5273b231ef..b2d6a46d0720950d43036c94cbd5fd19e7e3acf8 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actionmodifydeletequick.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "graphicview.h"
 
index 93cf9965ff6b1e0b274202609e693a105da40e2a..8b825654d9a0002a9f6602050cba82e42afd7199 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actionmodifyentity.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "graphicview.h"
 
index e6a239bd3d49f3c52539303ae4767e23ec160819..44cc340200a7c63691ebb64505b0686850b130b6 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actionmodifymirror.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "rs_preview.h"
 
index 070f65b07a9cc7bed57341af245861ff089d487e..aaf0251921607751d5eb1c3daa781b0869e14d58 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actionmodifymove.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "rs_preview.h"
 
index e09db7219d6f15fe8a3accf76746b4739acd16d5..961ab2ad489979f3cc6f1edc42e7b9c23d249c3d 100644 (file)
@@ -17,6 +17,7 @@
 #include "actionmodifymoverotate.h"
 
 #include "rs_commandevent.h"
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "rs_preview.h"
 
index 893b36ba41b2c4cf0303f68e70510243a8d4496f..70b4ae5b691d490b35ac4543450595caab46ee6e 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actionmodifyrotate.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 
 ActionModifyRotate::ActionModifyRotate(RS_EntityContainer & container, GraphicView & graphicView):
index 51530e5f58bcc7094eaeeafb9d9389a13acfcccb..d859214e184c7ffc45982ffdd1d94149d3815991 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actionmodifyrotate2.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 
 ActionModifyRotate2::ActionModifyRotate2(
index 6ff5a09ec5923d98ac70bcee05b6ea4d07f7eb5f..87d2ddcf10c509d5f7870e808a7abea431e958d3 100644 (file)
@@ -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"
index e4d8dceec6b705a34e8ca79ce723a289fce28a21..8e2aa389efa76979f50bee383bb43354a7a76183 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actionmodifyscale.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 
 ActionModifyScale::ActionModifyScale(RS_EntityContainer & container, GraphicView & graphicView):
index de95114501d4625b990c65e09f47e3323fdd4d67..a61f07c26a74d14ff65226ac3128a2c30f6ca132 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actionmodifystretch.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "rs_modification.h"
 #include "rs_preview.h"
index 45601066a49f107919c8a6ec59d39c4dfd71e29b..884aea5b39ba5879144df37edbd1d8bdcc364a43 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actionmodifytrim.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "rs_modification.h"
 
index 7d2e4613c4ad812168d5250a4fcc66fb76e5958f..21f2acab4098fdbfb5c9e425bea2f482f9d87369 100644 (file)
@@ -17,6 +17,7 @@
 #include "actionmodifytrimamount.h"
 
 #include "rs_commandevent.h"
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "rs_modification.h"
 
index ebedace064b3c26d3ff86cbc0c69e420f2a250c4..51477af01e7f91bd20bd0740ba3290e7c3c097cd 100644 (file)
@@ -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,
index 27b3fd5351b1e78575bcb8e522820fb2491cea68..b571d2b6873ff57dccb92d80589b6c7f7ea311e7 100644 (file)
@@ -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"
 
index bc235ed9ca0843650163af5bfbc702796daa6aa8..04181561b38dee71e17cb25653030d908ea1357f 100644 (file)
@@ -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):
index 9a54b6fee26ba415839ca501a0e109641b361f19..daffbf0a2a9e57909bb5db7daa93524763758d71 100644 (file)
@@ -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):
index c4f76b7157d9b27bbccfb2df0d04268b8f838f06..06d0ba174da10eb4fafda6a98eaf150624e1ede5 100644 (file)
@@ -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"
 
index dc692df90a7902522509f8343b861cb77562789e..df4e13b127aa1daf07460985a33522f9b338cd30 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actionsnapintersectionmanual.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "graphicview.h"
 #include "rs_information.h"
index a1d9d5f1d9362d0f38923a14d6d1f8d4b5cb3e01..0494e0695f51fe54543858828639d28aa005f1fb 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actiontoolregeneratedimensions.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "rs_dimension.h"
 #include "graphicview.h"
index 1bdde375c627f0a6f1bd100701fbe35e5ebf0ef3..c204847e72a447af500a4db5aa429031f4f041e8 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "actionzoomwindow.h"
 
+#include "rs_debug.h"
 #include "rs_dialogfactory.h"
 #include "graphicview.h"
 #include "rs_preview.h"
index 83d9deb145e588e7d967e232d8bdf2000a97f969..2451576a6797b61b54e46a0e372431304b8136a5 100644 (file)
@@ -23,6 +23,8 @@ just me. >:-)
 
 #include "rs_staticgraphicview.h"
 
+#include "rs_debug.h"
+
 /**
  * Constructor.
  *
index d03aef099ba3315071922822b44e13e64ff3800a..a85bb523eea16446a58b18f463c5ceecdf91db6c 100644 (file)
@@ -286,13 +286,11 @@ std::ostream & operator<<(std::ostream & os, RS_VariableDict & d)
 //     Q3DictIterator<RS_Variable> it(d.variables);
        QHashIterator<QString, RS_Variable *> 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:
index 4811be29eefff6576a1ea449ae33dc5414ffe273..cada2cddad07a133bd94945c372c8516135cd63a 100644 (file)
@@ -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*/):
index e35c445427dd9b3a50c7f2715dbf75a0099f4324..67d64200b583e46d5cff7856f1babfd16bd6a4f0 100644 (file)
@@ -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*/):
index a99f7f20b1a95541bb684f954313bb5075b0023a..bbfbd71994d344d2016a79df4b5b5c8c9f2beac6 100644 (file)
@@ -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*/):
index a3666d23fd8425dbf0ea9750a7cc7a58a320de45..99d8d674d380abad149bad119f0212f27aa16928 100644 (file)
@@ -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)
index 5680f1da1aea518fc3f1f646c0ae6e4e293978ed..d1ace027ae07b9ea6c48c8d72673d259ae07192c 100644 (file)
@@ -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);
index dcf03f88218eb4ec3a1fbb375e072387f6032c3d..2810f619b228d21a478976c5fdfaf0d5c6674680 100644 (file)
@@ -4,7 +4,7 @@
 #include <QtGui>
 
 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;
index 8afef2db33f2bb8afb9130962ee03addc5fb8efc..ab47b215ed5fb2705d866030083959ab7ab9ee49 100644 (file)
 
 #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);
index 7fffd1039e6e3547a9aa854923c53413f365e31d..adf8a03c64379f1ef195900eff96574419d0aae2 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "cadtoolbarselect.h"
 
-#include "qg_actionhandler.h"
+#include "actionhandler.h"
 #include "actioninterface.h"
 #include "cadtoolbar.h"
 #include "createqtactions.h"
index 4ba9aa155495b9feeaea9b1a9326157f764db512..34ea3138f729c2b7096c0f4af21830bb93e25d90 100644 (file)
@@ -4,7 +4,7 @@
 #include <QtGui>
 
 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;
 };
index 348e3fe7569e96f6a2999a32991a2dbfd420f6a3..90c3d9891ee002bb90dd86e631ba7d978f0e2929 100644 (file)
@@ -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*/):
index ab2a91249a345733c812d32d3c158273d5828138..d4c342eee13d298075f42a049aa2f3a340eb4b0b 100644 (file)
@@ -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;
 }
index 76c7cc63dbb2e6e7d912c6b89a6814d52c39fa81..defeb7192704fc0cf160e01bdfc0fa64c1a27292 100644 (file)
@@ -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;
index c91bf12db75d2bfb719b56c8b233d94c78df1d4a..801cd85e01f2d7203ff2ae3aece70a01fd3676dd 100644 (file)
@@ -52,7 +52,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QG_CommandEdit" name="leCommand" native="true">
+      <widget class="CommandEdit" name="leCommand" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
@@ -68,9 +68,9 @@
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>QG_CommandEdit</class>
+   <class>CommandEdit</class>
    <extends>QWidget</extends>
-   <header>qg_commandedit.h</header>
+   <header>commandedit.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
index e4a30bb8ac0e2024e64d99d064ec95575011b5f7..08f30f5f426486a5968c3dd55b39236cf0dc9c9d 100644 (file)
@@ -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*/):
index b47929954d0c907cdd2d1e4a98197a0af1de4019..0e8c51dd83598bddf811562404cf76f8716d48f9 100644 (file)
@@ -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*/):
index f3d0928e9025e401b531cf02dbe3698e8c9a370a..7c8f788b3fc5bb00b4612ebef1233a0fced6f483 100644 (file)
@@ -49,7 +49,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QG_LayerBox" name="cbLayer" native="true"/>
+          <widget class="LayerBox" name="cbLayer" native="true"/>
          </item>
         </layout>
        </item>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>QG_LayerBox</class>
+   <class>LayerBox</class>
    <extends>QWidget</extends>
-   <header>qg_layerbox.h</header>
+   <header>layerbox.h</header>
   </customwidget>
   <customwidget>
    <class>WidgetPen</class>
index f93b4dbe503dd7b465d32fc11bf9ba86cd4b32a4..b63eabfd90f2432fa2adc0096d3180372c21e36d 100644 (file)
@@ -49,7 +49,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QG_LayerBox" name="cbLayer" native="true"/>
+          <widget class="LayerBox" name="cbLayer" native="true"/>
          </item>
         </layout>
        </item>
    <header>widgetpen.h</header>
   </customwidget>
   <customwidget>
-   <class>QG_LayerBox</class>
+   <class>LayerBox</class>
    <extends>QWidget</extends>
-   <header>qg_layerbox.h</header>
+   <header>layerbox.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
index 7e4d626017491947e97d79124e0f792862f747a0..346775a0c1061deb7cc03ca009c4664e0df0121e 100644 (file)
@@ -49,7 +49,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QG_LayerBox" name="cbLayer" native="true"/>
+          <widget class="LayerBox" name="cbLayer" native="true"/>
          </item>
         </layout>
        </item>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>QG_LayerBox</class>
+   <class>LayerBox</class>
    <extends>QWidget</extends>
-   <header>qg_layerbox.h</header>
+   <header>layerbox.h</header>
   </customwidget>
   <customwidget>
    <class>WidgetPen</class>
index 37336e947e14f82c5658b3ed2baf72c7ed001446..b6d199215285b1dd460da874db3378bf14a519e6 100644 (file)
@@ -52,7 +52,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QG_LayerBox" name="cbLayer" native="true"/>
+          <widget class="LayerBox" name="cbLayer" native="true"/>
          </item>
         </layout>
        </item>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>QG_LayerBox</class>
+   <class>LayerBox</class>
    <extends>QWidget</extends>
-   <header>qg_layerbox.h</header>
+   <header>layerbox.h</header>
   </customwidget>
   <customwidget>
    <class>WidgetPen</class>
index 1aeed2cd298ca75032bb3658ffe204c7fc781b60..f5c829913e85cc4fa32e30aa85c5d8801c9ab657 100644 (file)
@@ -52,7 +52,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QG_LayerBox" name="cbLayer" native="true"/>
+          <widget class="LayerBox" name="cbLayer" native="true"/>
          </item>
         </layout>
        </item>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>QG_LayerBox</class>
+   <class>LayerBox</class>
    <extends>QWidget</extends>
-   <header>qg_layerbox.h</header>
+   <header>layerbox.h</header>
   </customwidget>
   <customwidget>
    <class>WidgetPen</class>
index 6f8df0789b130a0b8faf051aef6b3d8490bccbad..8958162a0d67020533d72d7fccb2489e5aed019a 100644 (file)
@@ -49,7 +49,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QG_LayerBox" name="cbLayer" native="true"/>
+          <widget class="LayerBox" name="cbLayer" native="true"/>
          </item>
         </layout>
        </item>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>QG_LayerBox</class>
+   <class>LayerBox</class>
    <extends>QWidget</extends>
-   <header>qg_layerbox.h</header>
+   <header>layerbox.h</header>
   </customwidget>
   <customwidget>
    <class>WidgetPen</class>
index 556c86d58cb10fdf4bb08600f954f6bc682c19c8..89145e3954130480ff97d6bf6965a628cb68a7b3 100644 (file)
@@ -49,7 +49,7 @@
          </widget>
         </item>
         <item row="1" column="0" colspan="2">
-         <widget class="QG_PatternBox" name="cbPattern" native="true"/>
+         <widget class="PatternBox" name="cbPattern" native="true"/>
         </item>
         <item row="0" column="0" colspan="2">
          <widget class="QCheckBox" name="cbSolid">
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>QG_PatternBox</class>
+   <class>PatternBox</class>
    <extends>QWidget</extends>
-   <header>qg_patternbox.h</header>
+   <header>patternbox.h</header>
   </customwidget>
   <customwidget>
    <class>QG_GraphicView</class>
index 60ef49fb3e795d592954e4f33a499a2447ecd31a..51537e13874e7f5eee2ca362a58729553c6f0086 100644 (file)
@@ -49,7 +49,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QG_LayerBox" name="cbLayer" native="true"/>
+          <widget class="LayerBox" name="cbLayer" native="true"/>
          </item>
         </layout>
        </item>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>QG_LayerBox</class>
+   <class>LayerBox</class>
    <extends>QWidget</extends>
-   <header>qg_layerbox.h</header>
+   <header>layerbox.h</header>
   </customwidget>
   <customwidget>
    <class>WidgetPen</class>
index b5140d0d61c56e2615cde908294c62d6247479e5..17c959c1a55e4e2811cd8eeae1ed1b3f43ba2c71 100644 (file)
@@ -49,7 +49,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QG_LayerBox" name="cbLayer" native="true"/>
+          <widget class="LayerBox" name="cbLayer" native="true"/>
          </item>
         </layout>
        </item>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>QG_LayerBox</class>
+   <class>LayerBox</class>
    <extends>QWidget</extends>
-   <header>qg_layerbox.h</header>
+   <header>layerbox.h</header>
   </customwidget>
   <customwidget>
    <class>WidgetPen</class>
index 1a670d702b50a98b09f28071717ac2becf6a9692..a9f8c9fc770e9f9a15cebf6908d27e2d0ee90ed9 100644 (file)
@@ -49,7 +49,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QG_LayerBox" name="cbLayer" native="true"/>
+          <widget class="LayerBox" name="cbLayer" native="true"/>
          </item>
         </layout>
        </item>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>QG_LayerBox</class>
+   <class>LayerBox</class>
    <extends>QWidget</extends>
-   <header>qg_layerbox.h</header>
+   <header>layerbox.h</header>
   </customwidget>
   <customwidget>
    <class>WidgetPen</class>
index 84a025bae9b8db93692d391f1f12e634549bf3e9..173664857b2b256a89f6543127dc07a7f44d7dce 100644 (file)
@@ -49,7 +49,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QG_LayerBox" name="cbLayer" native="true"/>
+          <widget class="LayerBox" name="cbLayer" native="true"/>
          </item>
         </layout>
        </item>
    <header>widgetpen.h</header>
   </customwidget>
   <customwidget>
-   <class>QG_LayerBox</class>
+   <class>LayerBox</class>
    <extends>QWidget</extends>
-   <header>qg_layerbox.h</header>
+   <header>layerbox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
index 6a49fe76f224f4aef25b23a9146e2d324fbd46ce..af6ffe9535570e16ecd01a69d12353abaefcc899 100644 (file)
@@ -76,7 +76,7 @@
            </spacer>
           </item>
           <item row="0" column="0" colspan="2">
-           <widget class="QG_FontBox" name="cbFont" native="true">
+           <widget class="FontBox" name="cbFont" native="true">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>QG_FontBox</class>
+   <class>FontBox</class>
    <extends>QWidget</extends>
-   <header>qg_fontbox.h</header>
+   <header>fontbox.h</header>
   </customwidget>
  </customwidgets>
  <resources>
index a47e841e861e798135b737a6c7bb3cf7bba2d12b..a0b6a96f78b603a8c1f3425ff1471ff62ae092f0 100644 (file)
 #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)
index a776438de4d8462fa6c63216afe7addff05f0512..75b05279e5ae5a3e797cfd757f0cc0f9b71dee49 100644 (file)
@@ -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));
index 4677ba89a6477cebd9addcbdbd7527db380561f5..6cf96ef3474d4bf7bbb27bbd831608f2b6cc9b1e 100644 (file)
@@ -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;
index e2e75b139de11829b8074c9b58aeb818e12b94af..dca00ae1c478729e9c7e4d9e12add1410f47799e 100644 (file)
@@ -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*/):
index 520b5bb41ccd66f2eabf6d04d4a4fbb874512f94..7a83da7322857e0328294553b18b494133cdfffc 100644 (file)
@@ -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*/):
index 4011668a5db30893aee610ca338c1b52a887d1dc..937bec45257d0ca880fe1c9aae6fdff172faed38 100644 (file)
@@ -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),
index c09af48d84cfbb3f0daa4921ad5a2ed08bc0d28c..573c627716a88bf63881261b85508c6e95e982bb 100644 (file)
@@ -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*/):
index a34da184a343dbf552c9a86bc9b93ac9536c8ac7..aed9775513889c64661d0cad4590c100e66c0a16 100644 (file)
@@ -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*/):
index 0861cda7736f1b228a7ca3ffb6d34a8540bbf772..2c49d76c2c94933d284f9d0999f4e41668175859 100644 (file)
@@ -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*/):
index 1018f6a28a2eab2d2e6699e38df7edd49dd33779..56d5aa04dd5dc00e3a63e774a2eafe9b9a28c916 100644 (file)
@@ -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*/):
index 115a69b7b446b21b335d45d0b3c3c23b62600ee0..9fce0ee31078f8b7f8328f74d139279173c610f4 100644 (file)
@@ -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*/):
index 2de99f6e3672a8f312a2e9a88b02ce6688f7e91f..b0a1de23d7ce01d5fa8fb11d16403ab7258a2fdd 100644 (file)
@@ -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*/):
index bbb293a09f2eb9d019b174a57bd7300288a6f0f7..00dbeaca28f0d054a7c73f0179dae97b5b8313cf 100644 (file)
@@ -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)
index 568138d4f73cfcf9b845a45b7240c9feb45624ed..71da83b1e44511f4dbd62ccfc60c4b10aef554de 100644 (file)
@@ -52,7 +52,7 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="QG_ColorBox" name="cbColor" native="true">
+       <widget class="ColorBox" name="cbColor" native="true">
         <property name="sizePolicy">
          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
           <horstretch>0</horstretch>
@@ -78,7 +78,7 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="QG_WidthBox" name="cbWidth" native="true">
+       <widget class="WidthBox" name="cbWidth" native="true">
         <property name="sizePolicy">
          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
           <horstretch>0</horstretch>
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="QG_LineTypeBox" name="cbLineType" native="true">
+       <widget class="LineTypeBox" name="cbLineType" native="true">
         <property name="sizePolicy">
          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
           <horstretch>0</horstretch>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>QG_ColorBox</class>
+   <class>ColorBox</class>
    <extends>QWidget</extends>
-   <header>qg_colorbox.h</header>
+   <header>colorbox.h</header>
   </customwidget>
   <customwidget>
-   <class>QG_WidthBox</class>
+   <class>WidthBox</class>
    <extends>QWidget</extends>
-   <header>qg_widthbox.h</header>
+   <header>widthbox.h</header>
   </customwidget>
   <customwidget>
-   <class>QG_LineTypeBox</class>
+   <class>LineTypeBox</class>
    <extends>QWidget</extends>
-   <header>qg_linetypebox.h</header>
+   <header>linetypebox.h</header>
   </customwidget>
  </customwidgets>
  <includes>
-  <include location="local">qg_linetypebox.h</include>
-  <include location="local">qg_colorbox.h</include>
-  <include location="local">qg_widthbox.h</include>
+  <include location="local">linetypebox.h</include>
+  <include location="local">colorbox.h</include>
+  <include location="local">widthbox.h</include>
  </includes>
  <resources/>
  <connections/>
index 42c90ccc72190f1325e2832dd608fe06b5a61449..22580a043e344ce1b0a537721bc9fe9974ee6c44 100644 (file)
@@ -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;
 }
index a8834af3a6860645091bc9e257d2c423e8202892..588de6d67a01b9ff162214a799534dad29ebf605 100644 (file)
@@ -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;
 
index 02b1d43997d3630d585a5614e5b1abed797f9b4f..1e7dc797f7e582a624251eed1c8aa0315eb589e8 100644 (file)
@@ -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())
        {
index d6ca611e3644b4641d5533eabf118ab29290692b..6b66aef8fedd100544c1ab91c658e75c66b45dd6 100644 (file)
@@ -2,9 +2,9 @@
 #define QC_MDIWINDOW_H
 
 #include <QtGui>
-#include "qg_layerwidget.h"
-#include "qg_pentoolbar.h"
 #include "rs_document.h"
+#include "layerwidget.h"
+#include "pentoolbar.h"
 
 class RS_EventHandler;
 class QG_GraphicView;
index f34ad8b507d06ae647429ae616991247b510023c..2f81da97a83b5fa8ff6e1b9ca319af17dadc0005 100644 (file)
@@ -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)
index e65a520f6cf8f9532741c2c3f444d7e83cb4a903..90731bbd2ccdf89d348803f73a9e74f6fcb6f28d 100644 (file)
 /**
  * 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;
 }
index 5d3792e7e5fbb19f1b4ce0ef34a447d607e0e58d..1d9ce52651f979adcd4c46271ac0de379be08035 100644 (file)
@@ -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);
index ff518bd7bc1616bd80109b047190241644621e92..50f6a4240bd48949cf49c7714c1140cd47e8c91e 100644 (file)
@@ -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())
        {
index 784df4ba2e463557e7579b51afb01f9b41e17c81..804d4eeac391b519a7bf4cbbee0228082cfff98f 100644 (file)
@@ -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__
index 38a77805ce2954b67604597e6a65e6198015a425..6be82573e72367521f86b4b4d0619e262c6b0e24 100644 (file)
@@ -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();
 
index a5e58b7fc19373aa1944b694fbaebaf38a2741a4..cbd9412183d8eaab4c6485031c98692b8f58dd46 100644 (file)
@@ -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);
index 95627ba2b292125afcc0234dc5c58c6fa5912877..f470009dbd5773f3ce1e888d5db4e9340b12acd5 100644 (file)
@@ -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);
index b72369dfe40010cf2fe3c61d331cfb3952c4a51c..4134016facac6bd406295a4bda80639342307464 100644 (file)
@@ -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);
index 0ee35ddf6843dfb685fc752d51f1ea2ef88024c7..5d36c605bafe65219882b02a2ada8cbe9306289f 100644 (file)
@@ -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;
index 33f3b186e7f619ee273819695f6434bcb7011ae1..6414f89366ca884b3e51c5f1816bd7755d421a9e 100644 (file)
@@ -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);
index 8ea742b69f8fec5b1a1d9c6ea83efe1983c31b6c..ba06a48e543bf2ffe455a02fab930e3077814858 100644 (file)
  * 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)
index e5eb61a43d81af0bf7c36e6398724d785f069fa0..ef39fe513baf5eaac3a08e5759cb58e2955c510d 100644 (file)
@@ -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();
index d8a8797d35e74e6e07fa080d7204954c3b0eb4c1..f40cf92bc85490a10d7dc18a4ac7c267805e357d 100644 (file)
@@ -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();
 
index f4ebb8635df341ca8544ceccb27a12f3a80f349d..678e142bbe65a699298b55993065374720c9ac7d 100644 (file)
@@ -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);
index 28e5f6ffefb8a59cbd61a007b871ce13112d3a09..447d4e7e1f991d1c98729c5ebde2e5ac3b8fc585 100644 (file)
@@ -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; i<layerList->count(); ++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())
        {
index b9e4e5ac9f8b187db104f0b2692c32162f6cd5a5..78e7d1f477fd4585a24bf0d9d60a2f1b7b93812f 100644 (file)
@@ -3,7 +3,7 @@
 
 #include <QtGui>
 
-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__
index 7240616095ae66772ed9f75d40bc0f4fbee74d78..8657dfc664a76a532794a5ea05b20673034f14af 100644 (file)
@@ -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;
 
index e00ce0c208a3b3543d0a91576621b6325fac45e9..a56910bf2ae4ff0722c91ca98c1f83c5db4d4ca2 100644 (file)
@@ -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();
index c9baaa29a0843b69c254ee86c0d1eedcc74b870d..f260c9ca0408776a711a0634cde1095096a19fc2 100644 (file)
@@ -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;
 }
index 87f6d6b7e875bf72aa2912c137dbd1fb7909ac65..a09cd4a1f784bcc09a108ce759f9a4a8486d423d 100644 (file)
@@ -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;
index 0ce3a9e27ccf0b7176953bb4de73311e92fd8638..94f4d9375a839ecc7f0cfc8da4f022aa21106372 100644 (file)
  * 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)
index aeaf81985cb3c18f2bd50b01c5c85a908d7aa9ca..dcc9b770966af0cc5a7c2f0e886531c74f21e762 100644 (file)
@@ -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();
index 87bfbe4c2b84d3892cb0213a47cce95039627f48..fd96c6cba4459f5348ae0534cb2bc63374190200 100644 (file)
 /**
  * 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");
index 0a0fd5a99a13d9e9bae84b5062ea09190cd93580..c08f006e610c5556e6bd631cf6ce5e30b6e7b7ed 100644 (file)
@@ -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__
index c7b3f0a6f6742dd46a14bb46ab4ea374d222cf1c..6398633b6e61706cb555ff97f4db793d4f4325af 100644 (file)
@@ -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"
index 8d00ff04f33f9a4f655dda62128971a36acfbd9f..2e6e6985be685955d92198332d83367cc1cfd69a 100644 (file)
@@ -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;
 };
 
index da3336dda2d7da26db10ff8ba8b8413fc2da181b..3af0de38fc761d2faf9de5fe7cb3778a17661a13 100644 (file)
@@ -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;
 
index f7a9210fe00958449645684e21003f520ec072b1..34fc7ad1bc27100b6497212956d41f8f4c64bcf0 100644 (file)
@@ -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();