diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-05-28 23:09:09 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-05-28 23:09:09 +0900 |
commit | 04a12485219f38e113932e8aa20b6bc12d8fa715 (patch) | |
tree | 68ee6acef9dfadc11fe8bd4d94f52d020cd8b7a1 /lib | |
parent | 03eee956313fe6172f719669a1bd3d5739e023ba (diff) | |
download | koffice-04a12485219f38e113932e8aa20b6bc12d8fa715.tar.gz koffice-04a12485219f38e113932e8aa20b6bc12d8fa715.zip |
Adjusted to latest TQVariant::TQVariant(bool) function.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/koproperty/editors/booledit.cpp | 4 | ||||
-rw-r--r-- | lib/koproperty/test/test.cpp | 2 | ||||
-rw-r--r-- | lib/kross/api/eventsignal.cpp | 2 | ||||
-rw-r--r-- | lib/kross/api/eventslot.cpp | 2 | ||||
-rw-r--r-- | lib/kross/api/qtobject.cpp | 2 | ||||
-rw-r--r-- | lib/kross/main/manager.cpp | 2 | ||||
-rw-r--r-- | lib/kross/python/pythonextension.cpp | 2 | ||||
-rw-r--r-- | lib/kross/python/pythonscript.cpp | 4 | ||||
-rw-r--r-- | lib/kross/ruby/rubymodule.cpp | 2 |
9 files changed, 11 insertions, 11 deletions
diff --git a/lib/koproperty/editors/booledit.cpp b/lib/koproperty/editors/booledit.cpp index e34ee5d5..fbeb58d5 100644 --- a/lib/koproperty/editors/booledit.cpp +++ b/lib/koproperty/editors/booledit.cpp @@ -60,7 +60,7 @@ BoolEdit::~BoolEdit() TQVariant BoolEdit::value() const { - return TQVariant(m_toggle->isOn(), 4); + return TQVariant(m_toggle->isOn()); } void @@ -173,7 +173,7 @@ ThreeStateBoolEdit::value() const // list items: true, false, NULL const int idx = m_edit->currentItem(); if (idx==0) - return TQVariant(true, 1); + return TQVariant(true); else return idx==1 ? TQVariant(false) : TQVariant(); } diff --git a/lib/koproperty/test/test.cpp b/lib/koproperty/test/test.cpp index 59fee246..23bb80f7 100644 --- a/lib/koproperty/test/test.cpp +++ b/lib/koproperty/test/test.cpp @@ -62,7 +62,7 @@ Test::Test() m_set->addProperty(new Property("Int", 2, "Int"), group); m_set->addProperty(new Property("Double", 3.1415,"Double"), group); - m_set->addProperty(new Property("Bool", TQVariant(true, 4), "Bool"), group); + m_set->addProperty(new Property("Bool", TQVariant(true), "Bool"), group); m_set->addProperty(p = new Property("3 States", TQVariant(), "3 States", "", Boolean), group); p->setOption("3rdState", "None"); m_set->addProperty(p = new Property("Date", TQDate::currentDate(),"Date"), group); diff --git a/lib/kross/api/eventsignal.cpp b/lib/kross/api/eventsignal.cpp index c462f6cd..9e07eed1 100644 --- a/lib/kross/api/eventsignal.cpp +++ b/lib/kross/api/eventsignal.cpp @@ -62,5 +62,5 @@ Object::Ptr EventSignal::call(const TQString& /*name*/, TDESharedPtr<List> argum m_sender->tqt_emit(signalid, uo); // emit the signal delete [] uo; - return new Variant( TQVariant(true,0) ); + return new Variant( TQVariant(true) ); } diff --git a/lib/kross/api/eventslot.cpp b/lib/kross/api/eventslot.cpp index bae29872..cffe5ae8 100644 --- a/lib/kross/api/eventslot.cpp +++ b/lib/kross/api/eventslot.cpp @@ -62,7 +62,7 @@ Object::Ptr EventSlot::call(const TQString& /*name*/, List::Ptr arguments) m_receiver->tqt_invoke(slotid, uo); // invoke the slot delete [] uo; - return new Variant( TQVariant(true,0) ); + return new Variant( TQVariant(true) ); } /* diff --git a/lib/kross/api/qtobject.cpp b/lib/kross/api/qtobject.cpp index 1e34c715..631c9943 100644 --- a/lib/kross/api/qtobject.cpp +++ b/lib/kross/api/qtobject.cpp @@ -181,7 +181,7 @@ Kross::Api::Object::Ptr QtObject::callSlot(Kross::Api::List::Ptr args) m_object->tqt_invoke(slotid, uo); delete [] uo; - return new Variant( TQVariant(true,0) ); + return new Variant( TQVariant(true) ); } Kross::Api::Object::Ptr QtObject::signalNames(Kross::Api::List::Ptr) diff --git a/lib/kross/main/manager.cpp b/lib/kross/main/manager.cpp index 4ee5490d..75365b5a 100644 --- a/lib/kross/main/manager.cpp +++ b/lib/kross/main/manager.cpp @@ -84,7 +84,7 @@ Manager::Manager() if(! pythonlib.isEmpty()) { // If the Kross Python plugin exists we offer it as supported scripting language. InterpreterInfo::Option::Map pythonoptions; pythonoptions.replace("restricted", - new InterpreterInfo::Option("Restricted", "Restricted Python interpreter", TQVariant(false,0)) + new InterpreterInfo::Option("Restricted", "Restricted Python interpreter", TQVariant(false)) ); d->interpreterinfos.replace("python", new InterpreterInfo("python", diff --git a/lib/kross/python/pythonextension.cpp b/lib/kross/python/pythonextension.cpp index dbbe9bf6..efa13bd7 100644 --- a/lib/kross/python/pythonextension.cpp +++ b/lib/kross/python/pythonextension.cpp @@ -196,7 +196,7 @@ Kross::Api::Object::Ptr PythonExtension::toObject(const Py::Object& object) if(type == &PyInt_Type) return new Kross::Api::Variant(int(Py::Int(object))); if(type == &PyBool_Type) - return new Kross::Api::Variant(TQVariant(object.isTrue(),0)); + return new Kross::Api::Variant(TQVariant(object.isTrue())); if(type == &PyLong_Type) return new Kross::Api::Variant(TQ_LLONG(long(Py::Long(object)))); if(type == &PyFloat_Type) diff --git a/lib/kross/python/pythonscript.cpp b/lib/kross/python/pythonscript.cpp index 5c2dec8b..d7835d52 100644 --- a/lib/kross/python/pythonscript.cpp +++ b/lib/kross/python/pythonscript.cpp @@ -107,7 +107,7 @@ void PythonScript::initialize() // simply access the ScriptContainer itself from within // python scripting code. Py::Dict moduledict = d->m_module->getDict(); - moduledict["self"] = PythonExtension::toPyObject( m_scriptcontainer ); + moduledict["self"] = PythonExtension::toPyObject( (Kross::Api::Object::Ptr)m_scriptcontainer ); //moduledict["parent"] = PythonExtension::toPyObject( m_manager ); /* @@ -129,7 +129,7 @@ void PythonScript::initialize() // Compile the python script code. It will be later on request // executed. That way we cache the compiled code. PyObject* code = 0; - bool restricted = m_scriptcontainer->getOption("restricted", TQVariant(false,0), true).toBool(); + bool restricted = m_scriptcontainer->getOption("restricted", TQVariant(false), true).toBool(); krossdebug( TQString("PythonScript::initialize() name=%1 restricted=%2").arg(m_scriptcontainer->getName()).arg(restricted) ); if(restricted) { diff --git a/lib/kross/ruby/rubymodule.cpp b/lib/kross/ruby/rubymodule.cpp index 948a10ee..3f6735d5 100644 --- a/lib/kross/ruby/rubymodule.cpp +++ b/lib/kross/ruby/rubymodule.cpp @@ -40,7 +40,7 @@ RubyModule::RubyModule(Kross::Api::Module::Ptr mod, TQString modname) : d(new Ru krossdebug(TQString("Module: %1").arg(modname)); VALUE rmodule = rb_define_module(modname.ascii()); rb_define_module_function(rmodule,"method_missing", (VALUE (*)(...))RubyModule::method_missing, -1); - VALUE rm = RubyExtension::toVALUE( mod.data() ); + VALUE rm = RubyExtension::toVALUE( (Kross::Api::Object::Ptr)mod.data() ); rb_define_const(rmodule, "MODULEOBJ", rm); } |