From 4a47150aaf6f75c45ddca8a071c3bc291117bdd3 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Wed, 11 Mar 2009 12:31:44 +0000 Subject: [PATCH] const modifiers are useless on integral return types [PATCH by Ray Lehtiniemi] svn path=/trunk/kdenlive/; revision=3130 --- src/abstractgroupitem.cpp | 2 +- src/abstractgroupitem.h | 2 +- src/kdenlivedoc.cpp | 2 +- src/kdenlivedoc.h | 2 +- src/keyframehelper.cpp | 2 +- src/keyframehelper.h | 2 +- src/renderer.cpp | 8 ++++---- src/renderer.h | 8 ++++---- src/trackview.cpp | 4 ++-- src/trackview.h | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/abstractgroupitem.cpp b/src/abstractgroupitem.cpp index 0b9016b1..136745da 100644 --- a/src/abstractgroupitem.cpp +++ b/src/abstractgroupitem.cpp @@ -38,7 +38,7 @@ int AbstractGroupItem::type() const { return GROUPWIDGET; } -const int AbstractGroupItem::track() const { +int AbstractGroupItem::track() const { return (int)(scenePos().y() / KdenliveSettings::trackheight()); } diff --git a/src/abstractgroupitem.h b/src/abstractgroupitem.h index 0c0c3009..315563c5 100644 --- a/src/abstractgroupitem.h +++ b/src/abstractgroupitem.h @@ -34,7 +34,7 @@ public: virtual int type() const; CustomTrackScene* projectScene(); void addItem(QGraphicsItem * item); - const int track() const; + int track() const; protected: virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp index bff01ee3..2b230524 100644 --- a/src/kdenlivedoc.cpp +++ b/src/kdenlivedoc.cpp @@ -1069,7 +1069,7 @@ void KdenliveDoc::setProfilePath(QString path) { else m_timecode.setFormat((int) m_fps); } -const double KdenliveDoc::dar() { +double KdenliveDoc::dar() { return (double) m_profile.display_aspect_num / m_profile.display_aspect_den; } diff --git a/src/kdenlivedoc.h b/src/kdenlivedoc.h index 69b615d0..f85d6592 100644 --- a/src/kdenlivedoc.h +++ b/src/kdenlivedoc.h @@ -93,7 +93,7 @@ Q_OBJECT public: void syncGuides(QList guides); void setZoom(int factor); int zoom() const; - const double dar(); + double dar(); double projectDuration() const; bool saveSceneList(const QString &path, const QString &scene); int tracksCount() const; diff --git a/src/keyframehelper.cpp b/src/keyframehelper.cpp index c0bf5d7a..5dbfd1e6 100644 --- a/src/keyframehelper.cpp +++ b/src/keyframehelper.cpp @@ -103,7 +103,7 @@ void KeyframeHelper::paintEvent(QPaintEvent *e) { } -const int KeyframeHelper::value() const { +int KeyframeHelper::value() const { return m_position; } diff --git a/src/keyframehelper.h b/src/keyframehelper.h index 0b295650..c5687337 100644 --- a/src/keyframehelper.h +++ b/src/keyframehelper.h @@ -32,7 +32,7 @@ class KeyframeHelper : public QWidget { public: KeyframeHelper(QWidget *parent = 0); - const int value() const; + int value() const; protected: virtual void paintEvent(QPaintEvent * /*e*/); diff --git a/src/renderer.cpp b/src/renderer.cpp index beff7f74..79d24c2c 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -236,11 +236,11 @@ char *Render::decodedString(QString str) { return pix; } */ -const int Render::renderWidth() const { +int Render::renderWidth() const { return (int)(m_mltProfile->height() * m_mltProfile->dar()); } -const int Render::renderHeight() const { +int Render::renderHeight() const { return m_mltProfile->height(); } @@ -393,7 +393,7 @@ bool Render::isValid(KUrl url) { return true; } -const double Render::dar() const { +double Render::dar() const { return m_mltProfile->dar(); } @@ -905,7 +905,7 @@ void Render::saveZone(KUrl url, QString desc, QPoint zone) { westleyConsumer.start(); } -const double Render::fps() const { +double Render::fps() const { return m_fps; } diff --git a/src/renderer.h b/src/renderer.h index 8685765e..e834eefe 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -141,11 +141,11 @@ Q_OBJECT public: /** Turn on or off on screen display */ void refreshDisplay(); int resetProfile(); - const double fps() const; - const int renderWidth() const; - const int renderHeight() const; + double fps() const; + int renderWidth() const; + int renderHeight() const; /** get display aspect ratio */ - const double dar() const; + double dar() const; /** Playlist manipulation */ void mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod); diff --git a/src/trackview.cpp b/src/trackview.cpp index 753eca12..c3890f6e 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -352,11 +352,11 @@ int TrackView::fitZoom() const { return i; } -const double TrackView::zoomFactor() const { +double TrackView::zoomFactor() const { return m_scale; } -const int TrackView::mapLocalToValue(int x) const { +int TrackView::mapLocalToValue(int x) const { return (int)(x * zoomFactor()); } diff --git a/src/trackview.h b/src/trackview.h index 841a49de..8b2e6da2 100644 --- a/src/trackview.h +++ b/src/trackview.h @@ -46,8 +46,8 @@ class TrackView : public QWidget { public: explicit TrackView(KdenliveDoc *doc, QWidget *parent = 0); - const double zoomFactor() const; - const int mapLocalToValue(int x) const; + double zoomFactor() const; + int mapLocalToValue(int x) const; void setEditMode(const QString & editMode); const QString & editMode() const; QGraphicsScene *projectScene(); -- 2.39.2