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

svn path=/trunk/kdenlive/; revision=3131
parent 4a47150a
......@@ -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";
......
......@@ -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);
......
......@@ -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);
......
......@@ -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;
......
......@@ -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);
......
......@@ -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;
......
......@@ -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();
......
......@@ -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
/*
......
......@@ -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());
......
......@@ -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());
......
......@@ -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());
......
......@@ -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()));
......
......@@ -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()) {
......
......@@ -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);
......
......@@ -590,7 +590,7 @@ void RecMonitor::manageCapturedFiles() {
}
// virtual
void RecMonitor::mousePressEvent(QMouseEvent * event) {
void RecMonitor::mousePressEvent(QMouseEvent * /*event*/) {
slotPlay();
}
......
......@@ -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());
......
......@@ -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()) {
......
......@@ -231,7 +231,7 @@ QString TitleWidget::getTitleResourceFromName(const KUrl &projectUrl, const QStr
}
//virtual
void TitleWidget::resizeEvent(QResizeEvent * event) {
void TitleWidget::resizeEvent(QResizeEvent * /*event*/) {
//slotAdjustZoom();
}
......
......@@ -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);
......
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment