summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vrátil <dvratil@kde.org>2017-01-18 10:40:10 (GMT)
committerMarco Martin <notmart@gmail.com>2017-02-20 11:30:22 (GMT)
commitbf57c786f01feee3737545c9c08882a2057ffbb8 (patch)
tree5bcf87d79f6f5324a7141750519001d3e2af5f9a
parenta0df542e8df52ed53a827e6d3c159ac18503602e (diff)
Fix build with -fno-operator-names
-rw-r--r--kcm_hotkeys/hotkeys_model.cpp2
-rw-r--r--libkhotkeysprivate/action_data/action_data_group.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/kcm_hotkeys/hotkeys_model.cpp b/kcm_hotkeys/hotkeys_model.cpp
index 66ea747..8703f83 100644
--- a/kcm_hotkeys/hotkeys_model.cpp
+++ b/kcm_hotkeys/hotkeys_model.cpp
@@ -486,7 +486,7 @@ QMimeData *KHotkeysModel::mimeData(const QModelIndexList &indexes) const
Q_FOREACH (const QModelIndex &index, indexes)
{
- if (index.isValid() and index.column() == 0)
+ if (index.isValid() && index.column() == 0)
{
KHotKeys::ActionDataBase *element = indexToActionDataBase(index);
// We use the pointer as id.
diff --git a/libkhotkeysprivate/action_data/action_data_group.cpp b/libkhotkeysprivate/action_data/action_data_group.cpp
index ddbe24e..f80f775 100644
--- a/libkhotkeysprivate/action_data/action_data_group.cpp
+++ b/libkhotkeysprivate/action_data/action_data_group.cpp
@@ -83,7 +83,7 @@ Trigger::TriggerTypes ActionDataGroup::allowedTriggerTypes() const
bool ActionDataGroup::is_system_group() const
{
- return _system_group != SYSTEM_NONE and _system_group != SYSTEM_ROOT;
+ return _system_group != SYSTEM_NONE && _system_group != SYSTEM_ROOT;
}