X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fwidgets%2Fcolorbox.cpp;h=6be82573e72367521f86b4b4d0619e262c6b0e24;hb=1f0d096a7fc370ff02477f3860beae2669bf8903;hp=38a77805ce2954b67604597e6a65e6198015a425;hpb=e5a77a32dbe17d9534d3099f1fd3fdacba199516;p=architektonas

diff --git a/src/widgets/colorbox.cpp b/src/widgets/colorbox.cpp
index 38a7780..6be8257 100644
--- a/src/widgets/colorbox.cpp
+++ b/src/widgets/colorbox.cpp
@@ -22,7 +22,7 @@
  * Default Constructor. You must call init manually if you choose
  * to use this constructor.
  */
-QG_ColorBox::QG_ColorBox(QWidget * parent/*= 0*/, const char */*name = 0*/):
+ColorBox::ColorBox(QWidget * parent/*= 0*/, const char */*name = 0*/):
 	QComboBox(parent)
 {
 	showByLayer = false;
@@ -36,7 +36,7 @@ QG_ColorBox::QG_ColorBox(QWidget * parent/*= 0*/, const char */*name = 0*/):
  *
  * @param showByLayer true: Show attribute ByLayer, ByBlock.
  */
-QG_ColorBox::QG_ColorBox(bool showByLayer, bool showUnchanged, QWidget * parent/*= 0*/,
+ColorBox::ColorBox(bool showByLayer, bool showUnchanged, QWidget * parent/*= 0*/,
 	const char */*name = 0*/): QComboBox(parent)
 {
 	unchanged = false;
@@ -46,11 +46,11 @@ QG_ColorBox::QG_ColorBox(bool showByLayer, bool showUnchanged, QWidget * parent/
 /**
  * Destructor
  */
-QG_ColorBox::~QG_ColorBox()
+ColorBox::~ColorBox()
 {
 }
 
-RS_Color QG_ColorBox::getColor()
+RS_Color ColorBox::getColor()
 {
 	return currentColor;
 }
@@ -61,7 +61,7 @@ RS_Color QG_ColorBox::getColor()
  *
  * @param showByLayer true: Show attribute ByLayer, ByBlock.
  */
-void QG_ColorBox::init(bool showByLayer, bool showUnchanged)
+void ColorBox::init(bool showByLayer, bool showUnchanged)
 {
 	this->showByLayer = showByLayer;
 	this->showUnchanged = showUnchanged;
@@ -111,7 +111,7 @@ void QG_ColorBox::init(bool showByLayer, bool showUnchanged)
 	slotColorChanged(currentIndex());
 }
 
-bool QG_ColorBox::isUnchanged()
+bool ColorBox::isUnchanged()
 {
 	return unchanged;
 }
@@ -119,7 +119,7 @@ bool QG_ColorBox::isUnchanged()
 /**
  * Sets the color shown in the combobox to the given color.
  */
-void QG_ColorBox::setColor(const RS_Color & color)
+void ColorBox::setColor(const RS_Color & color)
 {
 //#warning "!!! Color is being misreported here !!!"
 /*
@@ -163,7 +163,7 @@ Look at Red: Have to convert them all to RS_Color...
  * Sets the color of the pixmap next to the "By Layer" item
  * to the given color.
  */
-void QG_ColorBox::setLayerColor(const RS_Color & color)
+void ColorBox::setLayerColor(const RS_Color & color)
 {
 	if (showByLayer)
 	{
@@ -200,7 +200,7 @@ void QG_ColorBox::setLayerColor(const RS_Color & color)
  * offers a dialog to the user that allows him/ her to
  * choose an individual color.
  */
-void QG_ColorBox::slotColorChanged(int index)
+void ColorBox::slotColorChanged(int index)
 {
 	currentColor.resetFlags();