From 53d9817d8ac0f6c735c2133e892eb9735abf5a3b Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sat, 2 Oct 2010 12:11:55 +0000 Subject: [PATCH] Code cleanup --- src/sessionapplication.cpp | 44 ++++++++++++++++++++++++++++++++++++++ src/sessionapplication.h | 44 +++++++++++++++++++++++++++----------- src/src.pro | 3 ++- 3 files changed, 78 insertions(+), 13 deletions(-) create mode 100644 src/sessionapplication.cpp diff --git a/src/sessionapplication.cpp b/src/sessionapplication.cpp new file mode 100644 index 000000000..4a8b264b6 --- /dev/null +++ b/src/sessionapplication.cpp @@ -0,0 +1,44 @@ +/* + * Bittorrent Client using Qt4 and libtorrent. + * Copyright (C) 2010 Christophe Dumez + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * In addition, as a special exception, the copyright holders give permission to + * link this program with the OpenSSL project's "OpenSSL" library (or with + * modified versions of it that use the same license as the "OpenSSL" library), + * and distribute the linked executables. You must obey the GNU General Public + * License in all respects for all of the code used other than "OpenSSL". If you + * modify file(s), you may extend this exception to your version of the file(s), + * but you are not obligated to do so. If you do not wish to do so, delete this + * exception statement from your version. + * + * Contact : chris@qbittorrent.org + */ + +#include "sessionapplication.h" + +SessionApplication::SessionApplication(const QString &id, int &argc, char **argv) : +#ifdef Q_WS_MAC +QMacApplication(id, argc, argv) +#else +QtSingleApplication(id, argc, argv) +#endif +{} + +void SessionApplication::commitData(QSessionManager & manager) { + Q_UNUSED(manager); + emit sessionIsShuttingDown(); +} diff --git a/src/sessionapplication.h b/src/sessionapplication.h index 8cb88a729..fdc338b73 100644 --- a/src/sessionapplication.h +++ b/src/sessionapplication.h @@ -1,3 +1,33 @@ +/* + * Bittorrent Client using Qt4 and libtorrent. + * Copyright (C) 2010 Christophe Dumez + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * In addition, as a special exception, the copyright holders give permission to + * link this program with the OpenSSL project's "OpenSSL" library (or with + * modified versions of it that use the same license as the "OpenSSL" library), + * and distribute the linked executables. You must obey the GNU General Public + * License in all respects for all of the code used other than "OpenSSL". If you + * modify file(s), you may extend this exception to your version of the file(s), + * but you are not obligated to do so. If you do not wish to do so, delete this + * exception statement from your version. + * + * Contact : chris@qbittorrent.org + */ + #ifndef SESSIONAPPLICATION_H #define SESSIONAPPLICATION_H @@ -19,18 +49,8 @@ class SessionApplication : Q_OBJECT public: - SessionApplication(const QString &id, int &argc, char **argv) : -#ifdef Q_WS_MAC - QMacApplication(id, argc, argv) -#else - QtSingleApplication(id, argc, argv) -#endif - {} - - void commitData(QSessionManager & manager) { - Q_UNUSED(manager); - emit sessionIsShuttingDown(); - } + SessionApplication(const QString &id, int &argc, char **argv); + void commitData(QSessionManager & manager); signals: void sessionIsShuttingDown(); diff --git a/src/src.pro b/src/src.pro index e32a1db37..c7814393d 100644 --- a/src/src.pro +++ b/src/src.pro @@ -423,7 +423,8 @@ SOURCES += main.cpp \ cookiesdlg.cpp \ trackerlist.cpp \ torrentadditiondlg.cpp \ - rsssettings.cpp + rsssettings.cpp \ + sessionapplication.cpp macx { SOURCES += qmacapplication.cpp