summaryrefslogtreecommitdiffstats
path: root/kexi/widget
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-13 13:15:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-13 13:15:14 -0600
commit735d75d6ce19269dc5faa00abc8f88ff30ce2f23 (patch)
tree4e85ad9cc0479892232125234c6b71c4f17ac611 /kexi/widget
parentb180811d9a814c638032f77aaf02e84a3126328c (diff)
downloadkoffice-735d75d6ce19269dc5faa00abc8f88ff30ce2f23.tar.gz
koffice-735d75d6ce19269dc5faa00abc8f88ff30ce2f23.zip
Fix inadvertent TQt string conversions
This closes Bug 782
Diffstat (limited to 'kexi/widget')
-rw-r--r--kexi/widget/kexidatasourcecombobox.cpp10
-rw-r--r--kexi/widget/kexiquerydesignersqleditor.h4
-rw-r--r--kexi/widget/kexiqueryparameters.h4
3 files changed, 9 insertions, 9 deletions
diff --git a/kexi/widget/kexidatasourcecombobox.cpp b/kexi/widget/kexidatasourcecombobox.cpp
index f830926f..5dab927b 100644
--- a/kexi/widget/kexidatasourcecombobox.cpp
+++ b/kexi/widget/kexidatasourcecombobox.cpp
@@ -34,7 +34,7 @@
#include <kexidb/connection.h>
#ifdef KEXI_SHOW_UNIMPLEMENTED
-#define ADD_DEFINETQUERY_ROW
+#define ADD_DEFINEQUERY_ROW
#endif
//! @internal
@@ -50,7 +50,7 @@ class KexiDataSourceComboBox::Private
}
int firstTableIndex() const {
int index = 1; //skip empty row
-#ifdef ADD_DEFINETQUERY_ROW
+#ifdef ADD_DEFINEQUERY_ROW
index++; /*skip 'define query' row*/
#endif
return index;
@@ -123,7 +123,7 @@ void KexiDataSourceComboBox::setProject(KexiProject *prj, bool showTables, bool
//special item: empty
insertItem("");
-#ifdef ADD_DEFINETQUERY_ROW
+#ifdef ADD_DEFINEQUERY_ROW
//special item: define query
insertItem(i18n("Define Query..."));
#endif
@@ -194,7 +194,7 @@ void KexiDataSourceComboBox::slotNewItemStored(KexiPart::Item& item)
//insert a new item, maintaining sort order and splitting to tables and queries
if (item.mimeType()=="kexi/table") {
int i = 1; /*skip empty row*/
-#ifdef ADD_DEFINETQUERY_ROW
+#ifdef ADD_DEFINEQUERY_ROW
i++; /*skip 'define query' row*/
#endif
for (; i < d->firstQueryIndex() && name>=text(i); i++)
@@ -217,7 +217,7 @@ int KexiDataSourceComboBox::findItem(const TQString& mimeType, const TQString& n
int i, end;
if (mimeType=="kexi/table") {
i = 0;
-#ifdef ADD_DEFINETQUERY_ROW
+#ifdef ADD_DEFINEQUERY_ROW
i++; //skip 'define query'
#endif
end = d->firstQueryIndex();
diff --git a/kexi/widget/kexiquerydesignersqleditor.h b/kexi/widget/kexiquerydesignersqleditor.h
index a0bd4bee..c85bec6c 100644
--- a/kexi/widget/kexiquerydesignersqleditor.h
+++ b/kexi/widget/kexiquerydesignersqleditor.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXITQUERYDESIGNERSQLEDITOR_H
-#define KEXITQUERYDESIGNERSQLEDITOR_H
+#ifndef KEXIQUERYDESIGNERSQLEDITOR_H
+#define KEXIQUERYDESIGNERSQLEDITOR_H
#include "kexieditor.h"
diff --git a/kexi/widget/kexiqueryparameters.h b/kexi/widget/kexiqueryparameters.h
index 986c1ce9..00bd0b67 100644
--- a/kexi/widget/kexiqueryparameters.h
+++ b/kexi/widget/kexiqueryparameters.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef KEXITQUERYPARAMETERS_H
-#define KEXITQUERYPARAMETERS_H
+#ifndef KEXIQUERYPARAMETERS_H
+#define KEXIQUERYPARAMETERS_H
#include <kexidb/queryschema.h>