X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.h;h=c920adc5c9adf6245c569f49be1fa374528c5e57;hp=d14981ac7d52efb6fad6dfcb576d44c117a6b4b9;hb=e56629542168c203cac8504085fc96c7f7b73d90;hpb=5fcbaab65066af3c9e8c52176c27a7cf96b80f41 diff --git a/src/uisupport/actioncollection.h b/src/uisupport/actioncollection.h index d14981ac..c920adc5 100644 --- a/src/uisupport/actioncollection.h +++ b/src/uisupport/actioncollection.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2014 by the Quassel Project * + * Copyright (C) 2005-2015 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,8 +20,7 @@ * This is a subset of the API of KDE's KActionCollection. * ***************************************************************************/ -#ifndef ACTIONCOLLECTION_H_ -#define ACTIONCOLLECTION_H_ +#pragma once #ifndef HAVE_KDE @@ -124,8 +123,11 @@ int ActionCollection::count() const { return actions().count(); } bool ActionCollection::isEmpty() const { return actions().count(); } #else /* HAVE_KDE */ - -#include +# 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 */