Mercurial > hg > easyhg
comparison src/mainwindow.cpp @ 671:ce29dc775650 qt5
Fix compiler warnings
author | Chris Cannam |
---|---|
date | Wed, 05 Dec 2018 09:43:26 +0000 |
parents | cfe684675e81 |
children | 0329bbd4b57c |
comparison
equal
deleted
inserted
replaced
670:8f3075eeaac2 | 671:ce29dc775650 |
---|---|
856 info); | 856 info); |
857 | 857 |
858 hgRefresh(); | 858 hgRefresh(); |
859 } | 859 } |
860 | 860 |
861 void MainWindow::hgUnIgnoreFiles(QStringList files) | 861 void MainWindow::hgUnIgnoreFiles(QStringList) |
862 { | 862 { |
863 // Not implemented: edit the .hgignore instead | 863 // Not implemented: edit the .hgignore instead |
864 hgEditIgnore(); | 864 hgEditIgnore(); |
865 } | 865 } |
866 | 866 |
2046 tr("Authorization failed"), | 2046 tr("Authorization failed"), |
2047 tr("You may have entered an incorrect user name or password, or the remote URL may be wrong.<br><br>Or you may lack the necessary permissions on the remote repository.<br><br>Check with the administrator of your remote repository if necessary."), | 2047 tr("You may have entered an incorrect user name or password, or the remote URL may be wrong.<br><br>Or you may lack the necessary permissions on the remote repository.<br><br>Check with the administrator of your remote repository if necessary."), |
2048 output); | 2048 output); |
2049 } | 2049 } |
2050 | 2050 |
2051 void MainWindow::commandStarting(HgAction action) | 2051 void MainWindow::commandStarting(HgAction) |
2052 { | 2052 { |
2053 m_commandSequenceInProgress = true; | 2053 m_commandSequenceInProgress = true; |
2054 } | 2054 } |
2055 | 2055 |
2056 void MainWindow::commandFailed(HgAction action, QString stdErr, QString stdOut) | 2056 void MainWindow::commandFailed(HgAction action, QString stdErr, QString stdOut) |
2589 updateRecentMenu(); | 2589 updateRecentMenu(); |
2590 checkFilesystem(); | 2590 checkFilesystem(); |
2591 } | 2591 } |
2592 } | 2592 } |
2593 | 2593 |
2594 void MainWindow::commandCancelled(HgAction cancelledAction) | 2594 void MainWindow::commandCancelled(HgAction) |
2595 { | 2595 { |
2596 // Originally I had this checking whether the cancelled action was | 2596 // Originally I had this checking whether the cancelled action was |
2597 // a network one and, if so, calling hgQueryPaths to update the | 2597 // a network one and, if so, calling hgQueryPaths to update the |
2598 // local view in case it had changed anything. But that doesn't | 2598 // local view in case it had changed anything. But that doesn't |
2599 // work properly -- because at this point, although the command | 2599 // work properly -- because at this point, although the command |
3112 #endif | 3112 #endif |
3113 | 3113 |
3114 #ifdef Q_OS_WIN32 | 3114 #ifdef Q_OS_WIN32 |
3115 spacerBefore = spacerAfter = " "; | 3115 spacerBefore = spacerAfter = " "; |
3116 #endif | 3116 #endif |
3117 | |
3118 bool spacingReqd = false; | |
3119 QString spacer = ""; | |
3120 | 3117 |
3121 m_repoToolBar = addToolBar(tr("Remote")); | 3118 m_repoToolBar = addToolBar(tr("Remote")); |
3122 m_repoToolBar->setIconSize(QSize(sz, sz)); | 3119 m_repoToolBar->setIconSize(QSize(sz, sz)); |
3123 if (spacerBefore != "") { | 3120 if (spacerBefore != "") { |
3124 m_repoToolBar->addWidget(new QLabel(spacerBefore)); | 3121 m_repoToolBar->addWidget(new QLabel(spacerBefore)); |