Branch: master

00c81d97 2019-05-26 13:16:13 Slávek Banko
Adjusted to latest TQVariant::TQVariant(bool) function.

Signed-off-by: Slávek Banko <slavek.banko@...>
M certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
M tderesources/blogging/API_Blogger.cpp
M tderesources/egroupware/kcal_resourcexmlrpc.cpp
M tderesources/egroupware/tdeabc_resourcexmlrpc.cpp

certmanager/l

diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
index 7ed3119..c37e5a8 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
@@ -127,7 +127,7 @@
 
   // some special types:
   template <> struct from_helper<bool> : public TQVariant {
-    from_helper( bool b ) : TQVariant( b, int() ) {}
+    from_helper( bool b ) : TQVariant( b ) {}
   };
   template <> struct from_helper<KURL> : public TQVariant {
     from_helper( const KURL & url ) : TQVariant( url.path() ) {}
@@ -180,7 +180,7 @@
       if ( argType() != ArgType_Path && argType()!= ArgType_DirPath ) return mValue.toStringList();
       else return to<KURL::List>( mValue ); }
     void resetToDefault() { mValue = defaultValue(); mDirty = false; }
-    void setBoolValue( bool value ) { setValue( TQVariant( value, int() ) ); }
+    void setBoolValue( bool value ) { setValue( TQVariant( value ) ); }
     void setStringValue( const TQString & value ) { setValue( value ); }
     void setIntValue( int value ) { setValue( value ); }
     void setUIntValue( unsigned int value ) { setValue( value ); }
@@ -219,9 +219,9 @@
       return TQVariant();
     case ArgType_None:
       if ( isList() )
-        return TQValueList<TQVariant>() << TQVariant( data.defaults.boolean.value, int() );
+        return TQValueList<TQVariant>() << TQVariant( data.defaults.boolean.value );
       else
-        return TQVariant( data.defaults.boolean.value, int() );
+        return TQVariant( data.defaults.boolean.value );
     case ArgType_String:
       if ( isList() )
         return TQStringList( TQString::fromLatin1( data.defaults.string ) );

tderesources/blogging/API_Blogger.cpp

diff --git a/tderesources/blogging/API_Blogger.cpp b/tderesources/blogging/API_Blogger.cpp
index 69a722e..984cc37 100644
--- a/tderesources/blogging/API_Blogger.cpp
+++ b/tderesources/blogging/API_Blogger.cpp
@@ -100,7 +100,7 @@
     kdDebug() << "Uploading Posting with url " << url.url() << endl;
     TQValueList<TQVariant> args( defaultArgs( posting->postID() ) );
     args << TQVariant( posting->content() );
-    args << TQVariant( /*publish=*/true, 0 );
+    args << TQVariant( /*publish=*/true );
     return TDEIO::xmlrpcCall( mServerURL, getFunctionName( bloggerEditPost ), args, false );
 //   } else {
 //     warningNotInitialized();
@@ -118,7 +118,7 @@
     kdDebug() << "Creating new Posting with blogid " << posting->blogID() << " at url " << mServerURL << endl;
     TQValueList<TQVariant> args( defaultArgs( posting->blogID() ) );
     args << TQVariant( posting->content() );
-    args << TQVariant( /*publish=*/true, 0 );
+    args << TQVariant( /*publish=*/true );
     return TDEIO::xmlrpcCall( mServerURL, getFunctionName( bloggerNewPost ), args, false );
 //   } else {
 //     warningNotInitialized();
@@ -131,7 +131,7 @@
 kdDebug() << "APIBlogger::createRemoveJob: postid=" << postid << endl;
 //   if ( isValid() ){
     TQValueList<TQVariant> args( defaultArgs( postid ) );
-    args << TQVariant( /*publish=*/true, 0 );
+    args << TQVariant( /*publish=*/true );
     return TDEIO::xmlrpcCall( mServerURL, getFunctionName( bloggerDeletePost ), args, false );
 //   } else {
 //     warningNotInitialized();

tderesources/egroupware/kcal_resourcexmlrpc.cpp

diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.cpp b/tderesources/egroupware/kcal_resourcexmlrpc.cpp
index 7ce11dd..319c897 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/kcal_resourcexmlrpc.cpp
@@ -260,7 +260,7 @@
                  this, TQT_SLOT( loadEventCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
                  this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
 
-  mServer->call( LoadTodoCategoriesCommand, TQVariant( false, 0 ),
+  mServer->call( LoadTodoCategoriesCommand, TQVariant( false ),
                  this, TQT_SLOT( loadTodoCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
                  this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
   return true;

tderesources/egroupware/tdeabc_resourcexmlrpc.cpp

diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp
index 1929bd1..5f92d1c 100644
--- a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp
@@ -208,7 +208,7 @@
                  this, TQT_SLOT( listContactsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
                  this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
 
-  mServer->call( LoadCategoriesCommand, TQVariant( false, 0 ),
+  mServer->call( LoadCategoriesCommand, TQVariant( false ),
                  this, TQT_SLOT( loadCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
                  this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
 
2852e827 2019-05-26 14:26:11 Michele Calgaro
Removed helper function that is no longer required.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M certmanager/lib/backends/chiasmus/chiasmusbackend.cpp

certmanager/l

diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
index c37e5a8..f6885b3 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
@@ -126,9 +126,6 @@
   }
 
   // some special types:
-  template <> struct from_helper<bool> : public TQVariant {
-    from_helper( bool b ) : TQVariant( b ) {}
-  };
   template <> struct from_helper<KURL> : public TQVariant {
     from_helper( const KURL & url ) : TQVariant( url.path() ) {}
   };