[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: =?utf-8?q?=5Bcalligra=5D_krita/plugins/filters/phongbumpmap=3A_M?=
From: José_Luis_Vergara <pentalis () gmail ! com>
Date: 2011-06-30 20:39:10
Message-ID: 20110630203910.5ACBCA60CE () git ! kde ! org
[Download RAW message or body]
Git commit f68593f1b2e7a4fdae9b64331060ec2bb8efd5cf by José Luis Vergara.
Committed on 26/06/2011 at 05:50.
Pushed by jlvergara into branch 'master'.
More pedantic movement of pointer symbols (t* p) to (t *p) and whitespace changes
M +6 -6 krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.cpp \
M +4 -7 krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.h \
M +1 -1 krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_filter.h
http://commits.kde.org/calligra/f68593f1b2e7a4fdae9b64331060ec2bb8efd5cf
diff --git a/krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.cpp \
b/krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.cpp index \
5f08ca0..d9f9221 100644
--- a/krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.cpp
+++ b/krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.cpp
@@ -22,7 +22,7 @@
#include "KoChannelInfo.h"
#include "KoColorSpace.h"
-KisPhongBumpmapConfigWidget::KisPhongBumpmapConfigWidget(const KisPaintDeviceSP dev, \
const KisImageWSP image, QWidget * parent, Qt::WFlags f) \
+KisPhongBumpmapConfigWidget::KisPhongBumpmapConfigWidget(const KisPaintDeviceSP dev, \
const KisImageWSP image, QWidget *parent, Qt::WFlags f) : KisConfigWidget(parent, f)
, m_device(dev)
, m_image(image)
@@ -48,7 +48,7 @@ KisPhongBumpmapConfigWidget::KisPhongBumpmapConfigWidget(const \
KisPaintDeviceSP connect(m_page->specularReflectivityCheckBox, \
SIGNAL(toggled(bool)), m_page->shinynessExponentLabel, SLOT(setEnabled(bool)));
- QVBoxLayout * l = new QVBoxLayout(this);
+ QVBoxLayout *l = new QVBoxLayout(this);
Q_CHECK_PTR(l);
l->addWidget(m_page);
@@ -61,7 +61,7 @@ KisPhongBumpmapConfigWidget::KisPhongBumpmapConfigWidget(const \
KisPaintDeviceSP
}
-void KisPhongBumpmapConfigWidget::setConfiguration(const KisPropertiesConfiguration \
* config) +void KisPhongBumpmapConfigWidget::setConfiguration(const \
KisPropertiesConfiguration *config) {
QVariant tempcolor;
m_page->ambientReflectivityKisDoubleSliderSpinBox->setValue( \
config->getDouble(PHONG_AMBIENT_REFLECTIVITY) ); @@ -70,7 +70,7 @@ void \
KisPhongBumpmapConfigWidget::setConfiguration(const \
KisPropertiesConfigurat
m_page->shinynessExponentKisSliderSpinBox->setValue( \
config->getInt(PHONG_SHINYNESS_EXPONENT) );
m_page->diffuseReflectivityCheckBox->setChecked( \
config->getBool(PHONG_DIFFUSE_REFLECTIVITY_IS_ENABLED) );
m_page->specularReflectivityCheckBox->setChecked( \
config->getBool(PHONG_SPECULAR_REFLECTIVITY_IS_ENABLED) );
- // Indexes are off by 1 simply because arrays start at 0 and the GUI naming \
scheme started at 1 + // NOTE: Indexes are off by 1 simply because arrays start at \
0 and the GUI naming scheme started at 1
m_page->lightSourceGroupBox1->setChecked( \
config->getBool(PHONG_ILLUMINANT_IS_ENABLED[0]) );
m_page->lightSourceGroupBox2->setChecked( \
config->getBool(PHONG_ILLUMINANT_IS_ENABLED[1]) );
m_page->lightSourceGroupBox3->setChecked( \
config->getBool(PHONG_ILLUMINANT_IS_ENABLED[2]) ); @@ -95,9 +95,9 @@ void \
KisPhongBumpmapConfigWidget::setConfiguration(const KisPropertiesConfigurat if \
(!config) return; }
-KisPropertiesConfiguration* KisPhongBumpmapConfigWidget::configuration() const
+KisPropertiesConfiguration *KisPhongBumpmapConfigWidget::configuration() const
{
- KisFilterConfiguration * config = new KisFilterConfiguration("phongbumpmap", 2);
+ KisFilterConfiguration *config = new KisFilterConfiguration("phongbumpmap", 2);
config->setProperty(PHONG_HEIGHT_CHANNEL, \
m_page->heightChannelComboBox->currentText());
config->setProperty(PHONG_AMBIENT_REFLECTIVITY, \
m_page->ambientReflectivityKisDoubleSliderSpinBox->value());
config->setProperty(PHONG_DIFFUSE_REFLECTIVITY, \
m_page->diffuseReflectivityKisDoubleSliderSpinBox->value());
diff --git a/krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.h \
b/krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.h index \
2447f66..1e12194 100644
--- a/krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.h
+++ b/krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.h
@@ -48,17 +48,14 @@ public:
class KisPhongBumpmapConfigWidget : public KisConfigWidget
{
-
Q_OBJECT
public:
- KisPhongBumpmapConfigWidget(const KisPaintDeviceSP dev, const KisImageWSP image, \
QWidget * parent, Qt::WFlags f = 0); + KisPhongBumpmapConfigWidget(const \
KisPaintDeviceSP dev, const KisImageWSP image, QWidget *parent, Qt::WFlags f = 0); \
virtual ~KisPhongBumpmapConfigWidget() {}
-
- void setConfiguration(const KisPropertiesConfiguration* config);
- KisPropertiesConfiguration* configuration() const;
-
- KisPhongBumpmapWidget * m_page;
+ void setConfiguration(const KisPropertiesConfiguration *config);
+ KisPropertiesConfiguration *configuration() const;
+ KisPhongBumpmapWidget *m_page;
private:
KisPaintDeviceSP m_device;
diff --git a/krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_filter.h \
b/krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_filter.h index \
231a116..6d3566d 100644
--- a/krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_filter.h
+++ b/krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_filter.h
@@ -54,4 +54,4 @@ public:
virtual KisFilterConfiguration* factoryConfiguration(const KisPaintDeviceSP) \
const; };
-#endif //KIS_PHONG_BUMPMAP_FILTER_H
\ No newline at end of file
+#endif //KIS_PHONG_BUMPMAP_FILTER_H
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic