Merge branch 'master' into dfaure/stricter-flags

1 files changed, 4 insertions, 16 deletions

diff --git a/lib/room.h b/lib/room.h
index f4d7eb70..c9205e9c 100644
--- a/lib/room.h
+++ b/lib/room.h
@@ -1,19 +1,7 @@
 /******************************************************************************
- * Copyright (C) 2015 Felix Rohrbach <kde@fxrh.de>
+ * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
 #pragma once
@@ -547,7 +535,7 @@ public:
         return setState(EvT(std::forward<ArgTs>(args)...));
     }
 
-public slots:
+public Q_SLOTS:
     /** Check whether the room should be upgraded */
     void checkVersion();
 
@@ -611,7 +599,7 @@ public slots:
     void answerCall(const QString& callId, const QString& sdp);
     void hangupCall(const QString& callId);
 
-signals:
+Q_SIGNALS:
     /// Initial set of state events has been loaded
     /**
      * The initial set is what comes from the initial sync for the room.