Clean-up of the button controller.

[lyx.git] / src / frontends / gnome / FormPrint.C

diff --git a/src/frontends/gnome/FormPrint.C b/src/frontends/gnome/FormPrint.C
index 0a2551083cffc8d1fab1462c8a56e895f26ef218..960fb064291dcd8d366622f0cc8ba51d7a13185b 100644 (file)
--- a/src/frontends/gnome/FormPrint.C
+++ b/src/frontends/gnome/FormPrint.C
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 /* FormPrint.C
  * FormPrint Interface Class Implementation
  * This file is part of
@@ -37,23 +36,16 @@ extern "C" {
 #include <gtk--/base.h>
 #include <gtk--/button.h>
 
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::slot;
-using SigC::bind;
-#endif
-
-#ifdef CXX_WORKING_NAMESPACES
 using Liason::printBuffer;
 using Liason::getPrinterParams;
-#endif
 
 FormPrint::FormPrint(LyXView * lv, Dialogs * d)
-  : dialog_(NULL), lv_(lv), d_(d), u_(0), h_(0)
+  : dialog_(0), lv_(lv), d_(d), u_(0), h_(0)
 {
   // let the dialog be shown
   // This is a permanent connection so we won't bother
   // storing a copy because we won't be disconnecting.
-  d->showPrint.connect(slot(this,&FormPrint::show));
+  d->showPrint.connect(SigC::slot(this,&FormPrint::show));
 }
 
 
@@ -97,18 +89,18 @@ void FormPrint::show()
       b_cancel = Gtk::wrap( GTK_BUTTON( lookup_widget(pd, "button_cancel") ) );
 
       // setting up connections
-      b_ok->clicked.connect(slot(this, &FormPrint::apply));
+      b_ok->clicked.connect(SigC::slot(this, &FormPrint::apply));
       b_ok->clicked.connect(dialog_->destroy.slot());
       b_cancel->clicked.connect(dialog_->destroy.slot());
-      dialog_->destroy.connect(slot(this, &FormPrint::free));
+      dialog_->destroy.connect(SigC::slot(this, &FormPrint::free));
 
-      u_ = d_->updateBufferDependent.connect(slot(this,
-                                                 &FormPrint::update));
+      u_ = d_->updateBufferDependent.connect(SigC::slot(this,
+                                                 &FormPrint::updateSlot));
       h_ = d_->hideBufferDependent.connect(dialog_->destroy.slot());
 
       if (!dialog_->is_visible()) dialog_->show_all();
 
-      update();  // make sure its up-to-date
+      updateSlot();  // make sure its up-to-date
     }
   else
     {
@@ -119,14 +111,14 @@ void FormPrint::show()
 
 void FormPrint::hide()
 {
-  if (dialog_!=NULL) dialog_->destroy();
+  if (dialog_!=0) dialog_->destroy();
 }
 
 void FormPrint::free()
 {
-  if (dialog_!=NULL)
+  if (dialog_!=0)
     {
-      dialog_ = NULL;
+      dialog_ = 0;
       u_.disconnect();
       h_.disconnect();
     }
@@ -169,9 +161,10 @@ void FormPrint::apply()
 }
 
 
-void FormPrint::update()
+// we can safely ignore the parameter because we can always update
+void FormPrint::updateSlot(bool)
 {
-  if (dialog_ != NULL &&
+  if (dialog_ != 0 &&
       lv_->view()->available())
     {
       PrinterParams pp(getPrinterParams(lv_->buffer()));