diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ set_target_properties(kimagemapeditor_bin PROPERTIES OUTPUT_NAME kimagemapeditor) -target_link_libraries(kimagemapeditor_bin ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KHTML_LIBS} ) +target_link_libraries(kimagemapeditor_bin ${KDE4_KHTML_LIBS} ) install(TARGETS kimagemapeditor_bin ${INSTALL_TARGETS_DEFAULT_ARGS} ) @@ -47,7 +47,7 @@ -target_link_libraries(kimagemapeditor ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KHTML_LIBS} ) +target_link_libraries(kimagemapeditor ${KDE4_KHTML_LIBS} ) install(TARGETS kimagemapeditor DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/imagemap.h b/imagemap.h --- a/imagemap.h +++ b/imagemap.h @@ -18,7 +18,7 @@ #ifndef IMAGEMAP_H #define IMAGEMAP_H -#include +#include #include #include #include @@ -35,7 +35,7 @@ class KImageMapEditor; class Area; -class ImageMap : public Q3ScrollView { +class ImageMap : public QScrollArea { public: enum DrawAction { None, DrawCircle, DrawRectangle, DrawPolygon, MoveSelectionPoint, MoveArea }; private: @@ -65,10 +65,10 @@ QPoint translateToZoom(const QPoint & p) const; QRect translateToZoom(const QRect & p) const; protected: - virtual void contentsMousePressEvent(QMouseEvent* e); - virtual void contentsMouseDoubleClickEvent(QMouseEvent* e); - virtual void contentsMouseReleaseEvent(QMouseEvent *e); - virtual void contentsMouseMoveEvent(QMouseEvent *e); + virtual void mousePressEvent(QMouseEvent* e); + virtual void mouseDoubleClickEvent(QMouseEvent* e); + virtual void mouseReleaseEvent(QMouseEvent *e); + virtual void mouseMoveEvent(QMouseEvent *e); virtual void resizeEvent(QResizeEvent* e); virtual void drawContents(QPainter* p,int clipx,int clipy,int clipw,int cliph); }; diff --git a/imagemap.cpp b/imagemap.cpp --- a/imagemap.cpp +++ b/imagemap.cpp @@ -33,16 +33,16 @@ } ImageMap::ImageMap(QWidget *parent,KImageMapEditor* _imageMapEditor) - : Q3ScrollView(parent) + : QScrollArea(parent) { imageMapEditor=_imageMapEditor; // setPicture(QImage()); currentAction=None; currentArea=0L; eraseOldArea=false; oldArea=0L; _zoom=1; - viewport()->setMouseTracking(true); + widget()->setMouseTracking(true); } @@ -97,7 +97,7 @@ round(r.width()*_zoom),round(r.height()*_zoom)); } -void ImageMap::contentsMouseDoubleClickEvent(QMouseEvent* e) { +void ImageMap::mouseDoubleClickEvent(QMouseEvent* e) { QPoint point=e->pos(); point-=imageRect.topLeft(); point=translateFromZoom(point); @@ -107,7 +107,7 @@ } -void ImageMap::contentsMousePressEvent(QMouseEvent* e) { +void ImageMap::mousePressEvent(QMouseEvent* e) { drawStart=e->pos(); // Check if it's on picture if not // move it to the picture's border @@ -181,7 +181,7 @@ } -void ImageMap::contentsMouseReleaseEvent(QMouseEvent *e) { +void ImageMap::mouseReleaseEvent(QMouseEvent *e) { drawEnd=e->pos(); // Check if it's on picture if not @@ -242,7 +242,7 @@ } -void ImageMap::contentsMouseMoveEvent(QMouseEvent *e) { +void ImageMap::mouseMoveEvent(QMouseEvent *e) { drawCurrent=e->pos(); // If outside the image @@ -308,7 +308,7 @@ } void ImageMap::resizeEvent(QResizeEvent* e) { - Q3ScrollView::resizeEvent(e); + QScrollArea::resizeEvent(e); int width=(int) (image.width()*_zoom); int height=(int) (image.height()*_zoom); if (visibleWidth()>width)