reverse last change

[lyx.git] / src / frontends / Dialogs.h

diff --git a/src/frontends/Dialogs.h b/src/frontends/Dialogs.h
index 33d78ab8e062e4febd895ae0081a1b15569b2536..ca96da9be68ed7842d0dbb084371d6d2fcdbe60e 100644 (file)
--- a/src/frontends/Dialogs.h
+++ b/src/frontends/Dialogs.h
@@ -1,9 +1,11 @@
 // -*- C++ -*-
 /**
  * \file Dialogs.h
- * Copyright 1995-2002 The LyX Team.
- * See the file COPYING.
- * \author Allan Rae, rae@lyx.org
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ * \author Allan Rae
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #ifndef DIALOGS_H
@@ -28,6 +30,7 @@ class InsetError;
 class InsetERT;
 class InsetExternal;
 class InsetFloat;
+class InsetWrap;
 class InsetGraphics;
 class InsetInclude;
 class InsetInfo;
@@ -107,6 +110,8 @@ public:
        void showFile(string const &);
        ///
        void showFloat(InsetFloat *);
+       ///
+       void showWrap(InsetWrap *);
        /// show all forked child processes
        void showForks();
        ///
@@ -121,6 +126,8 @@ public:
        void showLogFile();
        /// display the top-level maths panel
        void showMathPanel();
+       /// show the merge changes dialog
+       void showMergeChanges();
        ///
        void showMinipage(InsetMinipage *);
        ///
@@ -168,10 +175,10 @@ public:
        //@}
 
 private:
-        /// Use the Pimpl idiom to hide the internals.
-        class Impl;
-        /// The pointer never changes although *pimpl_'s contents may.
-        boost::scoped_ptr<Impl> const pimpl_;
+       /// Use the Pimpl idiom to hide the internals.
+       class Impl;
+       /// The pointer never changes although *pimpl_'s contents may.
+       boost::scoped_ptr<Impl> const pimpl_;
 };
 
 #endif