comparison view/Pane.h @ 806:4c8ca536b54f warnfix_no_size_t

Some more unsigned/long removal
author Chris Cannam
date Tue, 17 Jun 2014 15:36:56 +0100
parents 30bc7b2155dc
children 40c6c9344ff6
comparison
equal deleted inserted replaced
805:1d526ba11a24 806:4c8ca536b54f
46 bool &closeToRight) const; 46 bool &closeToRight) const;
47 47
48 void setCentreLineVisible(bool visible); 48 void setCentreLineVisible(bool visible);
49 bool getCentreLineVisible() const { return m_centreLineVisible; } 49 bool getCentreLineVisible() const { return m_centreLineVisible; }
50 50
51 virtual size_t getFirstVisibleFrame() const; 51 virtual int getFirstVisibleFrame() const;
52 52
53 virtual size_t getVerticalScaleWidth() const; 53 virtual int getVerticalScaleWidth() const;
54 54
55 virtual QImage *toNewImage(size_t f0, size_t f1); 55 virtual QImage *toNewImage(int f0, int f1);
56 virtual QImage *toNewImage() { return View::toNewImage(); } 56 virtual QImage *toNewImage() { return View::toNewImage(); }
57 virtual QSize getImageSize(size_t f0, size_t f1); 57 virtual QSize getImageSize(int f0, int f1);
58 virtual QSize getImageSize() { return View::getImageSize(); } 58 virtual QSize getImageSize() { return View::getImageSize(); }
59 59
60 virtual void toXml(QTextStream &stream, QString indent = "", 60 virtual void toXml(QTextStream &stream, QString indent = "",
61 QString extraAttributes = "") const; 61 QString extraAttributes = "") const;
62 62
65 signals: 65 signals:
66 void paneInteractedWith(); 66 void paneInteractedWith();
67 void rightButtonMenuRequested(QPoint position); 67 void rightButtonMenuRequested(QPoint position);
68 void dropAccepted(QStringList uriList); 68 void dropAccepted(QStringList uriList);
69 void dropAccepted(QString text); 69 void dropAccepted(QString text);
70 void doubleClickSelectInvoked(size_t frame); 70 void doubleClickSelectInvoked(int frame);
71 void regionOutlined(QRect rect); 71 void regionOutlined(QRect rect);
72 72
73 public slots: 73 public slots:
74 virtual void toolModeChanged(); 74 virtual void toolModeChanged();
75 virtual void zoomWheelsEnabledChanged(); 75 virtual void zoomWheelsEnabledChanged();
76 virtual void viewZoomLevelChanged(View *v, unsigned long z, bool locked); 76 virtual void viewZoomLevelChanged(View *v, int z, bool locked);
77 virtual void modelAlignmentCompletionChanged(); 77 virtual void modelAlignmentCompletionChanged();
78 78
79 virtual void horizontalThumbwheelMoved(int value); 79 virtual void horizontalThumbwheelMoved(int value);
80 virtual void verticalThumbwheelMoved(int value); 80 virtual void verticalThumbwheelMoved(int value);
81 virtual void verticalZoomChanged(); 81 virtual void verticalZoomChanged();
112 void drawWorkTitle(QRect, QPainter &, const Model *); 112 void drawWorkTitle(QRect, QPainter &, const Model *);
113 void drawLayerNames(QRect, QPainter &); 113 void drawLayerNames(QRect, QPainter &);
114 void drawEditingSelection(QPainter &); 114 void drawEditingSelection(QPainter &);
115 void drawAlignmentStatus(QRect, QPainter &, const Model *, bool down); 115 void drawAlignmentStatus(QRect, QPainter &, const Model *, bool down);
116 116
117 virtual bool render(QPainter &paint, int x0, size_t f0, size_t f1); 117 virtual bool render(QPainter &paint, int x0, int f0, int f1);
118 118
119 Selection getSelectionAt(int x, bool &closeToLeft, bool &closeToRight) const; 119 Selection getSelectionAt(int x, bool &closeToLeft, bool &closeToRight) const;
120 120
121 bool editSelectionStart(QMouseEvent *e); 121 bool editSelectionStart(QMouseEvent *e);
122 bool editSelectionDrag(QMouseEvent *e); 122 bool editSelectionDrag(QMouseEvent *e);
150 150
151 bool m_navigating; 151 bool m_navigating;
152 bool m_resizing; 152 bool m_resizing;
153 bool m_editing; 153 bool m_editing;
154 bool m_releasing; 154 bool m_releasing;
155 size_t m_dragCentreFrame; 155 int m_dragCentreFrame;
156 float m_dragStartMinValue; 156 float m_dragStartMinValue;
157 bool m_centreLineVisible; 157 bool m_centreLineVisible;
158 size_t m_selectionStartFrame; 158 int m_selectionStartFrame;
159 Selection m_editingSelection; 159 Selection m_editingSelection;
160 int m_editingSelectionEdge; 160 int m_editingSelectionEdge;
161 mutable int m_scaleWidth; 161 mutable int m_scaleWidth;
162 162
163 enum DragMode { 163 enum DragMode {