From 189ef7e1a7e40e299e1b78cacc64a1d00e36f525 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Wed, 11 Mar 2009 12:43:16 +0000 Subject: [PATCH] Comment out names of unused parameters [PATCH by Ray Lehtiniemi] svn path=/trunk/kdenlive/; revision=3131 --- plugins/sampleplugin/sampleplugin.cpp | 2 +- renderer/renderjob.cpp | 2 +- src/abstractclipitem.cpp | 4 ++-- src/clipitem.cpp | 19 ++++++++----------- src/customtrackview.cpp | 4 ++-- src/docclipbase.cpp | 2 +- src/dvdwizard.cpp | 4 ++-- src/dvdwizardmenu.cpp | 2 +- src/guide.cpp | 2 +- src/initeffects.cpp | 2 +- src/kdenlivedoc.cpp | 2 +- src/kthumb.cpp | 12 +++++++++++- src/mainwindow.cpp | 2 +- src/monitor.cpp | 4 ++-- src/recmonitor.cpp | 2 +- src/renderer.cpp | 12 ++++++------ src/titledocument.cpp | 2 +- src/titlewidget.cpp | 2 +- src/transition.cpp | 4 ++-- thumbnailer/westleypreview.cpp | 7 +++---- 20 files changed, 49 insertions(+), 43 deletions(-) diff --git a/plugins/sampleplugin/sampleplugin.cpp b/plugins/sampleplugin/sampleplugin.cpp index 177387f9..75b87c60 100644 --- 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 cb2628bd..1ab486dc 100644 --- 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 5270a1d5..e889ba53 100644 --- 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 7c45aaff..529a23af 100644 --- 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="<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 189c8163..ee2e9c40 100644 --- 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 ed2a85be..79b62045 100644 --- 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 12174d8d..ed1c0955 100644 --- 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 2b230524..388de585 100644 --- 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 6f212863..e80222fd 100644 --- 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 9ecab01d..cacf172a 100644 --- 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 cd2713d8..93f842f8 100644 --- 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 479d0568..5d9749eb 100644 --- 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 79d24c2c..20ca3fce 100644 --- 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 args = mltGetTransitionParamsFromXml(xml); Mlt::Service service(m_mltProducer->parent().get_service()); diff --git a/src/titledocument.cpp b/src/titledocument.cpp index 664c3311..da81c62b 100644 --- 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 ed1b6801..4612961b 100644 --- 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 b88a494f..f2efbf35 100644 --- 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 547fd5d0..aede9b69 100644 --- 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; } -- 2.39.2