Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit c35c01d6 authored by Thomas Eschenbacher's avatar Thomas Eschenbacher

(renamed some shadowed local variables)

parent 332718f7
......@@ -404,9 +404,9 @@ int Kwave::FileContext::executeCommand(const QString &line)
CASE_COMMAND("delayed")
if (parser.count() != 2)
return -EINVAL;
unsigned int delay = parser.firstParam().toUInt();
QString cmd = parser.nextParam();
enqueueCommand(delay, cmd);
unsigned int delay = parser.firstParam().toUInt();
QString delayed_cmd = parser.nextParam();
enqueueCommand(delay, delayed_cmd);
result = 0;
CASE_COMMAND("loadbatch")
result = loadBatch(QUrl(parser.nextParam()));
......
......@@ -1365,9 +1365,9 @@ void Kwave::TopWidget::updateMenu()
// update the "Windows" menu
m_menu_manager->clearNumberedMenu(_("ID_WINDOW_LIST"));
unsigned int win_count = 0;
foreach (const Kwave::FileContext *context, m_context_map.values()) {
if (!context) continue;
QString caption = context->windowCaption(false);
foreach (const Kwave::FileContext *ctx, m_context_map.values()) {
if (!ctx) continue;
QString caption = ctx->windowCaption(false);
if (!caption.length()) continue;
m_menu_manager->addNumberedMenuEntry(_("ID_WINDOW_LIST"),
caption, QString());
......
......@@ -162,9 +162,9 @@ void Kwave::LabelItem::moveTo(const QPoint &mouse_pos)
if (!m_undo_transaction) return;
// save the previous label data for undo
Kwave::Label label = m_signal_manager.findLabel(m_initial_pos);
Kwave::Label lbl = m_signal_manager.findLabel(m_initial_pos);
if (!m_undo_transaction->registerUndoAction(new(std::nothrow)
UndoModifyMetaDataAction(Kwave::MetaDataList(label)))) {
UndoModifyMetaDataAction(Kwave::MetaDataList(lbl)))) {
qWarning("Kwave::LabelItem::done(): saving undo data failed!");
return;
}
......@@ -172,10 +172,10 @@ void Kwave::LabelItem::moveTo(const QPoint &mouse_pos)
if (m_signal_manager.modifyLabel(m_index, new_pos,
m_description, false)) {
Kwave::Label label = m_signal_manager.findLabel(new_pos);
if (!label.isNull()) {
m_index = m_signal_manager.labelIndex(label);
m_current_pos = label.pos();
Kwave::Label lbl = m_signal_manager.findLabel(new_pos);
if (!lbl.isNull()) {
m_index = m_signal_manager.labelIndex(lbl);
m_current_pos = lbl.pos();
}
}
}
......
......@@ -252,16 +252,16 @@ int Kwave::SaveBlocksPlugin::start(QStringList &params)
QUrl url = m_url.adjusted(QUrl::RemoveFilename);
url.setPath(url.path(QUrl::FullyEncoded) + name, QUrl::StrictMode);
QString filename = url.path();
QFileInfo file_info(filename);
QString p = url.path();
QFileInfo fi(p);
// check for potentially overwritten file
if (file_info.exists())
if (fi.exists())
overwritten_files += Kwave::Parser::unescape(display_name);
// check for missing subdirectory
if (!file_info.dir().exists()) {
QString missing_dir = file_info.absolutePath();
if (!fi.dir().exists()) {
QString missing_dir = fi.absolutePath();
if (!missing_dirs.contains(missing_dir))
missing_dirs += missing_dir;
}
......@@ -306,10 +306,10 @@ int Kwave::SaveBlocksPlugin::start(QStringList &params)
QString::fromLatin1(QUrl::toPercentEncoding(missing)),
QUrl::StrictMode
);
QString path = url.path();
QString p = url.path();
QDir dir;
if (!dir.mkpath(path))
qWarning("creating path '%s' failed", DBG(path));
if (!dir.mkpath(p))
qWarning("creating path '%s' failed", DBG(p));
}
}
......
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