kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: fix C++20 warning: bitwise operation between different enumeration types [-Wdeprecated-enum-enum-conversion]

Browse Source
This commit is contained in:
wmayer
2021-12-02 09:59:31 +01:00
parent 2e5bcae6b8
commit 4f12416fa0
4 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Gui/CommandView.cpp
View File

@@ -352,17 +352,16 @@ void StdCmdFreezeViews::activated(int iMsg)
getGuiApplication()->sendMsgToActiveView("GetCamera",&ppReturn);
QList<QAction*> acts = pcAction->actions();
int index = 0;
int index = 1;
for (QList<QAction*>::ConstIterator it = acts.begin()+offset; it != acts.end(); ++it, index++) {
if (!(*it)->isVisible()) {
savedViews++;
QString viewnr = QString(QObject::tr("Restore view &%1")).arg(index+1);
QString viewnr = QString(QObject::tr("Restore view &%1")).arg(index);
(*it)->setText(viewnr);
(*it)->setToolTip(QString::fromLatin1(ppReturn));
(*it)->setVisible(true);
if (index < 9) {
int accel = Qt::CTRL+Qt::Key_1;
(*it)->setShortcut(accel+index);
if (index < 10) {
(*it)->setShortcut(QKeySequence(QString::fromLatin1("CTRL+%1").arg(index)));
}
break;
}
@@ -499,9 +498,8 @@ void StdCmdFreezeViews::onRestoreViews()
acts[i+offset]->setText(viewnr);
acts[i+offset]->setToolTip(setting);
acts[i+offset]->setVisible(true);
if ( i < 9 ) {
int accel = Qt::CTRL+Qt::Key_1;
acts[i+offset]->setShortcut(accel+i);
if (i < 9) {
acts[i+offset]->setShortcut(QKeySequence(QString::fromLatin1("CTRL+%1").arg(i+1)));
}
}