[koffice][master] 04a12485

kexi/formeditor/editlistviewdialog.cpp

diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp

index 44bc809..5dfc176 100644

--- a/kexi/formeditor/editlistviewdialog.cpp

+++ b/kexi/formeditor/editlistviewdialog.cpp

@@ -109,9 +109,9 @@

 	m_propSet = new KoProperty::Set(TQT_TQOBJECT(this), "columns");

 	m_propSet->addProperty(new KoProperty::Property("caption", "Caption", i18n("Caption"),i18n("Caption")));

 	m_propSet->addProperty(new KoProperty::Property("width", 100, i18n("Width"), i18n("Width")));

-	m_propSet->addProperty(new KoProperty::Property("clickable", TQVariant(true, 3), i18n("Clickable"), i18n("Clickable") ));

-	m_propSet->addProperty(new KoProperty::Property("resizable", TQVariant(true, 3), i18n("Resizable"), i18n("Resizable") ));

-	m_propSet->addProperty(new KoProperty::Property("fullwidth", TQVariant(false, 3), i18n("Full Width"), i18n("Full Width") ));

+	m_propSet->addProperty(new KoProperty::Property("clickable", TQVariant(true), i18n("Clickable"), i18n("Clickable") ));

+	m_propSet->addProperty(new KoProperty::Property("resizable", TQVariant(true), i18n("Resizable"), i18n("Resizable") ));

+	m_propSet->addProperty(new KoProperty::Property("fullwidth", TQVariant(false), i18n("Full Width"), i18n("Full Width") ));

 	m_editor->changeSet(m_propSet);

 	connect(m_propSet, TQT_SIGNAL(propertyChanged(KoProperty::Set & KoProperty::Property&)),

 		this, TQT_SLOT(changeProperty(KoProperty::Set & KoProperty::Property&)));

@@ -256,9 +256,9 @@

 		m_propSet->blockSignals(true); // we don't want changeProperty to be called

 		(*m_propSet)["caption"].setValue(m_listview->columnText(id), false);

 		(*m_propSet)["width"].setValue(m_listview->columnWidth(id), false);

-		(*m_propSet)["clickable"].setValue(TQVariant(m_listview->header()->isClickEnabled(id), 4), false);

-		(*m_propSet)["resizable"].setValue(TQVariant(m_listview->header()->isResizeEnabled(id), 4), false);

-		(*m_propSet)["fullwidth"].setValue(TQVariant(m_listview->header()->isStretchEnabled(id), 4), false);

+		(*m_propSet)["clickable"].setValue(TQVariant(m_listview->header()->isClickEnabled(id)), false);

+		(*m_propSet)["resizable"].setValue(TQVariant(m_listview->header()->isResizeEnabled(id)), false);

+		(*m_propSet)["fullwidth"].setValue(TQVariant(m_listview->header()->isStretchEnabled(id)), false);

 		m_propSet->blockSignals(false);

 		m_editor->changeSet(m_propSet);

kexi/formeditor/formIO.cpp

diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp

index 3d6fc8c..657c5cc 100644

--- a/kexi/formeditor/formIO.cpp

+++ b/kexi/formeditor/formIO.cpp

@@ -771,10 +771,10 @@

 	else if(type == "bool")

 		if(text == "true")

-			return TQVariant(true, 3);

+			return TQVariant(true);

 		else if(text == "false")

-			return TQVariant(false, 3);

-		return TQVariant(text.toInt(), 3);

+			return TQVariant(false);

+		return TQVariant(text.toInt());

 	else if(type == "number")

@@ -1076,7 +1076,7 @@

 			// save some special properties

 			savePropertyElement(layout, domDoc, "property", "customLayout", Container::layoutTypeToString(item->container()->layoutType()) );

-			savePropertyElement(layout, domDoc, "property", "justify", TQVariant(static_cast<KexiFlowLayout*>(item->container()->layout())->isJustified(), 3) );

+			savePropertyElement(layout, domDoc, "property", "justify", TQVariant(static_cast<KexiFlowLayout*>(item->container()->layout())->isJustified()) );

 			// fill the widget's grid info, ie just simulate grid layout

 			item->container()->createGridLayout(true);

kexi/formeditor/widgetpropertyset.cpp

diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp

index 74b1a4f..64c6111 100644

--- a/kexi/formeditor/widgetpropertyset.cpp

+++ b/kexi/formeditor/widgetpropertyset.cpp

@@ -378,7 +378,7 @@

 	(*this)["name"].setAutoSync(false); // name should be updated only when pressing Enter

-	(*this)["enabled"].setValue( TQVariant(tree->isEnabled(), 3));

+	(*this)["enabled"].setValue( TQVariant(tree->isEnabled()));

 	if (winfo) {

 		form->library()->setPropertyOptions(*this, *winfo, w);

@@ -664,7 +664,7 @@

 		(*it)->setPalette(p);

 		tree->setEnabled(value);

-		emit widgetPropertyChanged((*it), "enabled", TQVariant(value, 3));

+		emit widgetPropertyChanged((*it), "enabled", TQVariant(value));

@@ -837,7 +837,7 @@

) {

 		// Create the wordbreak property

 		KoProperty::Property *p = new KoProperty::Property("wordbreak",

-			TQVariant(alignment & TQt::WordBreak, 3), i18n("Word Break"), i18n("Word Break") );

+			TQVariant(alignment & TQt::WordBreak), i18n("Word Break"), i18n("Word Break") );

 		d->set.addProperty(p);

 		updatePropertyValue(tree, "wordbreak");

 		if (!KFormDesigner::FormManager::self()->activeForm()->library()->isPropertyVisible(

kexi/kexi

diff --git a/kexi/kexidb/driver_p.cpp b/kexi/kexidb/driver_p.cpp

index 462ce60..fcbadb5 100644

--- a/kexi/kexidb/driver_p.cpp

+++ b/kexi/kexidb/driver_p.cpp

@@ -55,7 +55,7 @@

 void DriverPrivate::initInternalProperties()

-	properties["is_file_database"] = TQVariant(isFileDriver, 1);

+	properties["is_file_database"] = TQVariant(isFileDriver);

 	propertyCaptions["is_file_database"] = i18n("File-based database driver");

 	if (isFileDriver) {

 		properties["file_database_mimetype"] = fileDBDriverMimeType;

@@ -77,11 +77,11 @@

 #endif

 //	properties["transaction_support"] = features & Driver::TransactionsMask;

 //	propertyCaptions["transaction_support"] = i18n("Transaction support");

-	properties["transaction_single"] = TQVariant(features & Driver::SingleTransactions, 1);

+	properties["transaction_single"] = TQVariant(features & Driver::SingleTransactions);

 	propertyCaptions["transaction_single"] = i18n("Single transactions support");

-	properties["transaction_multiple"] = TQVariant(features & Driver::MultipleTransactions, 1);

+	properties["transaction_multiple"] = TQVariant(features & Driver::MultipleTransactions);

 	propertyCaptions["transaction_multiple"] = i18n("Multiple transactions support");

-	properties["transaction_nested"] = TQVariant(features & Driver::NestedTransactions, 1);

+	properties["transaction_nested"] = TQVariant(features & Driver::NestedTransactions);

 	propertyCaptions["transaction_nested"] = i18n("Nested transactions support");

 	properties["kexidb_driver_version"] =

kexi/kexi

diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp

index 048d668..77746a1 100644

--- a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp

+++ b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp

@@ -239,7 +239,7 @@

 		else if (f->type() == Field::Boolean )

-			return QString((*m_res)[at()][pos].c_str()).lower() == "t" ? TQVariant(true, 1) : TQVariant(false, 1);

+			return QString((*m_res)[at()][pos].c_str()).lower() == "t" ? TQVariant(true) : TQVariant(false);

 		else if (f->typeGroup() == Field::BLOBGroup)

kexi/kexi

diff --git a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp

index c828296..6a80f76 100644

--- a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp

+++ b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp

@@ -151,7 +151,7 @@

 					return TQDateTime::fromString( tmp, Qt::ISODate );

 				case Field::Boolean:

-					return TQVariant(sqliteStringToBool(GET_sqlite3_column_text), 1);

+					return TQVariant(sqliteStringToBool(GET_sqlite3_column_text));

 				default:

 					return TQVariant(); //TODO

@@ -166,7 +166,7 @@

 			case Field::BigInteger:

 				return TQVariant( (TQ_LLONG)sqlite3_column_int64(prepared_st_handle, i) );

 			case Field::Boolean:

-				return TQVariant( sqlite3_column_int(prepared_st_handle, i)!=0, 1 );

+				return TQVariant( sqlite3_column_int(prepared_st_handle, i)!=0 );

 			default:;

 			if (f->isFPNumericType()) //WEIRD, YEAH?

@@ -480,7 +480,7 @@

 			case Field::BigInteger:

 				data[i] = TQVariant( TQString::fromLatin1(*col).toLongLong() );

 			case Field::Boolean:

-				data[i] = TQVariant( sqliteStringToBool(TQString::fromLatin1(*col)), 1 );

+				data[i] = TQVariant( sqliteStringToBool(TQString::fromLatin1(*col)) );

 				break;

 			case Field::Date:

 				data[i] = TQDate::fromString( TQString::fromLatin1(*col), Qt::ISODate );

kexi/kexi

diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp

index 4baa0d8..b7e6a2e 100644

--- a/kexi/kexidb/utils.cpp

+++ b/kexi/kexidb/utils.cpp

@@ -939,7 +939,7 @@

 	else if (valueType == "bool") {

-		return TQVariant(text.lower()=="true" || text=="1", 1);

+		return TQVariant(text.lower()=="true" || text=="1");

 //! @todo add more TQVariant types

 	KexiDBWarn << "loadPropertyValueFromDom(): unknown type '" << valueType << "'" << endl;

@@ -983,7 +983,7 @@

 		ADD(Field::ShortInteger, 0);

 		ADD(Field::Integer, 0);

 		ADD(Field::BigInteger, 0);

-		ADD(Field::Boolean, TQVariant(false, 0));

+		ADD(Field::Boolean, TQVariant(false));

 		ADD(Field::Float, 0.0);

 		ADD(Field::Double, 0.0);

 //! @todo ok? we have no better defaults

kexi/migration/pqxx/pqxxmigrate.cpp

diff --git a/kexi/migration/pqxx/pqxxmigrate.cpp b/kexi/migration/pqxx/pqxxmigrate.cpp

index 9460462..1511bbe 100644

--- a/kexi/migration/pqxx/pqxxmigrate.cpp

+++ b/kexi/migration/pqxx/pqxxmigrate.cpp

@@ -543,7 +543,7 @@

 	     else if (fieldsExpanded.at(index)->field->type()==KexiDB::Field::Boolean )

-	          vals.append(QString((*i).c_str()).lower() == "t" ? TQVariant(true, 1) : TQVariant(false, 1));

+	          vals.append(QString((*i).c_str()).lower() == "t" ? TQVariant(true) : TQVariant(false));

 	     else

kexi/plugins/forms/kexiformpart.cpp

diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp

index c53212f..0b5f83e 100644

--- a/kexi/plugins/forms/kexiformpart.cpp

+++ b/kexi/plugins/forms/kexiformpart.cpp

@@ -400,7 +400,7 @@

 	KoProperty::Property &p = (*KFormDesigner::FormManager::self()->propertySet())["autoTabStops"];

 	if (!p.isNull())

-		p.setValue(TQVariant(set, 4));

+		p.setValue(TQVariant(set));

 void KexiFormPart::slotAssignAction()

kexi/plugins/forms/widgets/kexidbcheckbox.cpp

diff --git a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp

index c1a8f5d..5d123d4 100644

--- a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp

+++ b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp

@@ -78,7 +78,7 @@

 	if (state()==NoChange)

 		return TQVariant();

-	return TQVariant(state()==On, 1);

+	return TQVariant(state()==On);

 void KexiDBCheckBox::slotStateChanged(int )

kexi/plugins/forms/widgets/kexidblineedit.cpp

diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp

index 815adca..8e74324 100644

--- a/kexi/plugins/forms/widgets/kexidblineedit.cpp

+++ b/kexi/plugins/forms/widgets/kexidblineedit.cpp

@@ -163,7 +163,7 @@

 		return text().toLongLong();

 	case KexiDB::Field::Boolean:

 		//! @todo temporary solution for booleans!

-		return text() == "1" ? TQVariant(true,1) : TQVariant(false,0);

+		return text() == "1" ? TQVariant(true) : TQVariant(false);

 	case KexiDB::Field::Date:

 		return dateFormatter()->stringToVariant( text() );

 	case KexiDB::Field::Time:

kexi/plugins/macros/tests/testaction.cpp

diff --git a/kexi/plugins/macros/tests/testaction.cpp b/kexi/plugins/macros/tests/testaction.cpp

index 3e4d281..fecec63 100644

--- a/kexi/plugins/macros/tests/testaction.cpp

+++ b/kexi/plugins/macros/tests/testaction.cpp

@@ -36,7 +36,7 @@

 	setVariable("teststring", "Stringtest", TQString("testString"));

 	setVariable("testint", "Inttest", int(0));

 	setVariable("testdouble", "Doubletest", double(0.5));

-	setVariable("testbool", "Booltest", TQVariant(true,0));

+	setVariable("testbool", "Booltest", TQVariant(true));

 TestAction::~TestAction()

kexi/plugins/queries/kexiquerydesignerguieditor.cpp

diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp

index 45ea8e1..582d79e 100644

--- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp

** Diff limit reached (max: 250 lines) **

04a12485	2019-05-28 14:09:09	Michele Calgaro
Adjusted to latest TQVariant::TQVariant(bool) function. Signed-off-by: Michele Calgaro <michele.calgaro@...>
M kexi/formeditor/editlistviewdialog.cpp M kexi/formeditor/formIO.cpp M kexi/formeditor/widgetpropertyset.cpp M kexi/kexidb/driver_p.cpp M kexi/kexidb/drivers/pqxx/pqxxcursor.cpp M kexi/kexidb/drivers/sqlite/sqlitecursor.cpp M kexi/kexidb/utils.cpp M kexi/migration/pqxx/pqxxmigrate.cpp M kexi/plugins/forms/kexiformpart.cpp M kexi/plugins/forms/widgets/kexidbcheckbox.cpp M kexi/plugins/forms/widgets/kexidblineedit.cpp M kexi/plugins/macros/tests/testaction.cpp M kexi/plugins/queries/kexiquerydesignerguieditor.cpp M kexi/plugins/scripting/kexidb/kexidbconnection.cpp M kexi/plugins/tables/kexitabledesignerview.cpp M kexi/widget/kexiqueryparameters.cpp M kexi/widget/tableview/kexibooltableedit.cpp M kexi/widget/tableview/kexitextformatter.cpp M kugar/kudesigner_lib/canvas.cpp M kugar/kudesigner_lib/detail.cpp M kugar/kudesigner_lib/label.cpp M kugar/kudesigner_lib/propertyserializer.cpp M lib/koproperty/editors/booledit.cpp M lib/koproperty/test/test.cpp M lib/kross/api/eventsignal.cpp M lib/kross/api/eventslot.cpp M lib/kross/api/qtobject.cpp M lib/kross/main/manager.cpp M lib/kross/python/pythonextension.cpp M lib/kross/python/pythonscript.cpp M lib/kross/ruby/rubymodule.cpp
kexi/formeditor/editlistviewdialog.cpp diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp index 44bc809..5dfc176 100644 --- a/kexi/formeditor/editlistviewdialog.cpp +++ b/kexi/formeditor/editlistviewdialog.cpp @@ -109,9 +109,9 @@ m_propSet = new KoProperty::Set(TQT_TQOBJECT(this), "columns"); m_propSet->addProperty(new KoProperty::Property("caption", "Caption", i18n("Caption"),i18n("Caption"))); m_propSet->addProperty(new KoProperty::Property("width", 100, i18n("Width"), i18n("Width"))); - m_propSet->addProperty(new KoProperty::Property("clickable", TQVariant(true, 3), i18n("Clickable"), i18n("Clickable") )); - m_propSet->addProperty(new KoProperty::Property("resizable", TQVariant(true, 3), i18n("Resizable"), i18n("Resizable") )); - m_propSet->addProperty(new KoProperty::Property("fullwidth", TQVariant(false, 3), i18n("Full Width"), i18n("Full Width") )); + m_propSet->addProperty(new KoProperty::Property("clickable", TQVariant(true), i18n("Clickable"), i18n("Clickable") )); + m_propSet->addProperty(new KoProperty::Property("resizable", TQVariant(true), i18n("Resizable"), i18n("Resizable") )); + m_propSet->addProperty(new KoProperty::Property("fullwidth", TQVariant(false), i18n("Full Width"), i18n("Full Width") )); m_editor->changeSet(m_propSet); connect(m_propSet, TQT_SIGNAL(propertyChanged(KoProperty::Set & KoProperty::Property&)), this, TQT_SLOT(changeProperty(KoProperty::Set & KoProperty::Property&))); @@ -256,9 +256,9 @@ m_propSet->blockSignals(true); // we don't want changeProperty to be called (m_propSet)["caption"].setValue(m_listview->columnText(id), false); (m_propSet)["width"].setValue(m_listview->columnWidth(id), false); - (m_propSet)["clickable"].setValue(TQVariant(m_listview->header()->isClickEnabled(id), 4), false); - (m_propSet)["resizable"].setValue(TQVariant(m_listview->header()->isResizeEnabled(id), 4), false); - (m_propSet)["fullwidth"].setValue(TQVariant(m_listview->header()->isStretchEnabled(id), 4), false); + (m_propSet)["clickable"].setValue(TQVariant(m_listview->header()->isClickEnabled(id)), false); + (m_propSet)["resizable"].setValue(TQVariant(m_listview->header()->isResizeEnabled(id)), false); + (m_propSet)["fullwidth"].setValue(TQVariant(m_listview->header()->isStretchEnabled(id)), false); m_propSet->blockSignals(false); m_editor->changeSet(m_propSet); } kexi/formeditor/formIO.cpp diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index 3d6fc8c..657c5cc 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -771,10 +771,10 @@ else if(type == "bool") { if(text == "true") - return TQVariant(true, 3); + return TQVariant(true); else if(text == "false") - return TQVariant(false, 3); - return TQVariant(text.toInt(), 3); + return TQVariant(false); + return TQVariant(text.toInt()); } else if(type == "number") { @@ -1076,7 +1076,7 @@ // save some special properties savePropertyElement(layout, domDoc, "property", "customLayout", Container::layoutTypeToString(item->container()->layoutType()) ); - savePropertyElement(layout, domDoc, "property", "justify", TQVariant(static_cast<KexiFlowLayout>(item->container()->layout())->isJustified(), 3) ); + savePropertyElement(layout, domDoc, "property", "justify", TQVariant(static_cast<KexiFlowLayout>(item->container()->layout())->isJustified()) ); // fill the widget's grid info, ie just simulate grid layout item->container()->createGridLayout(true); kexi/formeditor/widgetpropertyset.cpp diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp index 74b1a4f..64c6111 100644 --- a/kexi/formeditor/widgetpropertyset.cpp +++ b/kexi/formeditor/widgetpropertyset.cpp @@ -378,7 +378,7 @@ } (this)["name"].setAutoSync(false); // name should be updated only when pressing Enter - (this)["enabled"].setValue( TQVariant(tree->isEnabled(), 3)); + (this)["enabled"].setValue( TQVariant(tree->isEnabled())); if (winfo) { form->library()->setPropertyOptions(this, winfo, w); @@ -664,7 +664,7 @@ (it)->setPalette(p); tree->setEnabled(value); - emit widgetPropertyChanged((it), "enabled", TQVariant(value, 3)); + emit widgetPropertyChanged((it), "enabled", TQVariant(value)); } } @@ -837,7 +837,7 @@ ) { // Create the wordbreak property KoProperty::Property p = new KoProperty::Property("wordbreak", - TQVariant(alignment & TQt::WordBreak, 3), i18n("Word Break"), i18n("Word Break") ); + TQVariant(alignment & TQt::WordBreak), i18n("Word Break"), i18n("Word Break") ); d->set.addProperty(p); updatePropertyValue(tree, "wordbreak"); if (!KFormDesigner::FormManager::self()->activeForm()->library()->isPropertyVisible( kexi/kexi diff --git a/kexi/kexidb/driver_p.cpp b/kexi/kexidb/driver_p.cpp index 462ce60..fcbadb5 100644 --- a/kexi/kexidb/driver_p.cpp +++ b/kexi/kexidb/driver_p.cpp @@ -55,7 +55,7 @@ void DriverPrivate::initInternalProperties() { - properties["is_file_database"] = TQVariant(isFileDriver, 1); + properties["is_file_database"] = TQVariant(isFileDriver); propertyCaptions["is_file_database"] = i18n("File-based database driver"); if (isFileDriver) { properties["file_database_mimetype"] = fileDBDriverMimeType; @@ -77,11 +77,11 @@ #endif // properties["transaction_support"] = features & Driver::TransactionsMask; // propertyCaptions["transaction_support"] = i18n("Transaction support"); - properties["transaction_single"] = TQVariant(features & Driver::SingleTransactions, 1); + properties["transaction_single"] = TQVariant(features & Driver::SingleTransactions); propertyCaptions["transaction_single"] = i18n("Single transactions support"); - properties["transaction_multiple"] = TQVariant(features & Driver::MultipleTransactions, 1); + properties["transaction_multiple"] = TQVariant(features & Driver::MultipleTransactions); propertyCaptions["transaction_multiple"] = i18n("Multiple transactions support"); - properties["transaction_nested"] = TQVariant(features & Driver::NestedTransactions, 1); + properties["transaction_nested"] = TQVariant(features & Driver::NestedTransactions); propertyCaptions["transaction_nested"] = i18n("Nested transactions support"); properties["kexidb_driver_version"] = kexi/kexi diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp index 048d668..77746a1 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp +++ b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp @@ -239,7 +239,7 @@ } else if (f->type() == Field::Boolean ) { - return QString((m_res)[at()][pos].c_str()).lower() == "t" ? TQVariant(true, 1) : TQVariant(false, 1); + return QString((m_res)[at()][pos].c_str()).lower() == "t" ? TQVariant(true) : TQVariant(false); } else if (f->typeGroup() == Field::BLOBGroup) { kexi/kexi diff --git a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp index c828296..6a80f76 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp @@ -151,7 +151,7 @@ return TQDateTime::fromString( tmp, Qt::ISODate ); } case Field::Boolean: - return TQVariant(sqliteStringToBool(GET_sqlite3_column_text), 1); + return TQVariant(sqliteStringToBool(GET_sqlite3_column_text)); default: return TQVariant(); //TODO } @@ -166,7 +166,7 @@ case Field::BigInteger: return TQVariant( (TQ_LLONG)sqlite3_column_int64(prepared_st_handle, i) ); case Field::Boolean: - return TQVariant( sqlite3_column_int(prepared_st_handle, i)!=0, 1 ); + return TQVariant( sqlite3_column_int(prepared_st_handle, i)!=0 ); default:; } if (f->isFPNumericType()) //WEIRD, YEAH? @@ -480,7 +480,7 @@ case Field::BigInteger: data[i] = TQVariant( TQString::fromLatin1(col).toLongLong() ); case Field::Boolean: - data[i] = TQVariant( sqliteStringToBool(TQString::fromLatin1(col)), 1 ); + data[i] = TQVariant( sqliteStringToBool(TQString::fromLatin1(col)) ); break; case Field::Date: data[i] = TQDate::fromString( TQString::fromLatin1(col), Qt::ISODate ); kexi/kexi diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp index 4baa0d8..b7e6a2e 100644 --- a/kexi/kexidb/utils.cpp +++ b/kexi/kexidb/utils.cpp @@ -939,7 +939,7 @@ } } else if (valueType == "bool") { - return TQVariant(text.lower()=="true" \|\| text=="1", 1); + return TQVariant(text.lower()=="true" \|\| text=="1"); } //! @todo add more TQVariant types KexiDBWarn << "loadPropertyValueFromDom(): unknown type '" << valueType << "'" << endl; @@ -983,7 +983,7 @@ ADD(Field::ShortInteger, 0); ADD(Field::Integer, 0); ADD(Field::BigInteger, 0); - ADD(Field::Boolean, TQVariant(false, 0)); + ADD(Field::Boolean, TQVariant(false)); ADD(Field::Float, 0.0); ADD(Field::Double, 0.0); //! @todo ok? we have no better defaults kexi/migration/pqxx/pqxxmigrate.cpp diff --git a/kexi/migration/pqxx/pqxxmigrate.cpp b/kexi/migration/pqxx/pqxxmigrate.cpp index 9460462..1511bbe 100644 --- a/kexi/migration/pqxx/pqxxmigrate.cpp +++ b/kexi/migration/pqxx/pqxxmigrate.cpp @@ -543,7 +543,7 @@ } else if (fieldsExpanded.at(index)->field->type()==KexiDB::Field::Boolean ) { - vals.append(QString((i).c_str()).lower() == "t" ? TQVariant(true, 1) : TQVariant(false, 1)); + vals.append(QString((i).c_str()).lower() == "t" ? TQVariant(true) : TQVariant(false)); } else { kexi/plugins/forms/kexiformpart.cpp diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp index c53212f..0b5f83e 100644 --- a/kexi/plugins/forms/kexiformpart.cpp +++ b/kexi/plugins/forms/kexiformpart.cpp @@ -400,7 +400,7 @@ KoProperty::Property &p = (KFormDesigner::FormManager::self()->propertySet())["autoTabStops"]; if (!p.isNull()) - p.setValue(TQVariant(set, 4)); + p.setValue(TQVariant(set)); } void KexiFormPart::slotAssignAction() kexi/plugins/forms/widgets/kexidbcheckbox.cpp diff --git a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp index c1a8f5d..5d123d4 100644 --- a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp @@ -78,7 +78,7 @@ { if (state()==NoChange) return TQVariant(); - return TQVariant(state()==On, 1); + return TQVariant(state()==On); } void KexiDBCheckBox::slotStateChanged(int ) kexi/plugins/forms/widgets/kexidblineedit.cpp diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp index 815adca..8e74324 100644 --- a/kexi/plugins/forms/widgets/kexidblineedit.cpp +++ b/kexi/plugins/forms/widgets/kexidblineedit.cpp @@ -163,7 +163,7 @@ return text().toLongLong(); case KexiDB::Field::Boolean: //! @todo temporary solution for booleans! - return text() == "1" ? TQVariant(true,1) : TQVariant(false,0); + return text() == "1" ? TQVariant(true) : TQVariant(false); case KexiDB::Field::Date: return dateFormatter()->stringToVariant( text() ); case KexiDB::Field::Time: kexi/plugins/macros/tests/testaction.cpp diff --git a/kexi/plugins/macros/tests/testaction.cpp b/kexi/plugins/macros/tests/testaction.cpp index 3e4d281..fecec63 100644 --- a/kexi/plugins/macros/tests/testaction.cpp +++ b/kexi/plugins/macros/tests/testaction.cpp @@ -36,7 +36,7 @@ setVariable("teststring", "Stringtest", TQString("testString")); setVariable("testint", "Inttest", int(0)); setVariable("testdouble", "Doubletest", double(0.5)); - setVariable("testbool", "Booltest", TQVariant(true,0)); + setVariable("testbool", "Booltest", TQVariant(true)); } TestAction::~TestAction() kexi/plugins/queries/kexiquerydesignerguieditor.cpp diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp index 45ea8e1..582d79e 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp Diff limit reached (max: 250 lines)

Branch: master

kexi/formeditor/editlistviewdialog.cpp

kexi/formeditor/formIO.cpp

kexi/formeditor/widgetpropertyset.cpp

kexi/kexi

kexi/kexi

kexi/kexi

kexi/kexi

kexi/migration/pqxx/pqxxmigrate.cpp

kexi/plugins/forms/kexiformpart.cpp

kexi/plugins/forms/widgets/kexidbcheckbox.cpp

kexi/plugins/forms/widgets/kexidblineedit.cpp

kexi/plugins/macros/tests/testaction.cpp

kexi/plugins/queries/kexiquerydesignerguieditor.cpp