Differential D10213 Diff 26442 git/fileviewgitplugin.cpp

Changeset View

Standalone View

View Options

git/fileviewgitplugin.cpp

Context not available.
105 m_pullAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Pull...")); 105​ m_pullAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Pull..."));
106 connect(m_pullAction, SIGNAL(triggered()), 106​ connect(m_pullAction, SIGNAL(triggered()),
107 this, SLOT(pull())); 107​ this, SLOT(pull()));
108​ m_mergeAction = new QAction(this);
109​ m_mergeAction->setIcon(QIcon::fromTheme("merge"));
110​ m_mergeAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Merge..."));
111​ connect(m_mergeAction, &QAction::triggered, this, &FileViewGitPlugin::merge);
elvisangelaccioUnsubmitted
Done

Let's use the Qt5's connect() syntax for new code.

elvisangelaccio: Let's use the Qt5's `connect()` syntax for new code.
108 112​
109 connect(&m_process, SIGNAL(finished(int, QProcess::ExitStatus)), 113​ connect(&m_process, SIGNAL(finished(int, QProcess::ExitStatus)),
110 this, SLOT(slotOperationCompleted(int, QProcess::ExitStatus))); 114​ this, SLOT(slotOperationCompleted(int, QProcess::ExitStatus)));
Context not available.
340 345​
341 bool canCommit = false; 346​ bool canCommit = false;
342 bool showChanges = false; 347​ bool showChanges = false;
348​ bool shouldMerge = false;
343 QHash<QString, ItemVersion>::const_iterator it = m_versionInfoHash.constBegin(); 349​ QHash<QString, ItemVersion>::const_iterator it = m_versionInfoHash.constBegin();
344 while (it != m_versionInfoHash.constEnd()) { 350​ while (it != m_versionInfoHash.constEnd()) {
345 const ItemVersion state = it.value(); 351​ const ItemVersion state = it.value();
Context not available.
352 if (state == ConflictingVersion) { 358​ if (state == ConflictingVersion) {
353 canCommit = false; 359​ canCommit = false;
354 showChanges = true; 360​ showChanges = true;
361​ shouldMerge = true;
355 break; 362​ break;
356 } 363​ }
357 ++it; 364​ ++it;
Context not available.
360 m_showLocalChangesAction->setEnabled(!m_pendingOperation && showChanges); 367​ m_showLocalChangesAction->setEnabled(!m_pendingOperation && showChanges);
361 actions.append(m_showLocalChangesAction); 368​ actions.append(m_showLocalChangesAction);
362 369​
363 m_commitAction->setEnabled(!m_pendingOperation && canCommit); 370​ if (!shouldMerge) {
364 actions.append(m_commitAction); 371​ m_commitAction->setEnabled(!m_pendingOperation && canCommit);
372​ actions.append(m_commitAction);
373​ } else {
374​ m_mergeAction->setEnabled(!m_pendingOperation);
375​ actions.append(m_mergeAction);
376​ }
365 377​
366 m_tagAction->setEnabled(!m_pendingOperation); 378​ m_tagAction->setEnabled(!m_pendingOperation);
367 actions.append(m_tagAction); 379​ actions.append(m_tagAction);
Context not available.
407 KRun::runCommand(QLatin1String("git difftool --dir-diff ."), nullptr, m_contextDir); 419​ KRun::runCommand(QLatin1String("git difftool --dir-diff ."), nullptr, m_contextDir);
408} 420​}
409 421​
422​void FileViewGitPlugin::merge()
423​{
424​ Q_ASSERT(!m_contextDir.isEmpty());
425​
426​ KRun::runCommand(QStringLiteral("git mergetool"), nullptr, m_contextDir);
elvisangelaccioUnsubmitted
Done

QStringLiteral

elvisangelaccio: `QStringLiteral`
427​}
428​
410void FileViewGitPlugin::checkout() 429​void FileViewGitPlugin::checkout()
411{ 430​{
412 CheckoutDialog dialog; 431​ CheckoutDialog dialog;
Context not available.