From d606b8a6cbd6d854d3bed3d60c920354c728ddbb Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 12 Jun 2019 21:02:57 +0200
Subject: [PATCH] Adapt to changes in c++utilities

---
 gui/mainwindow.cpp         | 2 +-
 model/entrymodel.cpp       | 2 +-
 quickgui/controller.cpp    | 2 +-
 quickgui/initiatequick.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index a6af83d..77dae60 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -272,7 +272,7 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event)
                 }
                 return true;
             }
-            FALLTHROUGH;
+            [[fallthrough]];
         default:;
         }
     }
diff --git a/model/entrymodel.cpp b/model/entrymodel.cpp
index 0643391..4e8fc15 100644
--- a/model/entrymodel.cpp
+++ b/model/entrymodel.cpp
@@ -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
diff --git a/quickgui/controller.cpp b/quickgui/controller.cpp
index 5ec5e6f..d325890 100644
--- a/quickgui/controller.cpp
+++ b/quickgui/controller.cpp
@@ -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>
diff --git a/quickgui/initiatequick.cpp b/quickgui/initiatequick.cpp
index 2e7a8cc..5161262 100644
--- a/quickgui/initiatequick.cpp
+++ b/quickgui/initiatequick.cpp
@@ -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:";