[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/soc-umbrello/umbrello
From: Ralf Habacker <ralf.habacker () gmail ! com>
Date: 2012-03-29 18:40:46
Message-ID: 20120329184046.303D0AC899 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1287576 by habacker:
Reordered methods to reduce differences to trunk.
M +8 -8 umlview.cpp
M +3 -3 umlview.h
--- branches/work/soc-umbrello/umbrello/umlview.cpp #1287575:1287576
@@ -48,6 +48,14 @@
}
/**
+ * Getter for the scene.
+ */
+UMLScene* UMLView::umlScene() const
+{
+ return qobject_cast<UMLScene*>(scene());
+}
+
+/**
* Sets the zoom of the diagram.
*/
void UMLView::setZoom(int zoom)
@@ -290,14 +298,6 @@
}
/**
- * Getter for the scene.
- */
-UMLScene* UMLView::umlScene() const
-{
- return qobject_cast<UMLScene*>(scene());
-}
-
-/**
* Overrides standard method from QWidget to resize canvas when
* it's shown.
*/
--- branches/work/soc-umbrello/umbrello/umlview.h #1287575:1287576
@@ -36,6 +36,7 @@
UMLView(UMLFolder *f );
virtual ~UMLView();
+ UMLScene* umlScene() const;
int zoom() const { return m_nZoom; }
void setZoom(int zoom);
int currentZoom();
@@ -43,16 +44,15 @@
void hideEvent(QHideEvent *he);
void showEvent(QShowEvent *se);
- UMLScene* umlScene() const;
+
protected:
- void closeEvent(QCloseEvent * e);
-
void setCenter(const QPointF& centerPoint);
QPointF center();
virtual void wheelEvent(QWheelEvent* event);
virtual void resizeEvent(QResizeEvent* event);
+ void closeEvent(QCloseEvent * e);
QPointF m_currentCenterPoint; ///< holds the current centerpoint for the view, \
used for panning and zooming QPoint m_lastPanPoint; ///< from panning the \
view
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic