summaryrefslogtreecommitdiffstats
path: root/kdejava/koala/kdejava/TDEGlobalAccel.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:31:43 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:31:43 -0600
commit24b85b785334e8436c975a4323fcbb75d61f6e72 (patch)
tree95703ced216baabc95ecb169839c6f302bbcc5af /kdejava/koala/kdejava/TDEGlobalAccel.cpp
parent5baaa6b5ff2b9d30279cf9e9658b9509fcdf884c (diff)
downloadtdebindings-24b85b785334e8436c975a4323fcbb75d61f6e72.tar.gz
tdebindings-24b85b785334e8436c975a4323fcbb75d61f6e72.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kdejava/koala/kdejava/TDEGlobalAccel.cpp')
-rw-r--r--kdejava/koala/kdejava/TDEGlobalAccel.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/kdejava/koala/kdejava/TDEGlobalAccel.cpp b/kdejava/koala/kdejava/TDEGlobalAccel.cpp
index c1f31bca..ab23f983 100644
--- a/kdejava/koala/kdejava/TDEGlobalAccel.cpp
+++ b/kdejava/koala/kdejava/TDEGlobalAccel.cpp
@@ -198,9 +198,9 @@ Java_org_kde_koala_TDEGlobalAccel_readSettings__(JNIEnv* env, jobject obj)
}
JNIEXPORT jboolean JNICALL
-Java_org_kde_koala_TDEGlobalAccel_readSettings__Lorg_kde_koala_KConfigBase_2(JNIEnv* env, jobject obj, jobject pConfig)
+Java_org_kde_koala_TDEGlobalAccel_readSettings__Lorg_kde_koala_TDEConfigBase_2(JNIEnv* env, jobject obj, jobject pConfig)
{
- jboolean xret = (jboolean) ((TDEGlobalAccel*) QtSupport::getQt(env, obj))->readSettings((KConfigBase*) QtSupport::getQt(env, pConfig));
+ jboolean xret = (jboolean) ((TDEGlobalAccel*) QtSupport::getQt(env, obj))->readSettings((TDEConfigBase*) QtSupport::getQt(env, pConfig));
return xret;
}
@@ -276,16 +276,16 @@ Java_org_kde_koala_TDEGlobalAccel_writeSettings__(JNIEnv* env, jobject obj)
}
JNIEXPORT jboolean JNICALL
-Java_org_kde_koala_TDEGlobalAccel_writeSettings__Lorg_kde_koala_KConfigBase_2(JNIEnv* env, jobject obj, jobject pConfig)
+Java_org_kde_koala_TDEGlobalAccel_writeSettings__Lorg_kde_koala_TDEConfigBase_2(JNIEnv* env, jobject obj, jobject pConfig)
{
- jboolean xret = (jboolean) ((TDEGlobalAccel*) QtSupport::getQt(env, obj))->writeSettings((KConfigBase*) QtSupport::getQt(env, pConfig));
+ jboolean xret = (jboolean) ((TDEGlobalAccel*) QtSupport::getQt(env, obj))->writeSettings((TDEConfigBase*) QtSupport::getQt(env, pConfig));
return xret;
}
JNIEXPORT jboolean JNICALL
-Java_org_kde_koala_TDEGlobalAccel_writeSettings__Lorg_kde_koala_KConfigBase_2Z(JNIEnv* env, jobject obj, jobject pConfig, jboolean bGlobal)
+Java_org_kde_koala_TDEGlobalAccel_writeSettings__Lorg_kde_koala_TDEConfigBase_2Z(JNIEnv* env, jobject obj, jobject pConfig, jboolean bGlobal)
{
- jboolean xret = (jboolean) ((TDEGlobalAccel*) QtSupport::getQt(env, obj))->writeSettings((KConfigBase*) QtSupport::getQt(env, pConfig), (bool) bGlobal);
+ jboolean xret = (jboolean) ((TDEGlobalAccel*) QtSupport::getQt(env, obj))->writeSettings((TDEConfigBase*) QtSupport::getQt(env, pConfig), (bool) bGlobal);
return xret;
}