diff kdiff3/src/kdiff3_shell.h @ 69:8febbfb1148c

KDiff3 0.9.89
author joachim99
date Mon, 10 Apr 2006 08:40:51 +0000
parents 86d21651c8db
children 5bbfe4784324
line wrap: on
line diff
--- a/kdiff3/src/kdiff3_shell.h	Mon Jan 31 22:30:47 2005 +0000
+++ b/kdiff3/src/kdiff3_shell.h	Mon Apr 10 08:40:51 2006 +0000
@@ -1,6 +1,21 @@
-/*
- * Copyright (C) 2003 Joachim Eibl <joachim.eibl@gmx.de>
- */
+/***************************************************************************
+ * Copyright (C) 2003-2006 Joachim Eibl <joachim.eibl at gmx.de>           *
+ *                                                                         *
+ *   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 Steet, Fifth Floor, Boston, MA 02110-1301, USA.           *
+ ***************************************************************************/
 
 #ifndef _KDIFF3SHELL_H_
 #define _KDIFF3SHELL_H_
@@ -19,7 +34,7 @@
  * statusbar but relies on the "Part" to do all the real work.
  *
  * @short Application Shell
- * @author Joachim Eibl <joachim.eibl@gmx.de>
+ * @author Joachim Eibl <joachim.eibl at gmx.de>
  */
 class KDiff3Shell : public KParts::MainWindow
 {
@@ -28,7 +43,7 @@
     /**
      * Default Constructor
      */
-    KDiff3Shell();
+    KDiff3Shell(bool bCompleteInit=true);
 
     /**
      * Default Destructor
@@ -37,6 +52,7 @@
 
     bool queryClose();
     bool queryExit();
+    virtual void closeEvent(QCloseEvent*e);
 
 private slots:
     void optionsShowToolbar();
@@ -45,6 +61,7 @@
     void optionsConfigureToolbars();
 
     void applyNewToolbarConfig();
+    void slotNewInstance( const QString& fn1, const QString& fn2, const QString& fn3 );
 
 private:
     KParts::ReadWritePart *m_part;