diff options
Diffstat (limited to 'kexi/plugins/queries/kexiquerydesignerguieditor.cpp')
| -rw-r--r-- | kexi/plugins/queries/kexiquerydesignerguieditor.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp index 9da1a92a..b08daaf0 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp @@ -56,14 +56,14 @@ #include "kexiquerypart.h" -//! @todo remove KEXI_NO_TQUERY_TOTALS later -#define KEXI_NO_TQUERY_TOTALS +//! @todo remove KEXI_NO_QUERY_TOTALS later +#define KEXI_NO_QUERY_TOTALS //! indices for table columns #define COLUMN_ID_COLUMN 0 #define COLUMN_ID_TABLE 1 #define COLUMN_ID_VISIBLE 2 -#ifdef KEXI_NO_TQUERY_TOTALS +#ifdef KEXI_NO_QUERY_TOTALS # define COLUMN_ID_SORTING 3 # define COLUMN_ID_CRITERIA 4 #else @@ -226,7 +226,7 @@ KexiQueryDesignerGuiEditor::initTableColumns() col3->field()->setNotNull( true ); d->data->addColumn(col3); -#ifndef KEXI_NO_TQUERY_TOTALS +#ifndef KEXI_NO_QUERY_TOTALS KexiTableViewColumn *col4 = new KexiTableViewColumn("totals", KexiDB::Field::Enum, i18n("Totals"), i18n("Describes a way of computing totals for a given field or expression.")); TQValueVector<TQString> totalsTypes; @@ -1200,7 +1200,7 @@ KexiQueryDesignerGuiEditor::createNewRow(const TQString& tableName, const TQStri (*newItem)[COLUMN_ID_COLUMN]=key; (*newItem)[COLUMN_ID_TABLE]=tableName; (*newItem)[COLUMN_ID_VISIBLE]=TQVariant(visible, 1); -#ifndef KEXI_NO_TQUERY_TOTALS +#ifndef KEXI_NO_QUERY_TOTALS (*newItem)[COLUMN_ID_TOTALS]=TQVariant(0); #endif return newItem; @@ -1422,7 +1422,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int d->data->updateRowEditBuffer(item, COLUMN_ID_TABLE, TQVariant(), false/*!allowSignals*/); d->data->updateRowEditBuffer(item, COLUMN_ID_VISIBLE, TQVariant(false,1));//invisible d->data->updateRowEditBuffer(item, COLUMN_ID_SORTING, TQVariant()); -#ifndef KEXI_NO_TQUERY_TOTALS +#ifndef KEXI_NO_QUERY_TOTALS d->data->updateRowEditBuffer(item, COLUMN_ID_TOTALS, TQVariant());//remove totals #endif d->data->updateRowEditBuffer(item, COLUMN_ID_CRITERIA, TQVariant());//remove crit. @@ -1500,7 +1500,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int } d->data->updateRowEditBuffer(item, COLUMN_ID_TABLE, TQVariant(tableName), false/*!allowSignals*/); d->data->updateRowEditBuffer(item, COLUMN_ID_VISIBLE, TQVariant(true,1)); -#ifndef KEXI_NO_TQUERY_TOTALS +#ifndef KEXI_NO_QUERY_TOTALS d->data->updateRowEditBuffer(item, COLUMN_ID_TOTALS, TQVariant(0)); #endif if (!sortingAllowed(fieldName, tableName)) { @@ -1533,7 +1533,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int if (!item->at(COLUMN_ID_COLUMN).toString().isEmpty()) d->data->updateRowEditBuffer(item, COLUMN_ID_COLUMN, TQVariant(), false/*!allowSignals*/); d->data->updateRowEditBuffer(item, COLUMN_ID_VISIBLE, TQVariant(false,1));//invisible -#ifndef KEXI_NO_TQUERY_TOTALS +#ifndef KEXI_NO_QUERY_TOTALS d->data->updateRowEditBuffer(item, COLUMN_ID_TOTALS, TQVariant());//remove totals #endif d->data->updateRowEditBuffer(item, COLUMN_ID_CRITERIA, TQVariant());//remove crit. @@ -1560,7 +1560,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int saveOldValue = false; createPropertySet( d->dataTable->dataAwareObject()->currentRow(), item->at(COLUMN_ID_TABLE).toString(), item->at(COLUMN_ID_COLUMN).toString(), true ); -#ifndef KEXI_NO_TQUERY_TOTALS +#ifndef KEXI_NO_QUERY_TOTALS d->data->updateRowEditBuffer(item, COLUMN_ID_TOTALS, TQVariant(0));//totals #endif propertySetSwitched(); @@ -1568,7 +1568,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int KoProperty::Set &set = *propertySet(); set["visible"].setValue(newValue, saveOldValue); } -#ifndef KEXI_NO_TQUERY_TOTALS +#ifndef KEXI_NO_QUERY_TOTALS else if (colnum==COLUMN_ID_TOTALS) { //TODO: //unused yet |