[Kst] extragear/graphics/kst/kst

[George Staikos]

SVN commit 484282 by staikos:

properties are ~public: follow strict naming scheme


 M  +2 -2      kstborderedviewobject.h  
 M  +1 -1      kstviewbox.cpp  
 M  +4 -4      kstviewlabel.cpp  
 M  +2 -4      kstviewlabel.h  
 M  +2 -2      kstviewlegend.cpp  


--- trunk/extragear/graphics/kst/kst/kstborderedviewobject.h #484281:484282
@@ -61,8 +61,8 @@
   Q_OBJECT
   Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor)
   Q_PROPERTY(int borderWidth READ borderWidth WRITE setBorderWidth)
-  Q_PROPERTY(QColor foreColor READ foregroundColor WRITE setForegroundColor)
-  Q_PROPERTY(QColor backColor READ backgroundColor WRITE setBackgroundColor) 
+  Q_PROPERTY(QColor foregroundColor READ foregroundColor WRITE setForegroundColor)
+  Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor) 
   protected:
     KstBorderedViewObject(const QString& type);
   public:
--- trunk/extragear/graphics/kst/kst/kstviewbox.cpp #484281:484282
@@ -173,7 +173,7 @@
     map.insert(QString("_kst_widgetType"), QString("QSpinBox"));
     map.insert(QString("_kst_label"), i18n("Y Roundness"));
     map.insert(QString("minValue"), 0);  
-  } else if (propertyName == "foreColor") {
+  } else if (propertyName == "foregroundColor") {
     map.insert(QString("_kst_widgetType"), QString("KColorButton"));
     map.insert(QString("_kst_label"), i18n("Fill Color"));
   } else if (propertyName == "transparentFill") {
--- trunk/extragear/graphics/kst/kst/kstviewlabel.cpp #484281:484282
@@ -537,10 +537,10 @@
   } else if (propertyName == "font") {
     map.insert(QString("_kst_widgetType"), QString("KFontCombo"));
     map.insert(QString("_kst_label"), i18n("Font"));
-  } else if (propertyName == "foreColor") {
+  } else if (propertyName == "foregroundColor") {
     map.insert(QString("_kst_widgetType"), QString("KColorButton"));
     map.insert(QString("_kst_label"), i18n("Font color"));   
-  } else if (propertyName == "backColor") {
+  } else if (propertyName == "backgroundColor") {
     map.insert(QString("_kst_widgetType"), QString("KColorButton"));
     map.insert(QString("_kst_label"), i18n("Background color"));   
   } else if (propertyName == "dataPrecision") {
@@ -556,10 +556,10 @@
     map.insert(QString("_kst_widgetType"), QString("QCheckBox"));
     map.insert(QString("_kst_label"), QString::null);
     map.insert(QString("text"), i18n("Transparent fill"));   
-  } else if (propertyName == "horizJustify") {
+  } else if (propertyName == "horizontalJustification") {
     map.insert(QString("_kst_widgetType"), QString("HJustifyCombo"));
     map.insert(QString("_kst_label"), i18n("Horizontal Justification"));
-  } else if (propertyName == "vertJustify") {
+  } else if (propertyName == "verticalJustification") {
     map.insert(QString("_kst_widgetType"), QString("VJustifyCombo"));
     map.insert(QString("_kst_label"), i18n("Vertical Justification"));
   } else if (propertyName == "autoResize") {
--- trunk/extragear/graphics/kst/kst/kstviewlabel.h #484281:484282
@@ -26,8 +26,6 @@
 
 #include <qguardedptr.h>
 
-class KstViewLabelDialogI;
-
 class KstViewLabel : public KstBorderedViewObject {
   Q_OBJECT
   Q_PROPERTY(QString text READ text WRITE setText)
@@ -36,8 +34,8 @@
   Q_PROPERTY(int dataPrecision READ dataPrecision WRITE setDataPrecision)
   Q_PROPERTY(int fontSize READ fontSize WRITE setFontSize)
   Q_PROPERTY(bool transparent READ transparent WRITE setTransparent)
-  Q_PROPERTY(int horizJustify READ horizJustifyWrap WRITE setHorizJustifyWrap)
-  Q_PROPERTY(int vertJustify READ vertJustifyWrap WRITE setVertJustifyWrap)
+  Q_PROPERTY(int horizontalJustification READ horizJustifyWrap WRITE setHorizJustifyWrap)
+  Q_PROPERTY(int verticalJustification READ vertJustifyWrap WRITE setVertJustifyWrap)
   Q_PROPERTY(bool autoResize READ autoResize WRITE setAutoResize)
   public:
     KstViewLabel(const QString& txt, KstLJustifyType justify = 0L, float rotation = 0.0);
--- trunk/extragear/graphics/kst/kst/kstviewlegend.cpp #484281:484282
@@ -376,10 +376,10 @@
   } else if (propertyName == "font") {
     map.insert(QString("_kst_widgetType"), QString("KFontCombo"));
     map.insert(QString("_kst_label"), i18n("Font"));
-  } else if (propertyName == "foreColor") {
+  } else if (propertyName == "foregroundColor") {
     map.insert(QString("_kst_widgetType"), QString("KColorButton"));
     map.insert(QString("_kst_label"), i18n("Font color"));
-  } else if (propertyName == "backColor") {
+  } else if (propertyName == "backgroundColor") {
     map.insert(QString("_kst_widgetType"), QString("KColorButton"));
     map.insert(QString("_kst_label"), i18n("Background color"));
   } else if (propertyName == "fontSize") {