Rename KShared

pull/1/head
Timothy Pearson 12 years ago
parent 4b98ad659d
commit 03ae68d419

@ -2438,7 +2438,7 @@ sub preParseClass
$className eq 'KBookmarkNotifier' ||
$className eq 'KOCRDialogFactory' ||
$className eq 'KExtendedBookmarkOwner' ||
$className eq 'KSharedPixmap' ||
$className eq 'TDESharedPixmap' ||
$className eq 'TDESocket' ||
$className eq 'KLibrary' ||
$className eq 'KScanDialogFactory' ||
@ -2619,7 +2619,7 @@ sub preParseClass
|| ($name eq 'hack_strstr') ) )
|| ($name eq 'virtual_hook')
|| ($name =~ /_KShared_/)
|| ($name =~ /_TDEShared_/)
|| ($name eq 'qObject')
|| ($name =~ /argv/)
|| ($name =~ /argc/)

@ -745,7 +745,7 @@ sub preParseClass
$className eq 'KBookmarkNotifier' ||
$className eq 'KOCRDialogFactory' ||
$className eq 'KExtendedBookmarkOwner' ||
$className eq 'KSharedPixmap' ||
$className eq 'TDESharedPixmap' ||
$className eq 'TDESocket' ||
$className eq 'KLibrary' ||
$className eq 'KScanDialogFactory' ||
@ -893,7 +893,7 @@ sub preParseClass
|| ($classNode->{astNodeName} eq 'KTabWidget' and $name eq 'hoverCloseButton')
|| ($classNode->{astNodeName} eq 'TQUriDrag' and $name =~ /^decode$|decodeLocalFiles|decodeToUnicodeUris/)
|| ($name eq 'virtual_hook')
|| ($name =~ /_KShared_/)
|| ($name =~ /_TDEShared_/)
|| ($name eq 'qObject')
|| ($name =~ /argv/)
|| ($name =~ /argc/)

@ -765,7 +765,7 @@ sub preParseClass
$className eq 'KBookmarkNotifier' ||
$className eq 'KOCRDialogFactory' ||
$className eq 'KExtendedBookmarkOwner' ||
$className eq 'KSharedPixmap' ||
$className eq 'TDESharedPixmap' ||
$className eq 'TDESocket' ||
$className eq 'KLibrary' ||
$className eq 'KScanDialogFactory' ||
@ -940,7 +940,7 @@ sub preParseClass
|| ($classNode->{astNodeName} =~ /^TQUrl/ and $name eq 'operator==')
|| ($classNode->{astNodeName} eq 'TQUriDrag' and $name =~ /^decode$|decodeLocalFiles|decodeToUnicodeUris/)
|| ($name eq 'virtual_hook')
|| ($name =~ /_KShared_/)
|| ($name =~ /_TDEShared_/)
|| ($name eq 'qObject')
|| ($name =~ /argv/)
|| ($name =~ /argc/)

@ -398,7 +398,7 @@ sub preParseClass
$className eq 'KBookmarkNotifier' ||
$className eq 'KOCRDialogFactory' ||
$className eq 'KExtendedBookmarkOwner' ||
$className eq 'KSharedPixmap' ||
$className eq 'TDESharedPixmap' ||
$className eq 'KLibrary' ||
$className eq 'KScanDialogFactory' ||
$className eq 'TDEBufferedIO' ||

@ -1127,10 +1127,10 @@ BEGIN
'KServiceType*' => 'kde_KServiceType*',
'KServiceTypeProfile*' => 'kde_KServiceTypeProfile*' ,
'KSessionManaged*' => 'kde_KSessionManaged*',
'KShared&' => 'kde_KShared*' ,
'KShared*' => 'kde_KShared*',
'KSharedPtr&' => 'kde_KSharedPtr*' ,
'KSharedPtr*' => 'kde_KSharedPtr*',
'TDEShared&' => 'kde_TDEShared*' ,
'TDEShared*' => 'kde_TDEShared*',
'TDESharedPtr&' => 'kde_TDESharedPtr*' ,
'TDESharedPtr*' => 'kde_TDESharedPtr*',
'KShellCompletion*' => 'kde_KShellCompletion*',
'KShellProcess*' => 'kde_KShellProcess*',
'KShortcuts&' => 'kde_KShortcuts*',

File diff suppressed because one or more lines are too long

@ -266,7 +266,7 @@ KDESupport::arrayWithOfferList(JNIEnv * env, KTrader::OfferList * offerList)
// Increment the reference count to prevent C++ garbage collection.
// The contents of the offerList should be deref'd when it's finalized,
// so ArrayList should really be sub-classed, and finalize() overriden.
ptr->_KShared_ref();
ptr->_TDEShared_ref();
KService * currentOffer = ptr;
if (! env->CallBooleanMethod( objectArray,

@ -3,30 +3,30 @@
#include <qtjava/QtSupport.h>
#include <kdejava/KDESupport.h>
#include <kdejava/KShared.h>
#include <kdejava/TDEShared.h>
class KSharedJBridge : public KShared
class TDESharedJBridge : public TDEShared
{
public:
KSharedJBridge() : KShared() {};
KSharedJBridge(const KShared& arg1) : KShared(arg1) {};
TDESharedJBridge() : TDEShared() {};
TDESharedJBridge(const TDEShared& arg1) : TDEShared(arg1) {};
};
JNIEXPORT void JNICALL
Java_org_kde_koala_KShared_newKShared__(JNIEnv* env, jobject obj)
Java_org_kde_koala_TDEShared_newTDEShared__(JNIEnv* env, jobject obj)
{
if (QtSupport::getQt(env, obj) == 0) {
QtSupport::setQt(env, obj, new KSharedJBridge());
QtSupport::setQt(env, obj, new TDESharedJBridge());
QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
}
return;
}
JNIEXPORT void JNICALL
Java_org_kde_koala_KShared_newKShared__Lorg_kde_koala_KShared_2(JNIEnv* env, jobject obj, jobject arg1)
Java_org_kde_koala_TDEShared_newTDEShared__Lorg_kde_koala_TDEShared_2(JNIEnv* env, jobject obj, jobject arg1)
{
if (QtSupport::getQt(env, obj) == 0) {
QtSupport::setQt(env, obj, new KSharedJBridge((const KShared&)*(const KShared*) QtSupport::getQt(env, arg1)));
QtSupport::setQt(env, obj, new TDESharedJBridge((const TDEShared&)*(const TDEShared*) QtSupport::getQt(env, arg1)));
QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
}
return;

@ -1,7 +1,7 @@
/* DO NOT EDIT THIS FILE - it is machine generated */
#ifndef __org_kde_koala_KShared__
#define __org_kde_koala_KShared__
#ifndef __org_kde_koala_TDEShared__
#define __org_kde_koala_TDEShared__
#include <jni.h>
@ -10,11 +10,11 @@ extern "C"
{
#endif
extern JNIEXPORT void JNICALL Java_org_kde_koala_KShared_newKShared__ (JNIEnv *env, jobject);
extern JNIEXPORT void JNICALL Java_org_kde_koala_KShared_newKShared__Lorg_kde_koala_KShared_2 (JNIEnv *env, jobject, jobject);
extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEShared_newTDEShared__ (JNIEnv *env, jobject);
extern JNIEXPORT void JNICALL Java_org_kde_koala_TDEShared_newTDEShared__Lorg_kde_koala_TDEShared_2 (JNIEnv *env, jobject, jobject);
#ifdef __cplusplus
}
#endif
#endif /* __org_kde_koala_KShared__ */
#endif /* __org_kde_koala_TDEShared__ */

@ -4,5 +4,5 @@
#include <qtjava/QtSupport.h>
#include <kdejava/KDESupport.h>
#include <kdejava/KSharedConfig.h>
#include <kdejava/TDESharedConfig.h>

@ -1,7 +1,7 @@
/* DO NOT EDIT THIS FILE - it is machine generated */
#ifndef __org_kde_koala_KSharedConfig__
#define __org_kde_koala_KSharedConfig__
#ifndef __org_kde_koala_TDESharedConfig__
#define __org_kde_koala_TDESharedConfig__
#include <jni.h>
@ -15,4 +15,4 @@ extern "C"
}
#endif
#endif /* __org_kde_koala_KSharedConfig__ */
#endif /* __org_kde_koala_TDESharedConfig__ */

File diff suppressed because one or more lines are too long

@ -941,7 +941,7 @@ Java_org_kde_koala_TDEApplication_setTopWidget(JNIEnv* env, jobject obj, jobject
JNIEXPORT jobject JNICALL
Java_org_kde_koala_TDEApplication_sharedConfig(JNIEnv* env, jobject obj)
{
jobject xret = QtSupport::objectForQtKey(env, (void*)((TDEInstance*)(TDEApplication*) QtSupport::getQt(env, obj))->sharedConfig(), "org.kde.koala.KSharedConfig");
jobject xret = QtSupport::objectForQtKey(env, (void*)((TDEInstance*)(TDEApplication*) QtSupport::getQt(env, obj))->sharedConfig(), "org.kde.koala.TDESharedConfig");
return xret;
}

@ -131,7 +131,7 @@ JNIEXPORT jobject JNICALL
Java_org_kde_koala_TDEGlobal_sharedConfig(JNIEnv* env, jclass cls)
{
(void) cls;
jobject xret = QtSupport::objectForQtKey(env, (void*)TDEGlobalJBridge::sharedConfig(), "org.kde.koala.KSharedConfig");
jobject xret = QtSupport::objectForQtKey(env, (void*)TDEGlobalJBridge::sharedConfig(), "org.kde.koala.TDESharedConfig");
return xret;
}

@ -135,7 +135,7 @@ static TQString* _qstring_name = 0;
JNIEXPORT jobject JNICALL
Java_org_kde_koala_TDEInstance_sharedConfig(JNIEnv* env, jobject obj)
{
jobject xret = QtSupport::objectForQtKey(env, (void*)((TDEInstance*) QtSupport::getQt(env, obj))->sharedConfig(), "org.kde.koala.KSharedConfig");
jobject xret = QtSupport::objectForQtKey(env, (void*)((TDEInstance*) QtSupport::getQt(env, obj))->sharedConfig(), "org.kde.koala.TDESharedConfig");
return xret;
}

@ -14,7 +14,7 @@ import java.util.ArrayList;
@short The KMountPoint class provides information about mounted and unmounted disks.
*/
public class KMountPoint extends KShared {
public class KMountPoint extends TDEShared {
protected KMountPoint(Class dummy){super((Class) null);}
public static final int NeedMountOptions = 1;
public static final int NeedRealDeviceName = 2;

@ -186,7 +186,7 @@ public class KPanelApplet extends TQFrame {
@short Always use this TDEConfig object to save/load your applet's configuration.
*/
public native TDEConfig config();
// KSharedConfig::Ptr sharedConfig(); >>>> NOT CONVERTED
// TDESharedConfig::Ptr sharedConfig(); >>>> NOT CONVERTED
/**
@return Type indicating the applet's type.
Type

@ -23,7 +23,7 @@ import org.kde.qt.TQObject;
Instead of using the default behavior, you can ask KRootPixmap
to emit a backgroundUpdated(TQPixmap) signal whenever
the background needs updating by using setCustomPainting(boolean).
Alternatively by reimplementing updateBackground(KSharedPixmap)
Alternatively by reimplementing updateBackground(TDESharedPixmap)
you can take complete control of the behavior.
See {@link KRootPixmapSignals} for signals emitted by KRootPixmap
@author Geert Jansen <jansen@kde.org>
@ -150,9 +150,9 @@ public class KRootPixmap extends TQObject {
*/
public native void setCustomPainting(boolean enable);
/**
Asks KDesktop to export the desktop background as a KSharedPixmap.
Asks KDesktop to export the desktop background as a TDESharedPixmap.
This method uses DCOP to call KBackgroundIface/setExport(int).
@short Asks KDesktop to export the desktop background as a KSharedPixmap.
@short Asks KDesktop to export the desktop background as a TDESharedPixmap.
*/
public native void enableExports();
/**
@ -172,7 +172,7 @@ public class KRootPixmap extends TQObject {
backgroundUpdated(TQPixmap) depending on the painting mode.
@short Called when the pixmap has been updated.
*/
// void updateBackground(KSharedPixmap* arg1); >>>> NOT CONVERTED
// void updateBackground(TDESharedPixmap* arg1); >>>> NOT CONVERTED
/** Deletes the wrapped C++ instance */
protected native void finalize() throws InternalError;
/** Delete the wrapped C++ instance ahead of finalize() */

@ -8,41 +8,41 @@ import org.kde.qt.QtSupport;
Reference counting for shared objects. If you derive your object
from this class, then you may use it in conjunction with
KSharedPtr to control the lifetime of your object.
Specifically, all classes that derive from KShared have an internal
TDESharedPtr to control the lifetime of your object.
Specifically, all classes that derive from TDEShared have an internal
counter keeping track of how many other objects have a reference to
their object. If used with KSharedPtr, then your object will
their object. If used with TDESharedPtr, then your object will
not be deleted until all references to the object have been
released.
You should probably not ever use any of the methods in this class
directly -- let the KSharedPtr take care of that. Just derive
your class from KShared and forget about it.
directly -- let the TDESharedPtr take care of that. Just derive
your class from TDEShared and forget about it.
@author Waldo Bastian <bastian@kde.org>
@short Reference counting for shared objects.
*/
public class KShared implements QtSupport {
public class TDEShared implements QtSupport {
private long _qt;
private boolean _allocatedInJavaWorld = true;
protected KShared(Class dummy){}
protected TDEShared(Class dummy){}
/**
Standard constructor. This will initialize the reference count
on this object to 0.
@short Standard constructor.
*/
public KShared() {
newKShared();
public TDEShared() {
newTDEShared();
}
private native void newKShared();
private native void newTDEShared();
/**
Copy constructor. This will <b>not</b> actually copy the objects
but it will initialize the reference count on this object to 0.
@short Copy constructor.
*/
public KShared(KShared arg1) {
newKShared(arg1);
public TDEShared(TDEShared arg1) {
newTDEShared(arg1);
}
private native void newKShared(KShared arg1);
private native void newTDEShared(TDEShared arg1);
}

@ -7,13 +7,13 @@ import org.kde.qt.QtSupport;
/**
TDEConfig variant using shared memory
KSharedConfig provides a reference counted, shared memory variant
TDESharedConfig provides a reference counted, shared memory variant
of TDEConfig.
@short TDEConfig variant using shared memory
*/
public class KSharedConfig extends TDEConfig {
protected KSharedConfig(Class dummy){super((Class) null);}
public class TDESharedConfig extends TDEConfig {
protected TDESharedConfig(Class dummy){super((Class) null);}
/**
Returns a ref-counted pointer to a shared read-write config object.
@param fileName the name of the file to use for the configuration
@ -21,7 +21,7 @@ public class KSharedConfig extends TDEConfig {
@param bUseKDEGlobals Toggle reading the global KDE configuration file.
@short Returns a ref-counted pointer to a shared read-write config object.
*/
// KSharedConfig::Ptr openConfig(const TQString& arg1,bool arg2,bool arg3); >>>> NOT CONVERTED
// KSharedConfig::Ptr openConfig(const TQString& arg1,bool arg2); >>>> NOT CONVERTED
// KSharedConfig::Ptr openConfig(const TQString& arg1); >>>> NOT CONVERTED
// TDESharedConfig::Ptr openConfig(const TQString& arg1,bool arg2,bool arg3); >>>> NOT CONVERTED
// TDESharedConfig::Ptr openConfig(const TQString& arg1,bool arg2); >>>> NOT CONVERTED
// TDESharedConfig::Ptr openConfig(const TQString& arg1); >>>> NOT CONVERTED
}

@ -14,7 +14,7 @@ import org.kde.qt.TQDataStream;
@see #http://developer#kde#org/documentation/library/kdeqt/trinityarch/tdesycoca#html
*/
public class KSycocaEntry extends KShared {
public class KSycocaEntry extends TDEShared {
protected KSycocaEntry(Class dummy){super((Class) null);}
public native boolean isType(int t);
public native int sycocaType();

File diff suppressed because one or more lines are too long

@ -1036,7 +1036,7 @@ public class TDEApplication extends TQApplication implements TDEInstanceInterfac
@short Returns the general config object ("appnamerc").
*/
public native KSharedConfig sharedConfig();
public native TDESharedConfig sharedConfig();
/**
Returns an iconloader object.
@return the iconloader object.

@ -99,7 +99,7 @@ public class TDECModuleInfo implements QtSupport {
*/
public native String moduleName();
/**
@return a KSharedPtr to KService created from the modules .desktop file
@return a TDESharedPtr to KService created from the modules .desktop file
@short
*/

@ -20,7 +20,7 @@ import org.kde.qt.TQObject;
abstract base class, meaning that you cannot directly instantiate
objects of this class. Either use TDEConfig (for usual %KDE
configuration) or KSimpleConfig (for special needs as in ksamba), or
even KSharedConfig (stores values in shared memory).
even TDESharedConfig (stores values in shared memory).
All configuration entries are key, value pairs. Each entry also
belongs to a specific group of related entries. All configuration
entries that do not explicitly specify which group they are in are
@ -37,7 +37,7 @@ import org.kde.qt.TQObject;
@see TDEGlobal#config
@see TDEConfig
@see KSimpleConfig
@see KSharedConfig
@see TDESharedConfig
*/
public class TDEConfigBase extends TQObject {

@ -54,7 +54,7 @@ public class TDEGlobal implements QtSupport {
@short Returns the general config object.
*/
public static native KSharedConfig sharedConfig();
public static native TDESharedConfig sharedConfig();
/**
Returns an iconloader object.
@return the global iconloader object

@ -68,7 +68,7 @@ public class TDEInstance implements QtSupport, TDEInstanceInterface {
@short Returns the general config object ("appnamerc").
*/
public native KSharedConfig sharedConfig();
public native TDESharedConfig sharedConfig();
/**
Returns an iconloader object.
@return the iconloader object.

@ -6,7 +6,7 @@ import org.kde.qt.QtSupport;
public interface TDEInstanceInterface {
KStandardDirs dirs();
TDEConfig config();
KSharedConfig sharedConfig();
TDESharedConfig sharedConfig();
KIconLoader iconLoader();
void newIconLoader();
TDEAboutData aboutData();

@ -530,7 +530,7 @@ CCMAIL: kde-bindings@kde.org
2004-07-02 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
* Translated some pytde example programs from python to ruby
* Added various marshallers for the KSharedPtr related methods/classes
* Added various marshallers for the TDESharedPtr related methods/classes
2004-07-02 Richard Dale <Richard_Dale@tipitina.demon.co.uk>

@ -3,7 +3,7 @@ This is a ruby version of Jim Bublitz's pytde program, translated by Richard Dal
=end
=begin
This program tests/demos some of the KSharedPtr related classes and
This program tests/demos some of the TDESharedPtr related classes and
methods (KMimeType, KService, etc). It generally tests the *::List
methods for these classes (eg KService::List) since that also tests
the *::Ptr mapped type code (eg KService::Ptr) at the same time.
@ -270,7 +270,7 @@ end
#-------------------- main ------------------------------------------------
description = "Test/demo KSharedPtr related methods/classes"
description = "Test/demo TDESharedPtr related methods/classes"
version = "1.0"
aboutData = KDE::AboutData.new("mimetype", "MimeType",
version, description, KDE::AboutData.License_GPL,

@ -247,7 +247,7 @@ def UIMisc.miscKPixmapIO(parent)
parent.currentPageObj = PageNotImpl.new(parent)
end
def UIMisc.miscKSharedPixmap(parent)
def UIMisc.miscTDESharedPixmap(parent)
parent.currentPageObj = PageNotImpl.new(parent)
end

@ -399,7 +399,7 @@ void marshall_KServicePtr(Marshall *m) {
break;
case Marshall::ToVALUE:
{
KSharedPtr<KService> *ptr = new KSharedPtr<KService>(*(KSharedPtr<KService>*)m->item().s_voidp);
TDESharedPtr<KService> *ptr = new TDESharedPtr<KService>(*(TDESharedPtr<KService>*)m->item().s_voidp);
if(ptr == 0) {
*(m->var()) = Qnil;
break;
@ -447,7 +447,7 @@ void marshall_KServiceList(Marshall *m) {
for(KService::List::Iterator it = offerList->begin();
it != offerList->end();
++it) {
KSharedPtr<KService> *ptr = new KSharedPtr<KService>(*it);
TDESharedPtr<KService> *ptr = new TDESharedPtr<KService>(*it);
KService * currentOffer = ptr->data();
VALUE obj = getPointerObject(currentOffer);
@ -789,7 +789,7 @@ void marshall_KTraderOfferList(Marshall *m) {
for(KTrader::OfferList::Iterator it = offerList->begin();
it != offerList->end();
++it) {
KSharedPtr<KService> *ptr = new KSharedPtr<KService>(*it);
TDESharedPtr<KService> *ptr = new TDESharedPtr<KService>(*it);
KService * currentOffer = ptr->data();
VALUE obj = getPointerObject(currentOffer);

@ -4317,15 +4317,15 @@
</class>
<class>
<package>org.kde.koala</package>
<name>KShared</name>
<name>TDEShared</name>
</class>
<class>
<package>org.kde.koala</package>
<name>KSharedPixmap</name>
<name>TDESharedPixmap</name>
</class>
<class>
<package>org.kde.koala</package>
<name>KSharedPixmapSignals</name>
<name>TDESharedPixmapSignals</name>
</class>
<class>
<package>org.kde.koala</package>

Loading…
Cancel
Save