diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:31:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:31:43 -0600 |
| commit | 24b85b785334e8436c975a4323fcbb75d61f6e72 (patch) | |
| tree | 95703ced216baabc95ecb169839c6f302bbcc5af /kdejava/koala/kdejava/KSimpleConfig.cpp | |
| parent | 5baaa6b5ff2b9d30279cf9e9658b9509fcdf884c (diff) | |
| download | tdebindings-24b85b785334e8436c975a4323fcbb75d61f6e72.tar.gz tdebindings-24b85b785334e8436c975a4323fcbb75d61f6e72.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kdejava/koala/kdejava/KSimpleConfig.cpp')
| -rw-r--r-- | kdejava/koala/kdejava/KSimpleConfig.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kdejava/koala/kdejava/KSimpleConfig.cpp b/kdejava/koala/kdejava/KSimpleConfig.cpp index 9f198300..0bc69ac7 100644 --- a/kdejava/koala/kdejava/KSimpleConfig.cpp +++ b/kdejava/koala/kdejava/KSimpleConfig.cpp @@ -11,8 +11,8 @@ class KSimpleConfigJBridge : public KSimpleConfig public: KSimpleConfigJBridge(const TQString& arg1,bool arg2) : KSimpleConfig(arg1,arg2) {}; KSimpleConfigJBridge(const TQString& arg1) : KSimpleConfig(arg1) {}; - KSimpleConfigJBridge(KConfigBackEnd* arg1,bool arg2) : KSimpleConfig(arg1,arg2) {}; - KSimpleConfigJBridge(KConfigBackEnd* arg1) : KSimpleConfig(arg1) {}; + KSimpleConfigJBridge(TDEConfigBackEnd* arg1,bool arg2) : KSimpleConfig(arg1,arg2) {}; + KSimpleConfigJBridge(TDEConfigBackEnd* arg1) : KSimpleConfig(arg1) {}; void public_sync() { KSimpleConfig::sync(); return; @@ -26,7 +26,7 @@ public: } void reparseConfiguration() { if (!QtSupport::voidDelegate(this,"org.kde.koala.KSimpleConfig","reparseConfiguration")) { - KConfig::reparseConfiguration(); + TDEConfig::reparseConfiguration(); } return; } @@ -62,7 +62,7 @@ public: } void parseConfigFiles() { if (!QtSupport::voidDelegate(this,"org.kde.koala.KSimpleConfig","parseConfigFiles")) { - KConfigBase::parseConfigFiles(); + TDEConfigBase::parseConfigFiles(); } return; } @@ -136,20 +136,20 @@ static TQString* _qstring_fileName = 0; } JNIEXPORT void JNICALL -Java_org_kde_koala_KSimpleConfig_newKSimpleConfig__Lorg_kde_koala_KConfigBackEnd_2(JNIEnv* env, jobject obj, jobject backEnd) +Java_org_kde_koala_KSimpleConfig_newKSimpleConfig__Lorg_kde_koala_TDEConfigBackEnd_2(JNIEnv* env, jobject obj, jobject backEnd) { if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new KSimpleConfigJBridge((KConfigBackEnd*) QtSupport::getQt(env, backEnd))); + QtSupport::setQt(env, obj, new KSimpleConfigJBridge((TDEConfigBackEnd*) QtSupport::getQt(env, backEnd))); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; } JNIEXPORT void JNICALL -Java_org_kde_koala_KSimpleConfig_newKSimpleConfig__Lorg_kde_koala_KConfigBackEnd_2Z(JNIEnv* env, jobject obj, jobject backEnd, jboolean bReadOnly) +Java_org_kde_koala_KSimpleConfig_newKSimpleConfig__Lorg_kde_koala_TDEConfigBackEnd_2Z(JNIEnv* env, jobject obj, jobject backEnd, jboolean bReadOnly) { if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new KSimpleConfigJBridge((KConfigBackEnd*) QtSupport::getQt(env, backEnd), (bool) bReadOnly)); + QtSupport::setQt(env, obj, new KSimpleConfigJBridge((TDEConfigBackEnd*) QtSupport::getQt(env, backEnd), (bool) bReadOnly)); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; |