Branch: master

7004f06d 2019-05-29 05:46:06 Michele Calgaro
Adjusted to latest TQVariant::TQVariant(bool) function.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M src/kvirc/kernel/kvi_filetransfer.cpp
M src/modules/dcc/canvaswidget.cpp

src/kvirc/kernel/kvi_filetransfer.cpp

diff --git a/src/kvirc/kernel/kvi_filetransfer.cpp b/src/kvirc/kernel/kvi_filetransfer.cpp
index 64411fe..35d8428 100644
--- a/src/kvirc/kernel/kvi_filetransfer.cpp
+++ b/src/kvirc/kernel/kvi_filetransfer.cpp
@@ -90,8 +90,8 @@
 	{
 		KviPointerHashTable<TQString,TQVariant> d(7,false);
 		d.setAutoDelete(true);
-		d.replace("bCreateMinimized",new TQVariant(bCreateMinimized,0));
-		d.replace("bNoRaise",new TQVariant(bNoRaise,0));
+		d.replace("bCreateMinimized",new TQVariant(bCreateMinimized));
+		d.replace("bNoRaise",new TQVariant(bNoRaise));
 
 		KviModuleExtensionManager::instance()->allocateExtension(
 				"tool",

src/modules/dcc/canvaswidget.cpp

diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index 8eadbaf..e18231a 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -90,7 +90,7 @@
 	m_properties.insert("uLineWidth",TQVariant((unsigned int)0));
 
 	m_properties.insert("clrBackground",TQVariant(TQColor(0,0,0)));
-	m_properties.insert("bHasBackground",TQVariant(false,1));
+	m_properties.insert("bHasBackground",TQVariant(false));
 
 	m_dScaleFactor = dScaleFactor;
 	m_points = pnts;
@@ -193,7 +193,7 @@
 	m_properties.insert("uLineWidth",TQVariant((unsigned int)0));
 
 	m_properties.insert("clrBackground",TQVariant(TQColor(0,0,0)));
-	m_properties.insert("bHasBackground",TQVariant(false,1));
+	m_properties.insert("bHasBackground",TQVariant(false));
 
 //	m_properties.insert("iStartAngle",TQVariant(0));
 //	m_properties.insert("iEndAngle",TQVariant(360));
@@ -339,7 +339,7 @@
 	m_properties.insert("uLineWidth",TQVariant((unsigned int)0));
 
 	m_properties.insert("clrBackground",TQVariant(TQColor(0,0,0)));
-	m_properties.insert("bHasBackground",TQVariant(false,1));
+	m_properties.insert("bHasBackground",TQVariant(false));
 }
 
 KviCanvasRectangle::~KviCanvasRectangle()
@@ -1325,7 +1325,7 @@
 			m_property = TQVariant(((TQLineEdit *)w)->text().toUInt());
 		break;
 		case TQVariant::Bool:
-			m_property = TQVariant(((TQComboBox *)w)->currentItem(),1);
+			m_property = TQVariant(((TQComboBox *)w)->currentItem());
 		break;
 		case TQVariant::Color:
 			m_property.asColor().setNamedColor(((TQLineEdit *)w)->text());