Fix inadvertent TQt string conversions

This closes Bug 782

11 files changed, 48 insertions, 48 deletions

diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp
index 37e30e04..c5c46560 100644
--- a/kexi/plugins/importexport/csv/kexicsvexport.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp
@@ -63,7 +63,7 @@ bool Options::assign( TQMap<TQString,TQString>& args )
 	if (args.contains("textQuote"))
 		textQuote = args["textQuote"];
 	else
-		textQuote = (mode==File) ? KEXICSV_DEFAULT_FILE_TEXT_TQUOTE : KEXICSV_DEFAULT_CLIPBOARD_TEXT_TQUOTE;
+		textQuote = (mode==File) ? KEXICSV_DEFAULT_FILE_TEXT_QUOTE : KEXICSV_DEFAULT_CLIPBOARD_TEXT_QUOTE;
 
 	bool ok;
 	itemId = args["itemId"].toInt(&ok);
@@ -95,7 +95,7 @@ bool KexiCSVExport::exportData(KexiDB::TableOrQuerySchema& tableOrQuery,
 //! @todo look at rowCount whether the data is really large; 
 //!       if so: avoid copying to clipboard (or ask user) because of system memory
 
-//! @todo OPTIMIZATION: use fieldsExpanded(true /*UNITQUE*/)
+//! @todo OPTIMIZATION: use fieldsExpanded(true /*UNIQUE*/)
 //! @todo OPTIMIZATION? (avoid multiple data retrieving) look for already fetched data within KexiProject..
 
 	KexiDB::QuerySchema* query = tableOrQuery.query();
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
index 4a11d1d7..72292afc 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
@@ -424,8 +424,8 @@ TQString KexiCSVExportWizard::defaultDelimiter() const
 TQString KexiCSVExportWizard::defaultTextQuote() const
 {
 	if (m_options.mode==KexiCSVExport::Clipboard)
-		return KEXICSV_DEFAULT_CLIPBOARD_TEXT_TQUOTE;
-	return KEXICSV_DEFAULT_FILE_TEXT_TQUOTE;
+		return KEXICSV_DEFAULT_CLIPBOARD_TEXT_QUOTE;
+	return KEXICSV_DEFAULT_FILE_TEXT_QUOTE;
 }
 
 #include "kexicsvexportwizard.moc"
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 0e5f6e4c..3f1cb6a3 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -156,7 +156,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 	m_cancelled( false ),
 	m_adjustRows( true ),
 	m_startline( 0 ),
-	m_textquote( TQString(KEXICSV_DEFAULT_FILE_TEXT_TQUOTE)[0] ),
+	m_textquote( TQString(KEXICSV_DEFAULT_FILE_TEXT_QUOTE)[0] ),
 	m_mode(mode),
 	m_prevSelectedCol(-1),
 	m_columnsAdjusted(false),
@@ -554,9 +554,9 @@ TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextS
 	bool insideQuote = false;
 
 	//characters by priority
-	const int CH_TAB_AFTER_TQUOTE = 500;
-	const int CH_SEMICOLON_AFTER_TQUOTE = 499;
-	const int CH_COMMA_AFTER_TQUOTE = 498;
+	const int CH_TAB_AFTER_QUOTE = 500;
+	const int CH_SEMICOLON_AFTER_QUOTE = 499;
+	const int CH_COMMA_AFTER_QUOTE = 498;
 	const int CH_TAB = 200; // \t
 	const int CH_SEMICOLON = 199; // ;
 	const int CH_COMMA = 198; // ,
@@ -588,15 +588,15 @@ TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextS
 		}
 		else if (c=='\t') {
 			tabs++;
-			detectedDelimiter = TQMAX( prevChar=='"' ? CH_TAB_AFTER_TQUOTE : CH_TAB, detectedDelimiter );
+			detectedDelimiter = TQMAX( prevChar=='"' ? CH_TAB_AFTER_QUOTE : CH_TAB, detectedDelimiter );
 		}
 		else if (c==';') {
 			semicolons++;
-			detectedDelimiter = TQMAX( prevChar=='"' ? CH_SEMICOLON_AFTER_TQUOTE : CH_SEMICOLON, detectedDelimiter );
+			detectedDelimiter = TQMAX( prevChar=='"' ? CH_SEMICOLON_AFTER_QUOTE : CH_SEMICOLON, detectedDelimiter );
 		}
 		else if (c==',') {
 			commas++;
-			detectedDelimiter = TQMAX( prevChar=='"' ? CH_COMMA_AFTER_TQUOTE : CH_COMMA, detectedDelimiter );
+			detectedDelimiter = TQMAX( prevChar=='"' ? CH_COMMA_AFTER_QUOTE : CH_COMMA, detectedDelimiter );
 		}
 		prevChar = c;
 	}
@@ -634,11 +634,11 @@ TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextS
 			return ",";
 	}
 	//now return the winning character by looking at CH_* symbol
-	if (detectedDelimiter == CH_TAB_AFTER_TQUOTE || detectedDelimiter == CH_TAB)
+	if (detectedDelimiter == CH_TAB_AFTER_QUOTE || detectedDelimiter == CH_TAB)
 		return "\t";
-	if (detectedDelimiter == CH_SEMICOLON_AFTER_TQUOTE || detectedDelimiter == CH_SEMICOLON)
+	if (detectedDelimiter == CH_SEMICOLON_AFTER_QUOTE || detectedDelimiter == CH_SEMICOLON)
 		return ";";
-	if (detectedDelimiter == CH_COMMA_AFTER_TQUOTE || detectedDelimiter == CH_COMMA)
+	if (detectedDelimiter == CH_COMMA_AFTER_QUOTE || detectedDelimiter == CH_COMMA)
 		return ",";
 
 	return KEXICSV_DEFAULT_FILE_DELIMITER; //<-- default
@@ -647,7 +647,7 @@ TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextS
 tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, int &maxColumn, 
 	bool inGUI)
 {
-	enum { S_START, S_TQUOTED_FIELD, S_MAYBE_END_OF_TQUOTED_FIELD, S_END_OF_TQUOTED_FIELD,
+	enum { S_START, S_QUOTED_FIELD, S_MAYBE_END_OF_QUOTED_FIELD, S_END_OF_QUOTED_FIELD,
 		 S_MAYBE_NORMAL_FIELD, S_NORMAL_FIELD } state = S_START;
 	field = TQString();
 	const bool ignoreDups = m_ignoreDuplicates->isChecked();
@@ -717,7 +717,7 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i
 		case S_START :
 			if (x == m_textquote)
 			{
-				state = S_TQUOTED_FIELD;
+				state = S_QUOTED_FIELD;
 			}
 			else if (x == delimiter)
 			{
@@ -745,10 +745,10 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i
 				state = S_MAYBE_NORMAL_FIELD;
 			}
 			break;
-		case S_TQUOTED_FIELD :
+		case S_QUOTED_FIELD :
 			if (x == m_textquote)
 			{
-				state = S_MAYBE_END_OF_TQUOTED_FIELD;
+				state = S_MAYBE_END_OF_QUOTED_FIELD;
 			}
 /*allow \n inside quoted fields
 			else if (x == '\n')
@@ -774,11 +774,11 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i
 				field += x;
 			}
 			break;
-		case S_MAYBE_END_OF_TQUOTED_FIELD :
+		case S_MAYBE_END_OF_QUOTED_FIELD :
 			if (x == m_textquote)
 			{
 				field += x; //no, this was just escaped quote character
-				state = S_TQUOTED_FIELD;
+				state = S_QUOTED_FIELD;
 			}
 			else if (x == delimiter || x == '\n')
 			{
@@ -800,10 +800,10 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i
 			}
 			else
 			{
-				state = S_END_OF_TQUOTED_FIELD;
+				state = S_END_OF_QUOTED_FIELD;
 			}
 			break;
-		case S_END_OF_TQUOTED_FIELD :
+		case S_END_OF_QUOTED_FIELD :
 			if (x == delimiter || x == '\n')
 			{
 				setText(row - m_startline, column, field, inGUI);
@@ -824,14 +824,14 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i
 			}
 			else
 			{
-				state = S_END_OF_TQUOTED_FIELD;
+				state = S_END_OF_QUOTED_FIELD;
 			}
 			break;
 		case S_MAYBE_NORMAL_FIELD :
 			if (x == m_textquote)
 			{
 				field = TQString();
-				state = S_TQUOTED_FIELD;
+				state = S_QUOTED_FIELD;
 				break;
 			}
 		case S_NORMAL_FIELD :
diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.h b/kexi/plugins/importexport/csv/kexicsvwidgets.h
index 76f76d31..388e6246 100644
--- a/kexi/plugins/importexport/csv/kexicsvwidgets.h
+++ b/kexi/plugins/importexport/csv/kexicsvwidgets.h
@@ -27,8 +27,8 @@ class KLineEdit;
 class KActiveLabel;
 class TQLabel;
 
-#define KEXICSV_DEFAULT_FILE_TEXT_TQUOTE "\""
-#define KEXICSV_DEFAULT_CLIPBOARD_TEXT_TQUOTE ""
+#define KEXICSV_DEFAULT_FILE_TEXT_QUOTE "\""
+#define KEXICSV_DEFAULT_CLIPBOARD_TEXT_QUOTE ""
 #define KEXICSV_DEFAULT_FILE_DELIMITER ","
 #define KEXICSV_DEFAULT_CLIPBOARD_DELIMITER "\t"
 #define KEXICSV_DEFAULT_FILE_DELIMITER_INDEX 0
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>