Branch: master

352c8f6a 2019-05-24 03:02:07 Michele Calgaro
Adjusted to latest TQVariant::TQVariant(bool) function.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M dcop/client/marshall.cpp
M tdecore/kdcoppropertyproxy.cpp
M tdecore/tdeconfigbase.cpp
M tdecore/tdeconfigskeleton.cpp
M tdehtml/ecma/kjs_binding.cpp
M tdehtml/ecma/kjs_debugwin.cpp
M tdeio/tdeio/kmimetype.cpp
M tdeio/tdeio/kservice.cpp

dcop/client/marshall.cpp

diff --git a/dcop/client/marshall.cpp b/dcop/client/marshall.cpp
index 354ad03..efdb76b 100644
--- a/dcop/client/marshall.cpp
+++ b/dcop/client/marshall.cpp
@@ -339,7 +339,7 @@
 	int tqRectKeywordLength = strlen(TQRECT_OBJECT_NAME_STRING);
 	int tqColorKeywordLength = strlen(TQCOLOR_OBJECT_NAME_STRING);
 	if ( s == "true" || s == "false" ) {
-	    arg << TQVariant( mkBool( s ), 42 );
+	    arg << TQVariant( mkBool( s ) );
 	}
 	else if ( s.left( 4 ) == "int(" ) {
 	    arg << TQVariant( s.mid(4, s.length()-5).toInt() );

tdecore/kdcoppropertyproxy.cpp

diff --git a/tdecore/kdcoppropertyproxy.cpp b/tdecore/kdcoppropertyproxy.cpp
index 24bf676..663644b 100644
--- a/tdecore/kdcoppropertyproxy.cpp
+++ b/tdecore/kdcoppropertyproxy.cpp
@@ -230,7 +230,7 @@
       {
         TQ_INT8 v;
         stream >> v;
-        prop = TQVariant( static_cast<bool>( v ), 1 );
+        prop = TQVariant( static_cast<bool>( v ) );
       }
         break;
       DEMARSHAL( Double, double )

tdecore/tdeconfigbase.cpp

diff --git a/tdecore/tdeconfigbase.cpp b/tdecore/tdeconfigbase.cpp
index e8d384d..1e8310a 100644
--- a/tdecore/tdeconfigbase.cpp
+++ b/tdecore/tdeconfigbase.cpp
@@ -417,7 +417,7 @@
       case TQVariant::ULongLong:
           return TQVariant( readUnsignedNum64Entry( pKey, aDefault.toULongLong() ) );
       case TQVariant::Bool:
-          return TQVariant( readBoolEntry( pKey, aDefault.toBool() ), 0 );
+          return TQVariant( readBoolEntry( pKey, aDefault.toBool() ) );
       case TQVariant::Double:
           return TQVariant( readDoubleNumEntry( pKey, aDefault.toDouble() ) );
       case TQVariant::DateTime:

tdecore/tdeconfigskeleton.cpp

diff --git a/tdecore/tdeconfigskeleton.cpp b/tdecore/tdeconfigskeleton.cpp
index 4a389f3..03dac61 100644
--- a/tdecore/tdeconfigskeleton.cpp
+++ b/tdecore/tdeconfigskeleton.cpp
@@ -161,7 +161,7 @@
 
 TQVariant TDEConfigSkeleton::ItemBool::property() const
 {
-  return TQVariant( mReference, 42 /* dummy */ );
+  return TQVariant( mReference );
 }
 
 

tdehtml/ecma/kjs_binding.cpp

diff --git a/tdehtml/ecma/kjs_binding.cpp b/tdehtml/ecma/kjs_binding.cpp
index d9f0b7b..7e545a5 100644
--- a/tdehtml/ecma/kjs_binding.cpp
+++ b/tdehtml/ecma/kjs_binding.cpp
@@ -328,7 +328,7 @@
   TQVariant res;
   switch (val.type()) {
   case BooleanType:
-    res = TQVariant(val.toBoolean(exec), 0);
+    res = TQVariant(val.toBoolean(exec));
     break;
   case NumberType:
     res = TQVariant(val.toNumber(exec));

tdehtml/ecma/kjs_debugwin.cpp

diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index df2e24d..2e08f5e 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -862,7 +862,7 @@
   if (dontShowAgain) {
     TDEConfig *config = kapp->config();
     TDEConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings"));
-    config->writeEntry("ReportJavaScriptErrors",TQVariant(false,0));
+    config->writeEntry("ReportJavaScriptErrors",TQVariant(false));
     config->sync();
     TQByteArray data;
     kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );

tdeio/tdeio/kmimetype.cpp

diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp
index 1976709..0dd96cb 100644
--- a/tdeio/tdeio/kmimetype.cpp
+++ b/tdeio/tdeio/kmimetype.cpp
@@ -388,7 +388,7 @@
   // Read the X-TDE-AutoEmbed setting and store it in the properties map
   TQString XKDEAutoEmbed = TQString::fromLatin1("X-TDE-AutoEmbed");
   if ( config->hasKey( XKDEAutoEmbed ) )
-    m_mapProps.insert( XKDEAutoEmbed, TQVariant( config->readBoolEntry( XKDEAutoEmbed ), 0 ) );
+    m_mapProps.insert( XKDEAutoEmbed, TQVariant( config->readBoolEntry( XKDEAutoEmbed ) ) );
 
   TQString XKDEText = TQString::fromLatin1("X-TDE-text");
   if ( config->hasKey( XKDEText ) )

tdeio/tdeio/kservice.cpp

diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp
index f0c114e..b059d23 100644
--- a/tdeio/tdeio/kservice.cpp
+++ b/tdeio/tdeio/kservice.cpp
@@ -620,7 +620,7 @@
            }
            if (t == TQVariant::Bool)
            {
-               return TQVariant((bool)val, 1);
+               return TQVariant((bool)val);
            }
            return TQVariant(val);
         }