Some string(widget->text()) fixes. Weirdness

[lyx.git] / src / frontends / qt2 / QInclude.C

diff --git a/src/frontends/qt2/QInclude.C b/src/frontends/qt2/QInclude.C
index f78696cf531a842be784fb140f9c3b4dbb932a77..032a1016f813ef2234824a6b9f127b952f7b00f4 100644 (file)
--- a/src/frontends/qt2/QInclude.C
+++ b/src/frontends/qt2/QInclude.C
@@ -1,9 +1,11 @@
 /**
  * \file QInclude.C
- * Copyright 2001 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
@@ -15,7 +17,7 @@
 #include "ControlInclude.h"
 #include "gettext.h"
 #include "debug.h"
- 
+
 #include "QIncludeDialog.h"
 #include "QInclude.h"
 #include "Qt2BC.h"
@@ -25,8 +27,10 @@
 #include <qcheckbox.h>
 #include <qcombobox.h>
 
+
 typedef Qt2CB<ControlInclude, Qt2DB<QIncludeDialog> > base_class;
 
+
 QInclude::QInclude()
        : base_class(_("Include"))
 {
@@ -48,42 +52,49 @@ void QInclude::build_dialog()
 
 void QInclude::update_contents()
 {
-       dialog_->filenameED->setText(controller().params().cparams.getContents().c_str());
+       InsetInclude::Params const & params = controller().params();
 
-       string const cmdname = controller().params().cparams.getCmdName();
+       dialog_->filenameED->setText(params.cparams.getContents().c_str());
 
        dialog_->visiblespaceCB->setChecked(false);
        dialog_->visiblespaceCB->setEnabled(false);
 
-       lyxerr << cmdname << endl;
- 
-       if (cmdname == "input")
-               dialog_->typeCO->setCurrentItem(0);
-       else if (!cmdname.empty()) {
-               dialog_->typeCO->setCurrentItem(2);
-               dialog_->visiblespaceCB->setChecked(cmdname == "verbatiminput*");
-               dialog_->visiblespaceCB->setEnabled(true);
-       } else {
-               dialog_->typeCO->setCurrentItem(1);
+       switch (params.flag) {
+               case InsetInclude::INPUT:
+                       dialog_->typeCO->setCurrentItem(0);
+                       break;
+
+               case InsetInclude::INCLUDE:
+                       dialog_->typeCO->setCurrentItem(1);
+                       break;
+
+               case InsetInclude::VERBAST:
+                       dialog_->visiblespaceCB->setChecked(true);
+                       /* fall through */
+               case InsetInclude::VERB:
+                       dialog_->typeCO->setCurrentItem(2);
+                       dialog_->visiblespaceCB->setEnabled(true);
+                       break;
        }
 }
 
 
 void QInclude::apply()
 {
-       controller().params().cparams.
-               setContents(dialog_->filenameED->text().latin1());
+       InsetInclude::Params & params = controller().params();
+
+       params.cparams.setContents(dialog_->filenameED->text().latin1());
 
        int const item = dialog_->typeCO->currentItem();
        if (item == 0)
-               controller().params().flag = InsetInclude::INPUT;
+               params.flag = InsetInclude::INPUT;
        else if (item == 1)
-               controller().params().flag = InsetInclude::INCLUDE;
+               params.flag = InsetInclude::INCLUDE;
        else {
                if (dialog_->visiblespaceCB->isChecked())
-                       controller().params().flag = InsetInclude::VERBAST;
+                       params.flag = InsetInclude::VERBAST;
                else
-                       controller().params().flag = InsetInclude::VERB;
+                       params.flag = InsetInclude::VERB;
        }
 }
 
@@ -93,9 +104,9 @@ void QInclude::browse()
        ControlInclude::Type type;
 
        int const item = dialog_->typeCO->currentItem();
-       if (item==0)
+       if (item == 0)
                type = ControlInclude::INPUT;
-       else if (item==1)
+       else if (item == 1)
                type = ControlInclude::INCLUDE;
        else
                type = ControlInclude::VERBATIM;