X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.h;h=f7f5ff81ce9fcfc601ec122a0c6dfc5ae84aea1d;hp=a76fc04a0329dda815dbcf26ac121da3ce855ce3;hb=aec9c711900a443bfa7860fa86c6e9c86b81a3e7;hpb=e50ae7a06fc4e5d3a911c361d30953410deab609 diff --git a/src/uisupport/actioncollection.h b/src/uisupport/actioncollection.h index a76fc04a..f7f5ff81 100644 --- a/src/uisupport/actioncollection.h +++ b/src/uisupport/actioncollection.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,10 +20,9 @@ * This is a subset of the API of KDE's KActionCollection. * ***************************************************************************/ -#ifndef ACTIONCOLLECTION_H_ -#define ACTIONCOLLECTION_H_ +#pragma once -#ifndef HAVE_KDE4 +#ifndef HAVE_KDE #include #include @@ -123,9 +122,12 @@ private: int ActionCollection::count() const { return actions().count(); } bool ActionCollection::isEmpty() const { return actions().count(); } -#else /* HAVE_KDE4 */ - -#include +#else /* HAVE_KDE */ +# ifdef HAVE_KDE4 +# include +# else +# include +# endif class ActionCollection : public KActionCollection { @@ -135,7 +137,4 @@ public: explicit ActionCollection(QObject *parent) : KActionCollection(parent) {}; }; - -#endif - -#endif +#endif /* HAVE_KDE */