Commit 8e8ef66d authored by Adrian Page's avatar Adrian Page

Fix some errors.

svn path=/trunk/koffice/; revision=526891
parent 58052b3e
......@@ -96,7 +96,6 @@ kde4_add_ui3_files(kritaui_LIB_SRCS
kis_previewwidgetbase.ui
wdgapplyprofile.ui
wdgautobrush.ui
wdgautogradient.ui
wdgbirdeye.ui
wdgcolorsettings.ui
wdgdisplaysettings.ui
......@@ -117,6 +116,17 @@ kde4_add_ui3_files(kritaui_LIB_SRCS
wdgtabletdevicesettings.ui
wdgtabletsettings.ui )
kde4_add_ui_files(kritaui_LIB_SRCS
wdgautogradient.ui
)
include_directories(
${CMAKE_SOURCE_DIR}/krita/core
${CMAKE_SOURCE_DIR}/krita/kritacolor
${CMAKE_SOURCE_DIR}/krita/sdk
${KOFFICEUI_INCLUDES}
)
kde4_add_dcop_skels(kritaui_LIB_SRCS kis_doc_iface.h kis_view_iface.h )
kde4_add_library(kritaui SHARED ${kritaui_LIB_SRCS})
......
......@@ -53,7 +53,7 @@ void ImageViewer::setImage(QImage & image)
void ImageViewer::contentsMousePressEvent(QMouseEvent *event)
{
if(LeftButton == event->button()) {
if(Qt::LeftButton == event->button()) {
setCursor(KisCursor::closedHandCursor());
m_currentPos = event->globalPos();
m_isDragging = true;
......@@ -62,7 +62,7 @@ void ImageViewer::contentsMousePressEvent(QMouseEvent *event)
void ImageViewer::contentsMouseReleaseEvent(QMouseEvent *event)
{
if(LeftButton == event->button()) {
if(Qt::LeftButton == event->button()) {
setCursor(KisCursor::handCursor());
m_currentPos = event->globalPos();
m_isDragging = false;
......
......@@ -32,8 +32,10 @@
/****************************** KisAutogradient ******************************/
KisAutogradient::KisAutogradient(QWidget *parent, const char* name, const QString& caption) : KisWdgAutogradient(parent, name)
KisAutogradient::KisAutogradient(QWidget *parent, const char* name, const QString& caption) : QWidget(parent)
{
setObjectName(name);
setupUi(this);
setCaption(caption);
m_autogradientResource = new KisAutogradientResource();
m_autogradientResource->createSegment( INTERP_LINEAR, COLOR_INTERP_RGB, 0.0, 1.0, 0.5, Qt::black, Qt::white );
......
......@@ -26,7 +26,7 @@ class KisResource;
class KisGradientSegment;
class KisAutogradientResource;
class KisAutogradient : public KisWdgAutogradient
class KisAutogradient : public QWidget, public Ui::KisWdgAutogradient
{
Q_OBJECT
......
......@@ -20,7 +20,6 @@
#ifndef _KIS_WDG_GRADIENT_SLIDER_H_
#define _KIS_WDG_GRADIENT_SLIDER_H_
#include <kpixmapio.h>
#include <qwidget.h>
//Added by qt3to4:
#include <QContextMenuEvent>
......@@ -72,7 +71,6 @@ private:
REMOVE_SEGMENT
};
KPixmapIO m_pixmapIO;
KisAutogradientResource* m_autogradientResource;
KisGradientSegment* m_currentSegment;
KisGradientSegment* m_selectedSegment;
......
......@@ -44,13 +44,15 @@ public:
{
m_slider = new QSlider(minValue, maxValue, pageStep, value, orientation, this, name);
//m_slider->setTracking(false);
insertItem(m_slider);
#warning kde4 port
// Can't insert widgets into QMenu at the moment.
//insertItem(m_slider);
connect(m_slider, SIGNAL(valueChanged(int)), SIGNAL(valueChanged(int)));
}
void setTickInterval(int i) { m_slider->setTickInterval(i); }
void setRange(int minValue, int maxValue) { m_slider->setRange(minValue, maxValue); }
void setValue(int val) { m_slider->setValue(val); }
void setTickmarks(QSlider::TickSetting t) { m_slider->setTickmarks(t); }
void setTickmarks(QSlider::TickPosition t) { m_slider->setTickmarks(t); }
int lineStep () const{ return m_slider->lineStep(); }
int minValue () const{ return m_slider->minValue(); }
int maxValue () const{ return m_slider->maxValue(); }
......
......@@ -18,9 +18,7 @@
#ifndef KIS_OPENGL_IMAGE_CONTEXT_H_
#define KIS_OPENGL_IMAGE_CONTEXT_H_
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_GL
......
This diff is collapsed.
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