code documentation

labsquare · Oct 2, 2017 · b8d16fb · b8d16fb
1 parent 1708b85
commit b8d16fb
Show file tree

Hide file tree

Showing 8 changed files with 153 additions and 170 deletions.
diff --git a/src/app/docks/selections/selectiondockwidget.cpp b/src/app/docks/selections/selectiondockwidget.cpp
@@ -41,7 +41,7 @@ void SelectionDockWidget::compare()
     if (dialog.exec())
     {
 
-        if (!cutevariant->sqliteManager()->createSelectionFromExpression(dialog.tableName(), dialog.expression(), dialog.mode()))
+        if (!cutevariant->sqliteManager()->createVariantSetFromExpression(dialog.tableName(), dialog.expression(), dialog.mode()))
             QMessageBox::warning(this,"error","Cannot run this set expression");
 
         else

diff --git a/src/app/docks/selections/selectionview.cpp b/src/app/docks/selections/selectionview.cpp
@@ -40,7 +40,7 @@ void SelectionView::load()
     addTopLevelItem(rootItem);
 
 
-    for (cvar::VariantSelection selection : cutevariant->sqliteManager()->variantSelections())
+    for (cvar::VariantSet selection : cutevariant->sqliteManager()->variantSets())
     {
         QTreeWidgetItem * item = new QTreeWidgetItem;
         item->setText(0, selection.name());
@@ -63,7 +63,7 @@ void SelectionView::removeSelection()
 
     for (QTreeWidgetItem * item : selectedItems())
     {
-        cutevariant->sqliteManager()->removeSelection(item->text(0));
+        cutevariant->sqliteManager()->removeVariantSet(item->text(0));
     }
 
     load();

diff --git a/src/app/operationsetdialog.cpp b/src/app/operationsetdialog.cpp
@@ -81,7 +81,7 @@ void OperationSetDialog::load()
     mOperator->addItem(FIcon(0xf148),"Subtract","-");
 
 
-    for (const QString& name : cutevariant->sqliteManager()->variantSelectionNames())
+    for (const QString& name : cutevariant->sqliteManager()->variantSetNames())
     {
         mBoxA->addItem(name);
         mBoxB->addItem(name);

diff --git a/src/app/resultsview/resultsview.cpp b/src/app/resultsview/resultsview.cpp
@@ -148,7 +148,7 @@ void ResultsView::save()
     if (dialog.exec() == QDialog::Accepted)
     {
 
-        if (!cutevariant->sqliteManager()->variantsTo(mModel->currentQuery(), nameEdit->text()))
+        if (!cutevariant->sqliteManager()->createVariantSet(mModel->currentQuery(), nameEdit->text()))
             QMessageBox::warning(this,"error", "cannot create table");
 
         else

diff --git a/src/cutevariantcore/selection.cpp b/src/cutevariantcore/selection.cpp
@@ -2,53 +2,53 @@
 
 namespace cvar{
 
-VariantSelection::VariantSelection()
+VariantSet::VariantSet()
 {
 
 }
 
-VariantSelection::VariantSelection(const QString &name, const QString &description, int count)
+VariantSet::VariantSet(const QString &name, const QString &description, int count)
     :mName(name), mDescription(description), mCount(count)
 {
 
 }
 
-QString VariantSelection::name() const
+QString VariantSet::name() const
 {
     return mName;
 }
 
-void VariantSelection::setName(const QString &name)
+void VariantSet::setName(const QString &name)
 {
     mName = name;
 }
 
-QString VariantSelection::description() const
+QString VariantSet::description() const
 {
     return mDescription;
 }
 
-void VariantSelection::setDescription(const QString &description)
+void VariantSet::setDescription(const QString &description)
 {
     mDescription = description;
 }
 
-int VariantSelection::count() const
+int VariantSet::count() const
 {
     return mCount;
 }
 
-void VariantSelection::setCount(int count)
+void VariantSet::setCount(int count)
 {
     mCount = count;
 }
 
-QString VariantSelection::sql() const
+QString VariantSet::sql() const
 {
     return mSql;
 }
 
-void VariantSelection::setSql(const QString &sql)
+void VariantSet::setSql(const QString &sql)
 {
     mSql = sql;
 }

diff --git a/src/cutevariantcore/selection.h b/src/cutevariantcore/selection.h
@@ -3,11 +3,11 @@
 #include <QtCore>
 namespace cvar{
 
-class VariantSelection
+class VariantSet
 {
 public:
-    VariantSelection();
-    VariantSelection(const QString& name, const QString& description, int count);
+    VariantSet();
+    VariantSet(const QString& name, const QString& description, int count);
 
 
     QString name() const;