rename ok/cancel to okButton/cancelButton

so I can use cancel as a function name.

diff --git a/qui/seqbrowser/seqproperties/PropertiesWindow.cpp b/qui/seqbrowser/seqproperties/PropertiesWindow.cpp
index 24d1521f286144bc1fb54879a67a36d57dbf0f6a..45427b933b5b65adb62ad72aea8842a4ce8b41ad 100644 (file)
--- a/qui/seqbrowser/seqproperties/PropertiesWindow.cpp
+++ b/qui/seqbrowser/seqproperties/PropertiesWindow.cpp
@@ -14,26 +14,26 @@ PropertiesWindow::PropertiesWindow(/* MussaRef m, */
   : QWidget(parent),
     /* analysis(m), */
     table(0),
-    ok(0),
-    cancel(0),
+    okButton(0),
+    cancelButton(0),
     model(glseqs)
 {
   QGridLayout *parameterLayout = new QGridLayout;
 
-  ok = new QPushButton(tr("&OK"), this);
-  ok->setEnabled( false );
-  connect(ok, SIGNAL(clicked()), this, SLOT(apply()));
+  okButton = new QPushButton(tr("&OK"), this);
+  okButton->setEnabled( false );
+  connect(okButton, SIGNAL(clicked()), this, SLOT(apply()));
 
-  cancel = new QPushButton(tr("Cancel"), this);
-  connect(cancel, SIGNAL(clicked()), this, SLOT(cancel()));
+  cancelButton = new QPushButton(tr("Cancel"), this);
+  connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancel()));
 
   table = new QTableView(this);
   table->setModel(&model);
 
   // layout buttons
   QHBoxLayout *buttonLayout = new QHBoxLayout;
-  buttonLayout->addWidget(ok);
-  buttonLayout->addWidget(cancel);
+  buttonLayout->addWidget(okButton);
+  buttonLayout->addWidget(cancelButton);
 
   // layout verticle space
   QVBoxLayout *verticalLayout = new QVBoxLayout;
@@ -55,7 +55,7 @@ SequencePropertiesModel& PropertiesWindow::getModel()
   return model;
 }
 
-void PropertiesWindow::abort()
+void PropertiesWindow::cancel()
 {
   model.clear();
   hide();
@@ -75,7 +75,7 @@ void PropertiesWindow::apply()
 void PropertiesWindow::modelUpdated(const QModelIndex&, int, int )
 {
   // if the model is empty we shouldn't be able to click ok
-  if (ok) ok->setEnabled(not model.empty());
+  if (okButton) okButton->setEnabled(not model.empty());
 }
 
 void PropertiesWindow::updateTitle()

diff --git a/qui/seqbrowser/seqproperties/PropertiesWindow.hpp b/qui/seqbrowser/seqproperties/PropertiesWindow.hpp
index 638a45e5b6929792e32d372da09e61370ae7a832..f369af2014e0ebf9ac8a1495eef8b7c342d99ad1 100644 (file)
--- a/qui/seqbrowser/seqproperties/PropertiesWindow.hpp
+++ b/qui/seqbrowser/seqproperties/PropertiesWindow.hpp
@@ -26,7 +26,7 @@ public slots:
   //! create a subanalysis and run it
   void apply();
   //! clear our model and close the window
-  void abort();
+  void cancel();
   //! provide a way for the model to tell us to update our gui
   void modelUpdated(const QModelIndex&, int, int);
   //! update our title
@@ -36,8 +36,8 @@ private:
   //! keep track of what analysis we're attached to
   MussaRef analysis;
   QTableView *table;
-  QPushButton *ok;
-  QPushButton *cancel;
+  QPushButton *okButton;
+  QPushButton *cancelButton;
 
   SequencePropertiesModel model;
 };