From 24b85b785334e8436c975a4323fcbb75d61f6e72 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:31:43 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kdejava/koala/org/kde/koala/KConfig.java | 62 ++++++++++++++++---------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'kdejava/koala/org/kde/koala/KConfig.java') diff --git a/kdejava/koala/org/kde/koala/KConfig.java b/kdejava/koala/org/kde/koala/KConfig.java index 17f3694f..9eedc94d 100644 --- a/kdejava/koala/org/kde/koala/KConfig.java +++ b/kdejava/koala/org/kde/koala/KConfig.java @@ -14,16 +14,16 @@ import java.util.ArrayList; @short KDE Configuration Management class. @see TDEGlobal#config - @see KConfigBase + @see TDEConfigBase @see KSimpleConfig */ -public class KConfig extends KConfigBase { - protected KConfig(Class dummy){super((Class) null);} +public class TDEConfig extends TDEConfigBase { + protected TDEConfig(Class dummy){super((Class) null);} public native TQMetaObject metaObject(); public native String className(); /** - Constructs a KConfig object. + Constructs a TDEConfig object. @param fileName A file to parse in addition to the system-wide file(s). If it is not provided, only global KDE configuration data will be read (depending on the value of @@ -33,43 +33,43 @@ public class KConfig extends KConfigBase { write permission to fileName or if no file was specified. @param bUseKDEGlobals Toggle reading the global KDE configuration file. @param resType the place to look in (config, data, etc) See KStandardDirs. - @short Constructs a KConfig object. + @short Constructs a TDEConfig object. */ - public KConfig(String fileName, boolean bReadOnly, boolean bUseKDEGlobals, String resType) { + public TDEConfig(String fileName, boolean bReadOnly, boolean bUseKDEGlobals, String resType) { super((Class) null); - newKConfig(fileName,bReadOnly,bUseKDEGlobals,resType); + newTDEConfig(fileName,bReadOnly,bUseKDEGlobals,resType); } - private native void newKConfig(String fileName, boolean bReadOnly, boolean bUseKDEGlobals, String resType); - public KConfig(String fileName, boolean bReadOnly, boolean bUseKDEGlobals) { + private native void newTDEConfig(String fileName, boolean bReadOnly, boolean bUseKDEGlobals, String resType); + public TDEConfig(String fileName, boolean bReadOnly, boolean bUseKDEGlobals) { super((Class) null); - newKConfig(fileName,bReadOnly,bUseKDEGlobals); + newTDEConfig(fileName,bReadOnly,bUseKDEGlobals); } - private native void newKConfig(String fileName, boolean bReadOnly, boolean bUseKDEGlobals); - public KConfig(String fileName, boolean bReadOnly) { + private native void newTDEConfig(String fileName, boolean bReadOnly, boolean bUseKDEGlobals); + public TDEConfig(String fileName, boolean bReadOnly) { super((Class) null); - newKConfig(fileName,bReadOnly); + newTDEConfig(fileName,bReadOnly); } - private native void newKConfig(String fileName, boolean bReadOnly); - public KConfig(String fileName) { + private native void newTDEConfig(String fileName, boolean bReadOnly); + public TDEConfig(String fileName) { super((Class) null); - newKConfig(fileName); + newTDEConfig(fileName); } - private native void newKConfig(String fileName); - public KConfig() { + private native void newTDEConfig(String fileName); + public TDEConfig() { super((Class) null); - newKConfig(); + newTDEConfig(); } - private native void newKConfig(); - public KConfig(KConfigBackEnd backEnd, boolean bReadOnly) { + private native void newTDEConfig(); + public TDEConfig(TDEConfigBackEnd backEnd, boolean bReadOnly) { super((Class) null); - newKConfig(backEnd,bReadOnly); + newTDEConfig(backEnd,bReadOnly); } - private native void newKConfig(KConfigBackEnd backEnd, boolean bReadOnly); - public KConfig(KConfigBackEnd backEnd) { + private native void newTDEConfig(TDEConfigBackEnd backEnd, boolean bReadOnly); + public TDEConfig(TDEConfigBackEnd backEnd) { super((Class) null); - newKConfig(backEnd); + newTDEConfig(backEnd); } - private native void newKConfig(KConfigBackEnd backEnd); + private native void newTDEConfig(TDEConfigBackEnd backEnd); /** Clears all entries out of the dirtyEntryMap, so the values will not be written to disk on a later call to @@ -79,7 +79,7 @@ public class KConfig extends KConfigBase { false, but the dirty entries remain in the dirty entry map. @short Clears all entries out of the dirtyEntryMap, so the values will not be written to disk on a later call to sync(). - @see KConfigBase#rollback + @see TDEConfigBase#rollback */ public native void rollback(boolean bDeep); public native void rollback(); @@ -159,14 +159,14 @@ public class KConfig extends KConfigBase { @param config optional config object to reuse @short Copies all entries from this config object to a new config object that will save itself to file. */ - public native KConfig copyTo(String file, KConfig config); - public native KConfig copyTo(String file); + public native TDEConfig copyTo(String file, TDEConfig config); + public native TDEConfig copyTo(String file); /** Returns a lock file object for the configuration file or 0 if the backend does not support locking. @param bGlobal if true, return the lock file for the global config file - NOTE: KConfig.sync() requires a lock on both the normal and global - config file. When calling KConfig.sync() while having a lock on the + NOTE: TDEConfig.sync() requires a lock on both the normal and global + config file. When calling TDEConfig.sync() while having a lock on the global config file, the normal config file MUST be locked AS WELL and the normal config file MUST be locked BEFORE the global config file! Otherwise there is a risk of deadlock. -- cgit v1.2.3