Comment out names of unused parameters [PATCH by Ray Lehtiniemi]

svn path=/trunk/kdenlive/; revision=3131

diff --git a/plugins/sampleplugin/sampleplugin.cpp b/plugins/sampleplugin/sampleplugin.cpp
index 177387f9246d1a71673f7db57bc33ff6bc6c2cad..75b87c60b71a4549004c2ab1dd42eaa76a4ee132 100644 (file)
--- a/plugins/sampleplugin/sampleplugin.cpp
+++ b/plugins/sampleplugin/sampleplugin.cpp
@@ -35,7 +35,7 @@ QStringList SamplePlugin::generators() const {
 }
 
 
-KUrl SamplePlugin::generatedClip(const QString &generator, const KUrl &projectFolder, const QStringList &lumaNames, const QStringList &lumaFiles, const double fps, const int width, const int height) {
+KUrl SamplePlugin::generatedClip(const QString &generator, const KUrl &projectFolder, const QStringList &/*lumaNames*/, const QStringList &/*lumaFiles*/, const double fps, const int /*width*/, const int /*height*/) {
     QString prePath;
     if (generator == i18n("Noise")) {
         prePath = projectFolder.path() + "/noise";

diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp
index cb2628bd1dc06a5f49291a69d86490ce7c314437..1ab486dcac3bd780bb3ef011fabfbe136dbdbecc 100644 (file)
--- a/renderer/renderjob.cpp
+++ b/renderer/renderjob.cpp
@@ -228,7 +228,7 @@ void RenderJob::initKdenliveDbusInterface() {
 }
 
 
-void RenderJob::slotIsOver(int exitcode, QProcess::ExitStatus status) {
+void RenderJob::slotIsOver(int /*exitcode*/, QProcess::ExitStatus status) {
     if (m_jobUiserver) m_jobUiserver->call("terminate", QString());
     if (m_erase) {
         QFile f(m_scenelist);

diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp
index 5270a1d5f8a38dda02d79636110c4a2869c7f0f1..e889ba5367c169862333edcab62155ba0249463a 100644 (file)
--- a/src/abstractclipitem.cpp
+++ b/src/abstractclipitem.cpp
@@ -123,7 +123,7 @@ void AbstractClipItem::resizeStart(int posx, double speed) {
         }*/
 }
 
-void AbstractClipItem::resizeEnd(int posx, double speed, bool updateKeyFrames) {
+void AbstractClipItem::resizeEnd(int posx, double speed, bool /*updateKeyFrames*/) {
     GenTime durationDiff = GenTime(posx, m_fps) - endPos();
     if (durationDiff == GenTime()) return;
     //kDebug() << "// DUR DIFF1:" << durationDiff.frames(25) << ", ADJUSTED: " << durationDiff.frames(25) * speed << ", SPED:" << speed;
@@ -224,7 +224,7 @@ QPainterPath AbstractClipItem::lowerRectPart(QRectF br) {
     return roundRectPathLower;
 }
 
-void AbstractClipItem::drawKeyFrames(QPainter *painter, QRectF exposedRect) {
+void AbstractClipItem::drawKeyFrames(QPainter *painter, QRectF /*exposedRect*/) {
     if (m_keyframes.count() < 2) return;
     QRectF br = rect();
     double maxw = br.width() / m_cropDuration.frames(m_fps);

diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index 7c45aaff10d44859030150e2b348b9fb7c15dada..529a23aff783c81bba92b65c5c63b25d3f66e205 100644 (file)
--- a/src/clipitem.cpp
+++ b/src/clipitem.cpp
@@ -516,7 +516,7 @@ void ClipItem::flashClip() {
     m_timeLine->start();
 }
 
-void ClipItem::animate(qreal value) {
+void ClipItem::animate(qreal /*value*/) {
     QRectF r = boundingRect();
     r.setHeight(20);
     update(r);
@@ -529,8 +529,10 @@ void ClipItem::paint(QPainter *painter,
     /*if (parentItem()) m_opacity = 0.5;
     else m_opacity = 1.0;
     painter->setOpacity(m_opacity);*/
-    QBrush paintColor = brush();
-    if (isSelected()) paintColor = QBrush(QColor(79, 93, 121));
+    QBrush paintColor;
+    if (parentItem()) paintColor = QBrush(QColor(255, 248, 149));
+    else paintColor = brush();
+    if (isSelected()) paintColor = QBrush(paintColor.color().darker());
     QRectF br = rect();
     QRectF exposed = option->exposedRect;
     QRectF mapped = painter->matrix().mapRect(br);
@@ -733,10 +735,8 @@ void ClipItem::paint(QPainter *painter,
     // draw frame around clip
     if (isSelected()) {
         pen.setColor(Qt::red);
-        //pen.setWidth(2);
     } else {
         pen.setColor(Qt::black);
-        //pen.setWidth(1);
     }
 
     // draw effect or transition keyframes
@@ -745,9 +745,6 @@ void ClipItem::paint(QPainter *painter,
     painter->setMatrixEnabled(true);
 
     // draw clip border
-
-    //kDebug()<<"/// ITEM PAINTING:: exposed="<<exposed<<", RECT = "<<rect();
-
     // expand clip rect to allow correct painting of clip border
     exposed.setRight(exposed.right() + 1 / scale + 0.5);
     exposed.setBottom(exposed.bottom() + 1);
@@ -956,7 +953,7 @@ void ClipItem::mouseReleaseEvent(QGraphicsSceneMouseEvent * event) {
 }
 
 //virtual
-void ClipItem::hoverEnterEvent(QGraphicsSceneHoverEvent *e) {
+void ClipItem::hoverEnterEvent(QGraphicsSceneHoverEvent */*e*/) {
     //if (e->pos().x() < 20) m_hover = true;
     if (isItemLocked()) return;
     m_hover = true;
@@ -980,7 +977,7 @@ void ClipItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *) {
     update(r.right() - width, r.y() + height, width, height);
 }
 
-void ClipItem::resizeStart(int posx, double speed) {
+void ClipItem::resizeStart(int posx, double /*speed*/) {
     const int min = (startPos() - cropStart()).frames(m_fps);
     if (posx < min) posx = min;
     if (posx == startPos().frames(m_fps)) return;
@@ -995,7 +992,7 @@ void ClipItem::resizeStart(int posx, double speed) {
     }
 }
 
-void ClipItem::resizeEnd(int posx, double speed, bool updateKeyFrames) {
+void ClipItem::resizeEnd(int posx, double /*speed*/, bool updateKeyFrames) {
     const int max = (startPos() - cropStart() + maxDuration()).frames(m_fps) + 1;
     if (posx > max) posx = max;
     if (posx == endPos().frames(m_fps)) return;

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 4441372c7e5f8eb68c6fdfdcfebada99f6156e3a..3397058b3b9bbcbbcfb92473d964adea2e1c7e94 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -1349,7 +1349,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) {
         }
 }
 
-void CustomTrackView::slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, int endTrack, QDomElement transition) {
+void CustomTrackView::slotAddTransition(ClipItem* /*clip*/, ItemInfo transitionInfo, int endTrack, QDomElement transition) {
     if (transitionInfo.startPos >= transitionInfo.endPos) {
         emit displayMessage(i18n("Invalid transition"), ErrorMessage);
         return;
@@ -1371,7 +1371,7 @@ void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomE
     }
 }
 
-void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) {
+void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement /*params*/) {
     Transition *item = getTransitionItemAt(transitionInfo.startPos, transitionInfo.track);
     if (!item) {
         emit displayMessage(i18n("Select clip to delete"), ErrorMessage);

diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp
index f7250db476a5bdaef82f04a858377bdc91ea04b4..0984f9232d32ecb4c2881f5a52c67e0f25b3ba01 100644 (file)
--- a/src/docclipbase.cpp
+++ b/src/docclipbase.cpp
@@ -218,7 +218,7 @@ QDomElement DocClipBase::toXML() const {
 }
 
 DocClipBase *DocClipBase::
-createClip(KdenliveDoc *doc, const QDomElement & element) {
+createClip(KdenliveDoc */*doc*/, const QDomElement & element) {
     DocClipBase *clip = 0;
     QString description;
     QDomNode node = element;

diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp
index 87219acd9e14f7d128f929a28d1bfc0437e16fe9..ad608371bd2438c6d65b4a79404633fa6832b73e 100644 (file)
--- a/src/dvdwizard.cpp
+++ b/src/dvdwizard.cpp
@@ -390,7 +390,7 @@ void DvdWizard::generateDvd() {
 
 }
 
-void DvdWizard::slotRenderFinished(int exitCode, QProcess::ExitStatus status) {
+void DvdWizard::slotRenderFinished(int /*exitCode*/, QProcess::ExitStatus status) {
     QListWidgetItem *authitem =  m_status.job_progress->item(3);
     if (status == QProcess::CrashExit) {
         kDebug() << "DVDAuthor process crashed";
@@ -410,7 +410,7 @@ void DvdWizard::slotRenderFinished(int exitCode, QProcess::ExitStatus status) {
 
 }
 
-void DvdWizard::slotIsoFinished(int exitCode, QProcess::ExitStatus status) {
+void DvdWizard::slotIsoFinished(int /*exitCode*/, QProcess::ExitStatus status) {
     QListWidgetItem *isoitem =  m_status.job_progress->item(4);
     if (status == QProcess::CrashExit) {
         m_authorFile.remove();

diff --git a/src/dvdwizardmenu.cpp b/src/dvdwizardmenu.cpp
index 189c81632d96dae60f0d279e13b421f7a8f61e3a..ee2e9c40123d8c189a13f941a2c16caefcc25323 100644 (file)
--- a/src/dvdwizardmenu.cpp
+++ b/src/dvdwizardmenu.cpp
@@ -244,7 +244,7 @@ void DvdWizardMenu::updatePreview() {
     m_safeRect->setRect(safeW, safeH, m_width - 2 * safeW, m_height - 2 * safeH);
 }
 
-void DvdWizardMenu::setTargets(QStringList list) {
+void DvdWizardMenu::setTargets(QStringList /*list*/) {
     m_targets = QStringList() << i18n("Play All");
     // TODO: re-enable different targets
     /*

diff --git a/src/guide.cpp b/src/guide.cpp
index ed2a85bee0b0bd77008a8ffd70ff9cbf3864724d..79b62045c2d35b82c7fee17ce4489bafa9266024 100644 (file)
--- a/src/guide.cpp
+++ b/src/guide.cpp
@@ -103,7 +103,7 @@ QRectF Guide::boundingRect() const {
 }
 
 // virtual
-void Guide::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *w) {
+void Guide::paint(QPainter *painter, const QStyleOptionGraphicsItem */*option*/, QWidget */*w*/) {
     painter->setMatrixEnabled(false);
     QLineF guideline = painter->matrix().map(line());
     painter->setPen(pen());

diff --git a/src/initeffects.cpp b/src/initeffects.cpp
index 12174d8d1a2806a204233f746246f97079f87f6c..ed1c0955669b9767a13072f1b15751b451c90379 100644 (file)
--- a/src/initeffects.cpp
+++ b/src/initeffects.cpp
@@ -465,7 +465,7 @@ char* initEffects::ladspaPhaserEffectString(QStringList params) {
 }
 
 
-QDomDocument initEffects::createDescriptionFromMlt(Mlt::Repository* repository, const QString& type, const QString& filtername) {
+QDomDocument initEffects::createDescriptionFromMlt(Mlt::Repository* repository, const QString& /*type*/, const QString& filtername) {
 
     QDomDocument ret;
     Mlt::Properties *metadata = repository->metadata(filter_type, filtername.toAscii().data());

diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp
index 2b230524b16953da3f19c2402fe6e9e7935459f2..388de5851600323c684972fbb07d01bfe20a8887 100644 (file)
--- a/src/kdenlivedoc.cpp
+++ b/src/kdenlivedoc.cpp
@@ -1481,7 +1481,7 @@ DocClipBase *KdenliveDoc::getBaseClip(const QString &clipId) {
     return m_clipManager->getClipById(clipId);
 }
 
-void KdenliveDoc::slotCreateTextClip(QString group, const QString &groupId) {
+void KdenliveDoc::slotCreateTextClip(QString /*group*/, const QString &/*groupId*/) {
     QString titlesFolder = projectFolder().path() + "/titles/";
     KStandardDirs::makeDir(titlesFolder);
     TitleWidget *dia_ui = new TitleWidget(KUrl(), titlesFolder, m_render, kapp->activeWindow());

diff --git a/src/kthumb.cpp b/src/kthumb.cpp
index 6f21286314dfd176407e6c996deaf450cb3376f6..e80222fdd50b3aacc58b8d4643e15ad2b4bcc2b0 100644 (file)
--- a/src/kthumb.cpp
+++ b/src/kthumb.cpp
@@ -122,7 +122,17 @@ void MyThread::run() {
 
 }
 
-KThumb::KThumb(ClipManager *clipManager, KUrl url, const QString &id, const QString &hash, QObject * parent, const char *name): QObject(parent), m_clipManager(clipManager), m_url(url), m_id(id), m_producer(NULL), m_dar(1), m_mainFrame(-1) {
+KThumb::KThumb(ClipManager *clipManager, KUrl url, const QString &id, const QString &hash, QObject * parent, const char */*name*/)
+  : QObject(parent),
+    audioThumbProducer(),
+    m_url(url),
+    m_thumbFile(),
+    m_dar(1),
+    m_producer(NULL),
+    m_clipManager(clipManager),
+    m_id(id),
+    m_mainFrame(-1)
+{
     m_thumbFile = clipManager->projectFolder() + "/thumbs/" + hash + ".thumb";
     connect(&audioThumbProducer, SIGNAL(audioThumbProgress(const int)), this, SLOT(slotAudioThumbProgress(const int)));
     connect(&audioThumbProducer, SIGNAL(audioThumbOver()), this, SLOT(slotAudioThumbOver()));

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 9ecab01d0480cee25cdeb773caaddc85972a5120..cacf172ac9a24b94ba95fc2eb3cc5bcfc56616a4 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2219,7 +2219,7 @@ void MainWindow::keyPressEvent(QKeyEvent *ke) {
 
 
 /** Gets called when the window gets hidden */
-void MainWindow::hideEvent(QHideEvent *event) {
+void MainWindow::hideEvent(QHideEvent */*event*/) {
     // kDebug() << "I was hidden";
     // issue http://www.kdenlive.org/mantis/view.php?id=231
     if (this->isMinimized()) {

diff --git a/src/monitor.cpp b/src/monitor.cpp
index cd2713d8dfb1ed447d5bbb24b6c32a8728cfde62..93f842f8dc014a776cf169022a2b744055f136b7 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -691,7 +691,7 @@ void MonitorRefresh::setRenderer(Render* render) {
     m_renderer = render;
 }
 
-void MonitorRefresh::paintEvent(QPaintEvent * event) {
+void MonitorRefresh::paintEvent(QPaintEvent * /*event*/) {
     if (m_renderer) m_renderer->doRefresh();
 }
 
@@ -703,7 +703,7 @@ Overlay::Overlay(QWidget* parent): QLabel(parent) {
     setAutoFillBackground(false);
 }
 
-void Overlay::paintEvent(QPaintEvent * event) {
+void Overlay::paintEvent(QPaintEvent * /*event*/) {
     QPainter painter(this);
     QColor col;
     painter.setPen(Qt::white);

diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp
index 479d0568300512fd2bf658d76bb73a52955395bf..5d9749ebce1c71dba61696816721dfbd20fce1a9 100644 (file)
--- a/src/recmonitor.cpp
+++ b/src/recmonitor.cpp
@@ -590,7 +590,7 @@ void RecMonitor::manageCapturedFiles() {
 }
 
 // virtual
-void RecMonitor::mousePressEvent(QMouseEvent * event) {
+void RecMonitor::mousePressEvent(QMouseEvent * /*event*/) {
     slotPlay();
 }
 

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 79d24c2c8c87e0450a9033265e1fe2fa3c225c7b..20ca3fce4f69746ba64dfe8ebfb0558638f237a5 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -257,7 +257,7 @@ QPixmap Render::extractFrame(int frame_position, int width, int height) {
     return KThumb::getFrame(m_mltProducer, frame_position, width, height);
 }
 
-QPixmap Render::getImageThumbnail(KUrl url, int width, int height) {
+QPixmap Render::getImageThumbnail(KUrl url, int /*width*/, int /*height*/) {
     QImage im;
     QPixmap pixmap;
     if (url.fileName().startsWith(".all.")) {  //  check for slideshow
@@ -946,7 +946,7 @@ void Render::refreshDisplay() {
     refresh();
 }
 
-void Render::setVolume(double volume) {
+void Render::setVolume(double /*volume*/) {
     if (!m_mltConsumer || !m_mltProducer) return;
     /*osdTimer->stop();
     m_mltConsumer->set("refresh", 0);
@@ -1202,12 +1202,12 @@ void Render::emitConsumerStopped() {
 
 
 
-void Render::exportFileToFirewire(QString srcFileName, int port, GenTime startTime, GenTime endTime) {
+void Render::exportFileToFirewire(QString /*srcFileName*/, int /*port*/, GenTime /*startTime*/, GenTime /*endTime*/) {
     KMessageBox::sorry(0, i18n("Firewire is not enabled on your system.\n Please install Libiec61883 and recompile Kdenlive"));
 }
 
 
-void Render::exportCurrentFrame(KUrl url, bool notify) {
+void Render::exportCurrentFrame(KUrl url, bool /*notify*/) {
     if (!m_mltProducer) {
         KMessageBox::sorry(qApp->activeWindow(), i18n("There is no clip, cannot extract frame."));
         return;
@@ -2473,7 +2473,7 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G
     m_mltConsumer->set("refresh", 1);
 }
 
-void Render::mltDeleteTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh) {
+void Render::mltDeleteTransition(QString tag, int /*a_track*/, int b_track, GenTime in, GenTime out, QDomElement /*xml*/, bool /*do_refresh*/) {
     Mlt::Service service(m_mltProducer->parent().get_service());
     Mlt::Tractor tractor(service);
     Mlt::Field *field = tractor.field();
@@ -2679,7 +2679,7 @@ void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int
 }
 
 
-bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh) {
+bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool /*do_refresh*/) {
     if (in >= out) return false;
     QMap<QString, QString> args = mltGetTransitionParamsFromXml(xml);
     Mlt::Service service(m_mltProducer->parent().get_service());

diff --git a/src/titledocument.cpp b/src/titledocument.cpp
index 664c3311825e803c04b391e6fcddfca1944b6f3c..da81c62be548270b6b782c4d1c63d9c4b1a2cfb4 100644 (file)
--- a/src/titledocument.cpp
+++ b/src/titledocument.cpp
@@ -171,7 +171,7 @@ int TitleDocument::loadDocument(const KUrl& url, QGraphicsPolygonItem* startv, Q
     return -1;
 }
 
-int TitleDocument::loadFromXml(QDomDocument doc, QGraphicsPolygonItem* startv, QGraphicsPolygonItem* endv) {
+int TitleDocument::loadFromXml(QDomDocument doc, QGraphicsPolygonItem* /*startv*/, QGraphicsPolygonItem* /*endv*/) {
     QDomNodeList titles = doc.elementsByTagName("kdenlivetitle");
     int maxZValue = 0;
     if (titles.size()) {

diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp
index ed1b6801d9e5a8dc1e0c43a2c5d9d777eb5997dd..4612961bde3cb2a5c9aedc24c5e9d2313e7490cf 100644 (file)
--- a/src/titlewidget.cpp
+++ b/src/titlewidget.cpp
@@ -231,7 +231,7 @@ QString TitleWidget::getTitleResourceFromName(const KUrl &projectUrl, const QStr
 }
 
 //virtual
-void TitleWidget::resizeEvent(QResizeEvent * event) {
+void TitleWidget::resizeEvent(QResizeEvent * /*event*/) {
     //slotAdjustZoom();
 }
 

diff --git a/src/transition.cpp b/src/transition.cpp
index b88a494fd07326b7d88c60a0337da9a0a4afa1d6..f2efbf35f147464da1682f1a05da79701f7c1f43 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -122,7 +122,7 @@ QPixmap Transition::transitionPixmap() const {
 }
 
 
-void Transition::setTransitionDirection(bool inv) {
+void Transition::setTransitionDirection(bool /*inv*/) {
     //m_parameters.setAttribute("reverse", inv);
 }
 
@@ -145,7 +145,7 @@ bool Transition::forcedTrack() const {
 
 void Transition::paint(QPainter *painter,
                        const QStyleOptionGraphicsItem *option,
-                       QWidget *widget) {
+                       QWidget */*widget*/) {
     const double scale = option->matrix.m11();
     QRectF exposed = option->exposedRect;
     painter->setClipRect(exposed);

diff --git a/thumbnailer/westleypreview.cpp b/thumbnailer/westleypreview.cpp
index 547fd5d0b5dc5ce310568ff032595f3a659b8c46..aede9b6936c1103fec4e54a8b67eadd6148421ba 100644 (file)
--- a/thumbnailer/westleypreview.cpp
+++ b/thumbnailer/westleypreview.cpp
@@ -71,7 +71,7 @@ bool WestleyPreview::startAndWaitProcess(const QStringList &args) {
     return true;
 }
 
-bool WestleyPreview::create(const QString &path, int width, int height, QImage &img) {
+bool WestleyPreview::create(const QString &path, int width, int /*height*/, QImage &img) {
     QFileInfo fi(path);
     playerBin = KStandardDirs::findExe("inigo");
     if (playerBin.isEmpty()) {
@@ -128,7 +128,7 @@ bool WestleyPreview::create(const QString &path, int width, int height, QImage &
     }
 
     if (pix.depth() != 32)
-       img = pix.convertToFormat( QImage::Format_RGB32 );
+        img = pix.convertToFormat(QImage::Format_RGB32);
     else img = pix;
     return true;
 }
@@ -176,8 +176,7 @@ uint WestleyPreview::imageVariance(QImage image) {
     return delta / STEPS;
 }
 
-ThumbCreator::Flags WestleyPreview::flags() const
-{
+ThumbCreator::Flags WestleyPreview::flags() const {
     return None;
 }