Commit 34fa794b authored by Dirk Mueller's avatar Dirk Mueller

daily "unbreak compilation" run

BLAME berger (#435678): error: extra ';'
BLAME berger (#435678): error: extra ';'
BLAME berger (#435678): error: extra ';'
BLAME berger (#435678): error: extra ';'
BLAME berger (#435678): error: extra ';'
BLAME berger (#435678): error: extra ';'
BLAME berger (#435678): error: extra ';'
BLAME berger (#435678): error: extra ';'
BLAME berger (#435678): error: extra ';'
BLAME berger (#435678): error: extra ';'
BLAME berger (#435678): error: extra ';'
BLAME berger (#435678): error: extra ';'
BLAME berger (#435678): error: extra ';'
BLAME rempt (#445149): error: extra qualification 'KisSelection::' on member 'maskImage' ignored
BLAME rempt (#449008): error: comma at end of enumerator list
BLAME rempt (#445149): error: extra ';'
BLAME rempt (#443350): error: extra ';'
BLAME rempt (#404804): error: extra ';'
BLAME rempt (#404804): error: extra ';'
BLAME rempt (#404804): error: extra ';'
BLAME rempt (#424294): error: extra ';'
BLAME rempt (#399634): error: extra ';'
BLAME rempt (#390558): error: extra ';'
BLAME rempt (#445149): error: extra ';'
BLAME rempt (#445149): error: extra ';'
BLAME rempt (#445149): error: extra ';'
BLAME rempt (#445149): error: extra ';'
BLAME rempt (#445149): error: extra ';'
BLAME rempt (#430492): error: extra ';'
BLAME rempt (#445149): error: extra ';'
BLAME rempt (#445149): error: extra ';'
BLAME rempt (#443515): error: extra ';'
BLAME rempt (#449008): error: extra ';'
BLAME rempt (#439918): error: extra ';'


svn path=/trunk/koffice/; revision=450275
parent 5d656572
......@@ -287,7 +287,7 @@ void rgb_to_hls(Q_UINT8 red, Q_UINT8 green, Q_UINT8 blue, float * hue, float * l
*hue = h * 360;
*saturation = s;
*lightness = l;
};
}
float hue_value(float n1, float n2, float hue)
{
......@@ -302,7 +302,7 @@ float hue_value(float n1, float n2, float hue)
else if (hue < 240 )
return n1 + (((n2 - n1) * (240 - hue)) / 60);
else return n1;
};
}
void hls_to_rgb(float h, float l, float s, Q_UINT8 * r, Q_UINT8 * g, Q_UINT8 * b)
......@@ -320,7 +320,7 @@ void hls_to_rgb(float h, float l, float s, Q_UINT8 * r, Q_UINT8 * g, Q_UINT8 * b
*g = (Q_UINT8)(hue_value(m1, m2, h) * 255 + 0.5);
*b = (Q_UINT8)(hue_value(m1, m2, h - 120) * 255 + 0.5);
};
}
void rgb_to_hls(Q_UINT8 r, Q_UINT8 g, Q_UINT8 b, int * h, int * l, int * s)
{
......
......@@ -44,7 +44,7 @@ class KisPreviewDialog;
*/
class KRITACORE_EXPORT KisFilterManager : public QObject {
Q_OBJECT;
Q_OBJECT
public:
......
......@@ -69,7 +69,7 @@ protected:
class KisPartLayer : public KisLayer {
Q_OBJECT;
Q_OBJECT
public:
......
......@@ -52,7 +52,7 @@ public:
void setSelected(Q_INT32 x, Q_INT32 y, QUANTUM s);
QImage KisSelection::maskImage();
QImage maskImage();
void select(QRect r);
......
......@@ -35,7 +35,7 @@ class KisClipboard;
*/
class KRITACORE_EXPORT KisSelectionManager : public QObject {
Q_OBJECT;
Q_OBJECT
public:
......
......@@ -40,7 +40,7 @@ class KisToolBox;
*/
class KisToolManager : public QObject, public KisToolControllerInterface {
Q_OBJECT;
Q_OBJECT
public:
......
......@@ -41,7 +41,7 @@ KisAutobrushCircleShape::KisAutobrushCircleShape(Q_INT32 w, Q_INT32 h, double fh
m_xfadecoef ( (m_fh == 0) ? 1 : ( 1.0 / m_fh)),
m_yfadecoef ( (m_fv == 0) ? 1 : ( 1.0 / m_fv))
{
};
}
Q_INT8 KisAutobrushCircleShape::valueAt(Q_INT32 x, Q_INT32 y)
{
double xr = (x - m_xcentre);
......
......@@ -51,7 +51,7 @@ namespace {
FORMAT_ACT // Photoshop binary color palette
};
};
}
KisPalette::KisPalette(const QImage * img, Q_INT32 nColors, const QString & name)
......
......@@ -50,7 +50,7 @@ enum enumToolType {
TOOL_FREEHAND = 2, // Freehand drawing tools
TOOL_TRANSFORM = 3, // Tools that transform the layer
TOOL_FILL = 4, // Tools that fill parts of the canvas
TOOL_SELECT = 5, // Selection tools
TOOL_SELECT = 5
};
......
......@@ -232,7 +232,7 @@ KisImageSP KisToolFreehand::currentImage()
void KisToolFreehand::setUseTempLayer(bool u) {
m_useTempLayer = u;
};
}
#include "kis_tool_freehand.moc"
......@@ -110,7 +110,7 @@ public:
virtual void adjustBrightness(Q_UINT8 *src1, Q_INT8 adjust) const;
virtual void adjustBrightnessContrast(const Q_UINT8 *src, Q_UINT8 *dst, Q_INT8 brightness, Q_INT8 contrast, Q_INT32 nPixels) const {};;
virtual void adjustBrightnessContrast(const Q_UINT8 *src, Q_UINT8 *dst, Q_INT8 brightness, Q_INT8 contrast, Q_INT32 nPixels) const {};
virtual void mixColors(const Q_UINT8 **colors, const Q_UINT8 *weights, Q_UINT32 nColors, Q_UINT8 *dst) const;
virtual void setAlpha(Q_UINT8 * pixels, Q_UINT8 alpha, Q_INT32 nPixels);
......
......@@ -38,7 +38,7 @@ namespace krita {
SINUSOIDAL = 2
};
};
}
using namespace krita;
......
......@@ -29,7 +29,7 @@ class KisAutogradient : public KisWdgAutogradient
Q_OBJECT
public:
KisAutogradient(QWidget *parent, const char* name, const QString& caption);;
KisAutogradient(QWidget *parent, const char* name, const QString& caption);
void activate();
signals:
void activatedResource(KisResource *r);
......
......@@ -38,7 +38,7 @@ KisCustomGradientDialog::KisCustomGradientDialog(KisView * view, QWidget * paren
m_page = new KisAutogradient(this, "autogradient", i18n("Custom Gradient"));
setMainWidget(m_page);
connect(m_page, SIGNAL(activatedResource(KisResource *)), view, SLOT(gradientActivated(KisResource*)));
};
}
KisGradientChooser::KisGradientChooser(KisView * view, QWidget *parent, const char *name) : super(parent, name)
{
......
......@@ -27,7 +27,7 @@ class QPushButton;
class KisView;
class KisCustomGradientDialog : public KDialogBase {
Q_OBJECT;
Q_OBJECT
public:
......
......@@ -72,8 +72,8 @@ void KritaFiltersGallery::showFiltersGalleryDialog()
}
}
};
};
};
}
}
}
#include "filters_gallery.moc"
......@@ -43,9 +43,9 @@ namespace FiltersGallery {
};
};
};
};
}
}
}
......
......@@ -100,8 +100,8 @@ void KisDlgFiltersGallery::refreshPreview( )
m_previewWidget->slotUpdate();
}
};
};
};
}
}
}
#include "kis_dlg_filtersgallery.moc"
......@@ -57,8 +57,8 @@ class KisDlgFiltersGallery : public KDialogBase
QHBoxLayout* m_hlayout;
};
};
};
};
}
}
}
#endif
......@@ -81,6 +81,6 @@ void KisFiltersListView::buildPreview()
// KisLayerSP KisFiltersListView::layer() { return m_thumb; }
};
};
};
}
}
}
......@@ -60,7 +60,7 @@ namespace FiltersGallery {
KisLayerSP m_thumb;
};
};
};
};
}
}
}
#endif
......@@ -51,7 +51,7 @@ public:
enumSepOutput getOutput();
bool getDownscale();
void enableDownscale(bool enable);;
void enableDownscale(bool enable);
bool getToColor();
......
......@@ -37,7 +37,7 @@
#include "kis_channel_separator.h"
#include "dlg_separate.h"
K_EXPORT_COMPONENT_FACTORY( kritaseparatechannels, KGenericFactory<KisSeparateChannelsPlugin>( "krita" ) );
K_EXPORT_COMPONENT_FACTORY( kritaseparatechannels, KGenericFactory<KisSeparateChannelsPlugin>( "krita" ) )
KisSeparateChannelsPlugin::KisSeparateChannelsPlugin(QObject *parent, const char *name, const QStringList &)
: KParts::Plugin(parent, name)
......
......@@ -58,7 +58,7 @@ KisColorPopup::KisColorPopup(QColor c, QWidget * parent, const char * name)
m_khsSelector->show();
m_valueSelector->show();
};
}
KisColorCup::KisColorCup(QWidget * parent, const char * name)
: QPushButton(parent, name)
......
......@@ -33,7 +33,7 @@ class KValueSelector;
class KisColorPopup : public QFrame {
Q_OBJECT;
Q_OBJECT
public:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment