copy 1.2 branch to trunk

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 0 insertions, 36 deletions

diff --git a/src/app/qmmpapplication.cpp b/src/app/qmmpapplication.cpp
deleted file mode 100644
index d8c19c26a..000000000
--- a/src/app/qmmpapplication.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2012 by Ilya Kotov                                      *
- *   forkotov02@ya.ru                                                      *
- *                                                                         *
- *   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.         *
- ***************************************************************************/
-
-#include <qmmpui/uihelper.h>
-#include "qmmpapplication.h"
-
-QmmpApplication::QmmpApplication(int &argc, char **argv) : QApplication(argc, argv)
-{
-}
-
-void QmmpApplication::commitData(QSessionManager &manager)
-{
-    if(UiHelper::instance())
-        UiHelper::instance()->exit();
-#ifndef QT_NO_SESSIONMANAGER
-    else
-        QApplication::commitData(manager);
-#endif
-}