X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreapplication.h;h=92ed220ba94197ab7d93c3121d5b306b4fff1d31;hp=424545536b937b68a6849e3fcf7bf155d5a2e15a;hb=d30eb5039971db578ba6e777d737344187e5b02a;hpb=965183188ee726036685fcba379c2559bd183247

diff --git a/src/core/coreapplication.h b/src/core/coreapplication.h
index 42454553..92ed220b 100644
--- a/src/core/coreapplication.h
+++ b/src/core/coreapplication.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-2014 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #ifndef COREAPPLICATION_H_
@@ -32,34 +32,33 @@
 /// Encapsulates CoreApplication's logic.
 /** This allows it to be reused within MonolithicApplication as well.
  */
-class CoreApplicationInternal {
-  Q_DECLARE_TR_FUNCTIONS(CoreApplicationInternal)
+class CoreApplicationInternal
+{
+    Q_DECLARE_TR_FUNCTIONS(CoreApplicationInternal)
 
-  public:
+public:
     CoreApplicationInternal();
     ~CoreApplicationInternal();
 
     bool init();
 
-  private:
+private:
     bool _coreCreated;
 };
 
-#ifdef HAVE_KDE
-class CoreApplication : public KApplication, public Quassel {
-#else
-class CoreApplication : public QCoreApplication, public Quassel {
-#endif
 
-  Q_OBJECT
-  public:
+class CoreApplication : public QCoreApplication, public Quassel
+{
+    Q_OBJECT
+public:
     CoreApplication(int &argc, char **argv);
     ~CoreApplication();
 
     bool init();
 
-  private:
+private:
     CoreApplicationInternal *_internal;
 };
 
+
 #endif