summaryrefslogtreecommitdiffstats
path: root/kexi/plugins/queries
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/plugins/queries')
-rw-r--r--kexi/plugins/queries/kexidynamicqueryparameterdialog.h4
-rw-r--r--kexi/plugins/queries/kexiquerydesignerguieditor.cpp20
-rw-r--r--kexi/plugins/queries/kexiquerydesignerguieditor.h4
-rw-r--r--kexi/plugins/queries/kexiquerydesignersql.h4
-rw-r--r--kexi/plugins/queries/kexiquerydesignersqlhistory.h4
-rw-r--r--kexi/plugins/queries/kexiquerypart.h4
-rw-r--r--kexi/plugins/queries/kexiqueryview.h4
7 files changed, 22 insertions, 22 deletions
diff --git a/kexi/plugins/queries/kexidynamicqueryparameterdialog.h b/kexi/plugins/queries/kexidynamicqueryparameterdialog.h
index afa9163d..98e2c6fe 100644
--- a/kexi/plugins/queries/kexidynamicqueryparameterdialog.h
+++ b/kexi/plugins/queries/kexidynamicqueryparameterdialog.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _KEXI_DYNAMIC_TQUERY_PARAMETER_DIALOG_H_
-#define _KEXI_DYNAMIC_TQUERY_PARAMETER_DIALOG_H_
+#ifndef _KEXI_DYNAMIC_QUERY_PARAMETER_DIALOG_H_
+#define _KEXI_DYNAMIC_QUERY_PARAMETER_DIALOG_H_
#include <kdialogbase.h>
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
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.h b/kexi/plugins/queries/kexiquerydesignerguieditor.h
index f85125c6..fd469f18 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.h
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXITQUERYDESIGNERGUIEDITOR_H
-#define KEXITQUERYDESIGNERGUIEDITOR_H
+#ifndef KEXIQUERYDESIGNERGUIEDITOR_H
+#define KEXIQUERYDESIGNERGUIEDITOR_H
#include <tqguardedptr.h>
#include <tqsplitter.h>
diff --git a/kexi/plugins/queries/kexiquerydesignersql.h b/kexi/plugins/queries/kexiquerydesignersql.h
index fe535b0d..6f4503ed 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.h
+++ b/kexi/plugins/queries/kexiquerydesignersql.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXITQUERYDESIGNERSQL_H
-#define KEXITQUERYDESIGNERSQL_H
+#ifndef KEXIQUERYDESIGNERSQL_H
+#define KEXIQUERYDESIGNERSQL_H
#include <kexiviewbase.h>
#include "kexiquerypart.h"
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.h b/kexi/plugins/queries/kexiquerydesignersqlhistory.h
index 6c828c39..c5903638 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.h
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXITQUERYDESIGNERSQLHISTORY_H
-#define KEXITQUERYDESIGNERSQLHISTORY_H
+#ifndef KEXIQUERYDESIGNERSQLHISTORY_H
+#define KEXIQUERYDESIGNERSQLHISTORY_H
#include <tqscrollview.h>
#include <tqdatetime.h>
diff --git a/kexi/plugins/queries/kexiquerypart.h b/kexi/plugins/queries/kexiquerypart.h
index 1fb2063c..f404e6e6 100644
--- a/kexi/plugins/queries/kexiquerypart.h
+++ b/kexi/plugins/queries/kexiquerypart.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXITQUERYPART_H
-#define KEXITQUERYPART_H
+#ifndef KEXIQUERYPART_H
+#define KEXIQUERYPART_H
#include <tqmap.h>
diff --git a/kexi/plugins/queries/kexiqueryview.h b/kexi/plugins/queries/kexiqueryview.h
index e089bfc4..7eb65f1e 100644
--- a/kexi/plugins/queries/kexiqueryview.h
+++ b/kexi/plugins/queries/kexiqueryview.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXITQUERYVIEW_H
-#define KEXITQUERYVIEW_H
+#ifndef KEXIQUERYVIEW_H
+#define KEXIQUERYVIEW_H
#include <kexidatatable.h>