Adapt to changes in c++utilities

This commit is contained in:
Martchus 2019-06-12 21:02:57 +02:00
parent f16dbc06d1
commit d606b8a6cb
4 changed files with 4 additions and 4 deletions

View File

@ -272,7 +272,7 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event)
}
return true;
}
FALLTHROUGH;
[[fallthrough]];
default:;
}
}

View File

@ -458,7 +458,7 @@ bool EntryModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int co
// determine the source parent entry and dest parent entry as node entries
auto *const srcParentEntry = static_cast<NodeEntry *>(sourceParent.internalPointer());
auto *const destParentEntry = static_cast<NodeEntry *>(destinationParent.internalPointer());
#if DEBUG_BUILD
#if CPP_UTILITIES_DEBUG_BUILD
cout << "destinationChild: " << destinationChild << endl;
#endif
// source rows must be within the valid range

View File

@ -12,7 +12,7 @@
#ifndef QT_NO_CLIPBOARD
#include <QClipboard>
#endif
#if defined(DEBUG_BUILD) || (defined(Q_OS_ANDROID) && defined(CPP_UTILITIES_USE_NATIVE_FILE_BUFFER))
#if defined(CPP_UTILITIES_DEBUG_BUILD) || (defined(Q_OS_ANDROID) && defined(CPP_UTILITIES_USE_NATIVE_FILE_BUFFER))
#include <QDebug>
#endif
#include <QDir>

View File

@ -64,7 +64,7 @@ int runQuickGui(int argc, char *argv[], const QtConfigArguments &qtConfigArgs, c
}
// log resource information
#if defined(Q_OS_ANDROID) && defined(DEBUG_BUILD)
#if defined(Q_OS_ANDROID) && defined(CPP_UTILITIES_DEBUG_BUILD)
qDebug() << "Using icon theme" << QIcon::themeName();
qDebug() << "Icon theme search paths" << QIcon::themeSearchPaths();
qDebug() << "Resources:";