summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/kofficecore/KoFilterChain.h4
-rw-r--r--lib/kofficecore/KoMainWindow.cpp2
-rw-r--r--lib/kofficecore/KoQueryTrader.h4
-rw-r--r--lib/kofficecore/KoSpeaker.h2
-rw-r--r--lib/kross/api/callable.h2
-rw-r--r--lib/kross/api/class.h2
-rw-r--r--lib/kross/api/eventaction.h4
-rw-r--r--lib/kross/api/eventscript.cpp2
-rw-r--r--lib/kross/api/eventscript.h4
-rw-r--r--lib/kross/api/eventsignal.cpp2
-rw-r--r--lib/kross/api/eventsignal.h4
-rw-r--r--lib/kross/api/eventslot.h4
-rw-r--r--lib/kross/api/exception.h2
-rw-r--r--lib/kross/api/list.h2
-rw-r--r--lib/kross/api/module.h2
-rw-r--r--lib/kross/api/object.cpp8
-rw-r--r--lib/kross/api/object.h8
-rw-r--r--lib/kross/api/proxy.h20
-rw-r--r--lib/kross/api/qtobject.h2
-rw-r--r--lib/kross/api/value.h2
-rw-r--r--lib/kross/main/mainmodule.h2
-rw-r--r--lib/kross/main/manager.cpp4
-rw-r--r--lib/kross/main/manager.h2
-rw-r--r--lib/kross/main/scriptaction.h2
-rw-r--r--lib/kross/main/scriptcontainer.h6
-rw-r--r--lib/kross/ruby/rubyextension.cpp4
26 files changed, 51 insertions, 51 deletions
diff --git a/lib/kofficecore/KoFilterChain.h b/lib/kofficecore/KoFilterChain.h
index a044eebe..a1f3d239 100644
--- a/lib/kofficecore/KoFilterChain.h
+++ b/lib/kofficecore/KoFilterChain.h
@@ -47,7 +47,7 @@ namespace KOffice {
* @author Werner Trobin <trobin@kde.org>
* @todo the class has no constructor and therefore cannot initialize its private class
*/
-class KOFFICECORE_EXPORT KoFilterChain : public KShared
+class KOFFICECORE_EXPORT KoFilterChain : public TDEShared
{
// Only KOffice::Graph is allowed to construct instances and
// add chain links.
@@ -55,7 +55,7 @@ class KOFFICECORE_EXPORT KoFilterChain : public KShared
friend class KoFilterManager;
public:
- typedef KSharedPtr<KoFilterChain> Ptr;
+ typedef TDESharedPtr<KoFilterChain> Ptr;
virtual ~KoFilterChain();
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index 483ff683..12e0013d 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -180,7 +180,7 @@ public:
TQCString m_lastExportFormat;
int m_lastExportSpecialOutputFlag;
- KSharedPtr<KoSpeaker> m_koSpeaker;
+ TDESharedPtr<KoSpeaker> m_koSpeaker;
};
KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name )
diff --git a/lib/kofficecore/KoQueryTrader.h b/lib/kofficecore/KoQueryTrader.h
index 8f81e323..e7afc23a 100644
--- a/lib/kofficecore/KoQueryTrader.h
+++ b/lib/kofficecore/KoQueryTrader.h
@@ -116,11 +116,11 @@ private:
/**
* Represents an available filter.
*/
-class KoFilterEntry : public KShared
+class KoFilterEntry : public TDEShared
{
public:
- typedef KSharedPtr<KoFilterEntry> Ptr;
+ typedef TDESharedPtr<KoFilterEntry> Ptr;
KoFilterEntry() : weight( 0 ) { m_service = 0L; } // for TQValueList
KoFilterEntry( KService::Ptr service );
diff --git a/lib/kofficecore/KoSpeaker.h b/lib/kofficecore/KoSpeaker.h
index c4ab8786..7376e4ca 100644
--- a/lib/kofficecore/KoSpeaker.h
+++ b/lib/kofficecore/KoSpeaker.h
@@ -60,7 +60,7 @@ class KoSpeakerPrivate;
*
* KOffice applications can access this object using the kospeaker global.
*/
-class KOFFICECORE_EXPORT KoSpeaker : public TQObject, public KShared
+class KOFFICECORE_EXPORT KoSpeaker : public TQObject, public TDEShared
{
Q_OBJECT
diff --git a/lib/kross/api/callable.h b/lib/kross/api/callable.h
index 0e3dd3a6..99e3dadf 100644
--- a/lib/kross/api/callable.h
+++ b/lib/kross/api/callable.h
@@ -43,7 +43,7 @@ namespace Kross { namespace Api {
/**
* Shared pointer to implement reference-counting.
*/
- typedef KSharedPtr<Callable> Ptr;
+ typedef TDESharedPtr<Callable> Ptr;
/**
* Constructor.
diff --git a/lib/kross/api/class.h b/lib/kross/api/class.h
index 6224a61a..5fd7e746 100644
--- a/lib/kross/api/class.h
+++ b/lib/kross/api/class.h
@@ -48,7 +48,7 @@ namespace Kross { namespace Api {
/**
* Shared pointer to implement reference-counting.
*/
- typedef KSharedPtr<T> Ptr;
+ typedef TDESharedPtr<T> Ptr;
/**
* Constructor.
diff --git a/lib/kross/api/eventaction.h b/lib/kross/api/eventaction.h
index 659240fa..e20656df 100644
--- a/lib/kross/api/eventaction.h
+++ b/lib/kross/api/eventaction.h
@@ -45,7 +45,7 @@ namespace Kross { namespace Api {
/**
* Shared pointer to implement reference-counting.
*/
- typedef KSharedPtr<EventAction> Ptr;
+ typedef TDESharedPtr<EventAction> Ptr;
/**
* Constructor.
@@ -61,7 +61,7 @@ namespace Kross { namespace Api {
virtual const TQString getClassName() const;
/// \see Kross::Api::Event::call()
- //virtual Object::Ptr call(const TQString& name, KSharedPtr<List> arguments);
+ //virtual Object::Ptr call(const TQString& name, TDESharedPtr<List> arguments);
private:
KAction* m_action;
diff --git a/lib/kross/api/eventscript.cpp b/lib/kross/api/eventscript.cpp
index f9fe9f9a..3b730536 100644
--- a/lib/kross/api/eventscript.cpp
+++ b/lib/kross/api/eventscript.cpp
@@ -38,7 +38,7 @@ const TQString EventScript::getClassName() const
return "Kross::Api::EventScript";
}
-Object::Ptr EventScript::call(const TQString& name, KSharedPtr<List> arguments)
+Object::Ptr EventScript::call(const TQString& name, TDESharedPtr<List> arguments)
{
krossdebug( TQString("EventScript::call() name=%1 arguments=%2").arg(name).arg(arguments->toString()) );
//TODO
diff --git a/lib/kross/api/eventscript.h b/lib/kross/api/eventscript.h
index 0f62ddfc..b255874d 100644
--- a/lib/kross/api/eventscript.h
+++ b/lib/kross/api/eventscript.h
@@ -38,7 +38,7 @@ namespace Kross { namespace Api {
/**
* Shared pointer to implement reference-counting.
*/
- typedef KSharedPtr<EventScript> Ptr;
+ typedef TDESharedPtr<EventScript> Ptr;
/**
* Constructor.
@@ -52,7 +52,7 @@ namespace Kross { namespace Api {
virtual const TQString getClassName() const;
- virtual Object::Ptr call(const TQString& name, KSharedPtr<List> arguments);
+ virtual Object::Ptr call(const TQString& name, TDESharedPtr<List> arguments);
private:
//ScriptContainer* m_scriptcontainer;
diff --git a/lib/kross/api/eventsignal.cpp b/lib/kross/api/eventsignal.cpp
index 2a711a0b..c462f6cd 100644
--- a/lib/kross/api/eventsignal.cpp
+++ b/lib/kross/api/eventsignal.cpp
@@ -43,7 +43,7 @@ const TQString EventSignal::getClassName() const
return "Kross::Api::EventSignal";
}
-Object::Ptr EventSignal::call(const TQString& /*name*/, KSharedPtr<List> arguments)
+Object::Ptr EventSignal::call(const TQString& /*name*/, TDESharedPtr<List> arguments)
{
#ifdef KROSS_API_EVENTSIGNAL_CALL_DEBUG
krossdebug( TQString("EventSignal::call() m_signal=%1 arguments=%2").arg(m_signal).arg(arguments->toString()) );
diff --git a/lib/kross/api/eventsignal.h b/lib/kross/api/eventsignal.h
index 6117014e..ec360b7d 100644
--- a/lib/kross/api/eventsignal.h
+++ b/lib/kross/api/eventsignal.h
@@ -45,7 +45,7 @@ namespace Kross { namespace Api {
/**
* Shared pointer to implement reference-counting.
*/
- typedef KSharedPtr<EventSignal> Ptr;
+ typedef TDESharedPtr<EventSignal> Ptr;
/**
* Constructor.
@@ -59,7 +59,7 @@ namespace Kross { namespace Api {
virtual const TQString getClassName() const;
- virtual Object::Ptr call(const TQString& name, KSharedPtr<List> arguments);
+ virtual Object::Ptr call(const TQString& name, TDESharedPtr<List> arguments);
/*
signals:
diff --git a/lib/kross/api/eventslot.h b/lib/kross/api/eventslot.h
index aaf1ebba..7bc66327 100644
--- a/lib/kross/api/eventslot.h
+++ b/lib/kross/api/eventslot.h
@@ -40,7 +40,7 @@ namespace Kross { namespace Api {
/**
* Shared pointer to implement reference-counting.
*/
- typedef KSharedPtr<EventSlot> Ptr;
+ typedef TDESharedPtr<EventSlot> Ptr;
/**
* Constructor.
@@ -63,7 +63,7 @@ namespace Kross { namespace Api {
virtual const TQString getClassName() const;
/// \see Kross::Api::Event::call()
- virtual Object::Ptr call(const TQString& name, KSharedPtr<List> arguments);
+ virtual Object::Ptr call(const TQString& name, TDESharedPtr<List> arguments);
/*
private:
diff --git a/lib/kross/api/exception.h b/lib/kross/api/exception.h
index b0699bfb..f58496d7 100644
--- a/lib/kross/api/exception.h
+++ b/lib/kross/api/exception.h
@@ -42,7 +42,7 @@ namespace Kross { namespace Api {
/**
* Shared pointer to implement reference-counting.
*/
- typedef KSharedPtr<Exception> Ptr;
+ typedef TDESharedPtr<Exception> Ptr;
/**
* Constructor.
diff --git a/lib/kross/api/list.h b/lib/kross/api/list.h
index 2620c688..77ea7ea1 100644
--- a/lib/kross/api/list.h
+++ b/lib/kross/api/list.h
@@ -41,7 +41,7 @@ namespace Kross { namespace Api {
/**
* Shared pointer to implement reference-counting.
*/
- typedef KSharedPtr<List> Ptr;
+ typedef TDESharedPtr<List> Ptr;
/*
operator TQStringList () {
diff --git a/lib/kross/api/module.h b/lib/kross/api/module.h
index f27bdf5c..25d35274 100644
--- a/lib/kross/api/module.h
+++ b/lib/kross/api/module.h
@@ -38,7 +38,7 @@ namespace Kross { namespace Api {
/**
* Shared pointer to implement reference-counting.
*/
- typedef KSharedPtr<Module> Ptr;
+ typedef TDESharedPtr<Module> Ptr;
/**
* Constructor.
diff --git a/lib/kross/api/object.cpp b/lib/kross/api/object.cpp
index 43fa8b4b..a9599f6d 100644
--- a/lib/kross/api/object.cpp
+++ b/lib/kross/api/object.cpp
@@ -27,19 +27,19 @@
using namespace Kross::Api;
Object::Object()
- : KShared()
+ : TDEShared()
{
#ifdef KROSS_API_OBJECT_CTOR_DEBUG
- krossdebug( TQString("Kross::Api::Object::Constructor() name='%1' refcount='%2'").arg(m_name).arg(_KShared_count()) );
+ krossdebug( TQString("Kross::Api::Object::Constructor() name='%1' refcount='%2'").arg(m_name).arg(_TDEShared_count()) );
#endif
}
Object::~Object()
{
#ifdef KROSS_API_OBJECT_DTOR_DEBUG
- krossdebug( TQString("Kross::Api::Object::Destructor() name='%1' refcount='%2'").arg(m_name).arg(_KShared_count()) );
+ krossdebug( TQString("Kross::Api::Object::Destructor() name='%1' refcount='%2'").arg(m_name).arg(_TDEShared_count()) );
#endif
- //removeAllChildren(); // not needed cause we use KShared to handle ref-couting and freeing.
+ //removeAllChildren(); // not needed cause we use TDEShared to handle ref-couting and freeing.
}
const TQString Object::toString()
diff --git a/lib/kross/api/object.h b/lib/kross/api/object.h
index f23a6179..8a9f32af 100644
--- a/lib/kross/api/object.h
+++ b/lib/kross/api/object.h
@@ -47,14 +47,14 @@ namespace Kross { namespace Api {
* This class implementates reference counting for shared
* objects. So, no need to take care of freeing objects.
*/
- class Object : public KShared
+ class Object : public TDEShared
{
public:
/**
* Shared pointer to implement reference-counting.
*/
- typedef KSharedPtr<Object> Ptr;
+ typedef TDESharedPtr<Object> Ptr;
/**
* Constructor.
@@ -99,7 +99,7 @@ namespace Kross { namespace Api {
* \return The call-result as \a Object::Ptr instance or
* NULL if the call has no result.
*/
- virtual Object::Ptr call(const TQString& name, KSharedPtr<List> arguments);
+ virtual Object::Ptr call(const TQString& name, TDESharedPtr<List> arguments);
/**
* Return a list of supported callable objects.
@@ -142,7 +142,7 @@ template<class T> inline T* Object::fromObject(Object::Ptr object)
{
T* t = (T*) object.data();
if(! t)
- throw KSharedPtr<Exception>( new Exception(TQString("Object \"%1\" invalid.").arg(object ? object->getClassName() : "")) );
+ throw TDESharedPtr<Exception>( new Exception(TQString("Object \"%1\" invalid.").arg(object ? object->getClassName() : "")) );
return t;
}
diff --git a/lib/kross/api/proxy.h b/lib/kross/api/proxy.h
index a7d37380..1e0f3850 100644
--- a/lib/kross/api/proxy.h
+++ b/lib/kross/api/proxy.h
@@ -111,13 +111,13 @@ namespace Kross { namespace Api {
const METHOD m_method;
/// First default argument.
- KSharedPtr<ARG1OBJ> m_defarg1;
+ TDESharedPtr<ARG1OBJ> m_defarg1;
/// Second default argument.
- KSharedPtr<ARG2OBJ> m_defarg2;
+ TDESharedPtr<ARG2OBJ> m_defarg2;
/// Theird default argument.
- KSharedPtr<ARG3OBJ> m_defarg3;
+ TDESharedPtr<ARG3OBJ> m_defarg3;
/// Forth default argument.
- KSharedPtr<ARG4OBJ> m_defarg4;
+ TDESharedPtr<ARG4OBJ> m_defarg4;
/**
* \internal used struct that does the execution of the wrapped
@@ -187,9 +187,9 @@ namespace Kross { namespace Api {
private:
INSTANCE* m_instance;
const METHOD m_method;
- KSharedPtr<ARG1OBJ> m_defarg1;
- KSharedPtr<ARG2OBJ> m_defarg2;
- KSharedPtr<ARG3OBJ> m_defarg3;
+ TDESharedPtr<ARG1OBJ> m_defarg1;
+ TDESharedPtr<ARG2OBJ> m_defarg2;
+ TDESharedPtr<ARG3OBJ> m_defarg3;
template<class PROXYFUNC, typename RETURNTYPE>
struct ProxyFunctionCaller {
@@ -229,8 +229,8 @@ namespace Kross { namespace Api {
private:
INSTANCE* m_instance;
const METHOD m_method;
- KSharedPtr<ARG1OBJ> m_defarg1;
- KSharedPtr<ARG2OBJ> m_defarg2;
+ TDESharedPtr<ARG1OBJ> m_defarg1;
+ TDESharedPtr<ARG2OBJ> m_defarg2;
template<class PROXYFUNC, typename RETURNTYPE>
struct ProxyFunctionCaller {
@@ -270,7 +270,7 @@ namespace Kross { namespace Api {
private:
INSTANCE* m_instance;
const METHOD m_method;
- KSharedPtr<ARG1OBJ> m_defarg1;
+ TDESharedPtr<ARG1OBJ> m_defarg1;
template<class PROXYFUNC, typename RETURNTYPE>
struct ProxyFunctionCaller {
diff --git a/lib/kross/api/qtobject.h b/lib/kross/api/qtobject.h
index 119a579e..22829f02 100644
--- a/lib/kross/api/qtobject.h
+++ b/lib/kross/api/qtobject.h
@@ -49,7 +49,7 @@ namespace Kross { namespace Api {
/**
* Shared pointer to implement reference-counting.
*/
- typedef KSharedPtr<QtObject> Ptr;
+ typedef TDESharedPtr<QtObject> Ptr;
/**
* Constructor.
diff --git a/lib/kross/api/value.h b/lib/kross/api/value.h
index db3854be..94a9aa0d 100644
--- a/lib/kross/api/value.h
+++ b/lib/kross/api/value.h
@@ -72,7 +72,7 @@ namespace Kross { namespace Api {
/**
* Set the value.
* The value is call-by-value cause it may
- * contain some KShared and therefore
+ * contain some TDEShared and therefore
* we need to keep a local copy to keep
* it from disappearing.
*
diff --git a/lib/kross/main/mainmodule.h b/lib/kross/main/mainmodule.h
index bc7efc45..96abd06d 100644
--- a/lib/kross/main/mainmodule.h
+++ b/lib/kross/main/mainmodule.h
@@ -55,7 +55,7 @@ namespace Kross { namespace Api {
public:
/// Shared pointer to implement reference-counting.
- typedef KSharedPtr<MainModule> Ptr;
+ typedef TDESharedPtr<MainModule> Ptr;
/**
* Constructor.
diff --git a/lib/kross/main/manager.cpp b/lib/kross/main/manager.cpp
index 156eb2ac..21ee1eca 100644
--- a/lib/kross/main/manager.cpp
+++ b/lib/kross/main/manager.cpp
@@ -60,7 +60,7 @@ namespace Kross { namespace Api {
* The Manager-singleton instance is NULL by default till the
* Manager::scriptManager() method got called first time.
*/
- static KSharedPtr<Manager> m_manager = KSharedPtr<Manager>(0);
+ static TDESharedPtr<Manager> m_manager = TDESharedPtr<Manager>(0);
}}
@@ -68,7 +68,7 @@ Manager* Manager::scriptManager()
{
if(! m_manager.data()) {
// Create the Manager-singleton on demand.
- m_manager = KSharedPtr<Manager>( new Manager() );
+ m_manager = TDESharedPtr<Manager>( new Manager() );
}
// and finally return the singleton.
diff --git a/lib/kross/main/manager.h b/lib/kross/main/manager.h
index fe815e7c..5e7c43f4 100644
--- a/lib/kross/main/manager.h
+++ b/lib/kross/main/manager.h
@@ -116,7 +116,7 @@ namespace Kross { namespace Api {
* \return The \a ScriptContainer instance matching to
* scriptname.
*/
- KSharedPtr<ScriptContainer> getScriptContainer(const TQString& scriptname);
+ TDESharedPtr<ScriptContainer> getScriptContainer(const TQString& scriptname);
/**
* Return the \a Interpreter instance defined by
diff --git a/lib/kross/main/scriptaction.h b/lib/kross/main/scriptaction.h
index e6b17c73..3d6e890b 100644
--- a/lib/kross/main/scriptaction.h
+++ b/lib/kross/main/scriptaction.h
@@ -58,7 +58,7 @@ namespace Kross { namespace Api {
public:
/// Shared pointer to implement reference-counting.
- typedef KSharedPtr<ScriptAction> Ptr;
+ typedef TDESharedPtr<ScriptAction> Ptr;
/// A list of \a ScriptAction instances.
//typedef TQValueList<ScriptAction::Ptr> List;
diff --git a/lib/kross/main/scriptcontainer.h b/lib/kross/main/scriptcontainer.h
index 5d2b38d0..e838317d 100644
--- a/lib/kross/main/scriptcontainer.h
+++ b/lib/kross/main/scriptcontainer.h
@@ -72,7 +72,7 @@ namespace Kross { namespace Api {
public:
/// Shared pointer to implement reference-counting.
- typedef KSharedPtr<ScriptContainer> Ptr;
+ typedef TDESharedPtr<ScriptContainer> Ptr;
/**
* Destructor.
@@ -171,7 +171,7 @@ namespace Kross { namespace Api {
* \return \a Object instance representing
* the functioncall returnvalue.
*/
- KSharedPtr<Object> callFunction(const TQString& functionname, KSharedPtr<List> arguments = 0);
+ TDESharedPtr<Object> callFunction(const TQString& functionname, TDESharedPtr<List> arguments = 0);
/**
* Return a list of classes.
@@ -181,7 +181,7 @@ namespace Kross { namespace Api {
/**
* Create and return a new class instance.
*/
- KSharedPtr<Object> classInstance(const TQString& classname);
+ TDESharedPtr<Object> classInstance(const TQString& classname);
/**
* Initialize the \a Script instance.
diff --git a/lib/kross/ruby/rubyextension.cpp b/lib/kross/ruby/rubyextension.cpp
index 89c73b1a..589a0b27 100644
--- a/lib/kross/ruby/rubyextension.cpp
+++ b/lib/kross/ruby/rubyextension.cpp
@@ -126,7 +126,7 @@ void RubyExtension::delete_object(void* object)
void RubyExtension::delete_exception(void* object)
{
Kross::Api::Exception* exc = static_cast<Kross::Api::Exception*>(object);
- exc->_KShared_unref();
+ exc->_TDEShared_unref();
}
@@ -186,7 +186,7 @@ VALUE RubyExtension::convertFromException(Kross::Api::Exception::Ptr exc)
{
RubyExtensionPrivate::s_krossException = rb_define_class_under(RubyInterpreter::krossModule(), "KrossException", rb_eRuntimeError);
}
- exc->_KShared_ref();
+ exc->_TDEShared_ref();
return Data_Wrap_Struct(RubyExtensionPrivate::s_krossException, 0, RubyExtension::delete_exception, exc.data() );
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 13:11:37 +0000