X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoreapplication.h;h=f157b5486a08ac3c10369e0a9d7813434f6a4cce;hb=e7352d23bb54ce36dd4f9aac59a93e2c0a6297f6;hp=2bd53868a4ceaeebe21a9d0161bdd81696ca0718;hpb=4a5065255e652dd0c301bac0db41b7afb777ef49;p=quassel.git diff --git a/src/core/coreapplication.h b/src/core/coreapplication.h index 2bd53868..f157b548 100644 --- a/src/core/coreapplication.h +++ b/src/core/coreapplication.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2013 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 * @@ -18,47 +18,25 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef COREAPPLICATION_H_ -#define COREAPPLICATION_H_ +#pragma once -#ifdef HAVE_KDE -# include -#else -# include -#endif +#include -#include "quassel.h" - -/// Encapsulates CoreApplication's logic. -/** This allows it to be reused within MonolithicApplication as well. - */ -class CoreApplicationInternal -{ - Q_DECLARE_TR_FUNCTIONS(CoreApplicationInternal) - -public: - CoreApplicationInternal(); - ~CoreApplicationInternal(); - - bool init(); +#include -private: - bool _coreCreated; -}; +#include "quassel.h" +class Core; -class CoreApplication : public QCoreApplication, public Quassel +class CoreApplication : public QCoreApplication { Q_OBJECT public: CoreApplication(int &argc, char **argv); - ~CoreApplication(); + ~CoreApplication() override; - bool init(); + void init(); private: - CoreApplicationInternal *_internal; + std::unique_ptr _core; }; - - -#endif