Implemented #8; merged kvi_tal_application(_kde|_qt).h

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2683 17fca916-40b9-46aa-a4ea-0a15b648b75c

5 files changed, 34 insertions, 140 deletions

diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt
index 90666b0bb..f612ebdf7 100644
--- a/src/kvilib/CMakeLists.txt
+++ b/src/kvilib/CMakeLists.txt
@@ -24,6 +24,7 @@ SET(kvilib_MOC_HDRS
 	net/kvi_http.h
 	system/kvi_locale.h
 	system/kvi_thread.h
+	tal/kvi_tal_application.h
 	tal/kvi_tal_groupbox.h
 	tal/kvi_tal_hbox.h
 	tal/kvi_tal_iconview.h
@@ -43,7 +44,6 @@ SET(kvilib_MOC_HDRS
 
 IF(COMPILE_KDE_SUPPORT)
 	LIST(APPEND kvilib_MOC_HDRS
-		tal/kvi_tal_application_kde.h
 		tal/kvi_tal_menubar_kde.h
 		tal/kvi_tal_filedialog_kde.h
 		tal/kvi_tal_mainwindow_kde.h
@@ -51,7 +51,6 @@ IF(COMPILE_KDE_SUPPORT)
 	)
 ELSE()
 	LIST(APPEND kvilib_MOC_HDRS
-		tal/kvi_tal_application_qt.h
 		tal/kvi_tal_menubar_qt.h
 		tal/kvi_tal_filedialog_qt.h
 		tal/kvi_tal_mainwindow_qt.h
diff --git a/src/kvilib/tal/kvi_tal_application.cpp b/src/kvilib/tal/kvi_tal_application.cpp
index af090a0b2..9cabc27d5 100644
--- a/src/kvilib/tal/kvi_tal_application.cpp
+++ b/src/kvilib/tal/kvi_tal_application.cpp
@@ -27,23 +27,19 @@
 
 #ifdef COMPILE_KDE_SUPPORT
 
-	KviTalApplication::KviTalApplication(int & iArgc, char ** ppcArgv)
+	KviTalApplication::KviTalApplication(int &argc,char ** argv)
 	: KApplication()
 	{
 	}
 
 	KviTalApplication::~KviTalApplication()
 	{
-	}
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-	#include "kvi_tal_application_kde.moc"
-#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
 
+	}
 #else
 
-	KviTalApplication::KviTalApplication(int & iArgc, char ** ppcArgv)
-	: QApplication(iArgc,ppcArgv)
+	KviTalApplication::KviTalApplication(int &argc,char ** argv)
+	: QApplication(argc,argv)
 	{
 	}
 
@@ -51,8 +47,18 @@
 	{
 	}
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-	#include "kvi_tal_application_qt.moc"
-#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
 
 #endif
+
+void KviTalApplication::commitData(QSessionManager & manager)
+{
+	saveConfiguration();
+#ifdef COMPILE_KDE_SUPPORT
+	KApplication::commitData(manager);
+#else
+	QApplication::commitData(manager);
+#endif
+}
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
+	#include "kvi_tal_application.moc"
+#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
\ No newline at end of file
diff --git a/src/kvilib/tal/kvi_tal_application.h b/src/kvilib/tal/kvi_tal_application.h
index 1a7791551..295dcb52d 100644
--- a/src/kvilib/tal/kvi_tal_application.h
+++ b/src/kvilib/tal/kvi_tal_application.h
@@ -28,18 +28,25 @@
 //
 //=============================================================================
 
-/**
-* \file kvi_tal_application.h
-* \author Szymon Stefanek
-* \brief Switcher between Qt and KDE classes
-*/
-
 #include "kvi_settings.h"
 
 #ifdef COMPILE_KDE_SUPPORT
-	#include "kvi_tal_application_kde.h"
+
+#include <KApplication>
+class KVILIB_API KviTalApplication : public KApplication
 #else
-	#include "kvi_tal_application_qt.h"
-#endif
 
+#include <QApplication>
+class KVILIB_API KviTalApplication : public QApplication
+#endif
+{
+	Q_OBJECT
+public:
+	KviTalApplication(int &argc,char ** argv);
+	~KviTalApplication();
+	void commitData(QSessionManager &);
+signals:
+	void commitData();
+	virtual void saveConfiguration();
+};
 #endif // _KVI_TAL_APPLICATION_H_
diff --git a/src/kvilib/tal/kvi_tal_application_kde.h b/src/kvilib/tal/kvi_tal_application_kde.h
deleted file mode 100644
index a225c8fd8..000000000
--- a/src/kvilib/tal/kvi_tal_application_kde.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef _KVI_TAL_APPLICATION_KDE_H_
-#define _KVI_TAL_APPLICATION_KDE_H_
-//=============================================================================
-//
-//   File : kvi_tal_application_kde.h
-//   Creation date : Sun Aug 12 2001 04:32:08 by Szymon Stefanek
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
-//
-//   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 opinion) 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. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//=============================================================================
-
-/**
-* \file kvi_tal_application_kde.h
-* \author Szymon Stefanek
-* \brief KDE class for application
-*/
-
-#include "kvi_settings.h"
-
-#include <KApplication>
-
-/**
-* \class KviTalApplication
-* \brief Toolkit Abstraction Layer: application class
-*/
-class KVILIB_API KviTalApplication : public KApplication
-{
-	Q_OBJECT
-public:
-	/**
-	* \brief Constructs the application object
-	* \param iArgc The number of arguments
-	* \param ppcArgv The arguments list
-	* \return KviTalApplication
-	*/
-	KviTalApplication(int & iArgc, char ** ppcArgv);
-
-	/**
-	* \brief Destroys the application object
-	*/
-	~KviTalApplication();
-};
-
-#endif // _KVI_TAL_APPLICATION_KDE_H_
diff --git a/src/kvilib/tal/kvi_tal_application_qt.h b/src/kvilib/tal/kvi_tal_application_qt.h
deleted file mode 100644
index 74204f1a2..000000000
--- a/src/kvilib/tal/kvi_tal_application_qt.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef _KVI_TAL_APPLICATION_QT_H_
-#define _KVI_TAL_APPLICATION_QT_H_
-//=============================================================================
-//
-//   File : kvi_tal_application_qt.h
-//   Creation date : Sun Aug 12 2001 04:33:21 by Szymon Stefanek
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
-//
-//   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 opinion) 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. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//=============================================================================
-
-/**
-* \file kvi_tal_application_qt.h
-* \author Szymon Stefanek
-* \brief Qt class for application
-*/
-
-#include "kvi_settings.h"
-
-#include <QApplication>
-
-/**
-* \class KviTalApplication
-* \brief Toolkit Abstraction Layer: application class
-*/
-class KVILIB_API KviTalApplication : public QApplication
-{
-	Q_OBJECT
-public:
-	/**
-	* \brief Constructs the application object
-	* \param iArgc The number of arguments
-	* \param ppcArgv The arguments list
-	* \return KviTalApplication
-	*/
-	KviTalApplication(int & iArgc, char ** ppcArgv);
-
-	/**
-	* \brief Destroys the application object
-	*/
-	~KviTalApplication();
-};
-
-#endif // _KVI_TAL_APPLICATION_QT_H_