diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:16:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:16:43 -0600 |
| commit | 8f7ac92d27834427c1fa2a4a350d70d05529bbf4 (patch) | |
| tree | fc53a45a5d9693bfe8a156579b921e960351e31c /kdejava/koala/kdejava/KToolBarButton.cpp | |
| parent | 427847240b11c1733dd9c259c613d68a6405fe68 (diff) | |
| download | tdebindings-8f7ac92d27834427c1fa2a4a350d70d05529bbf4.tar.gz tdebindings-8f7ac92d27834427c1fa2a4a350d70d05529bbf4.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kdejava/koala/kdejava/KToolBarButton.cpp')
| -rw-r--r-- | kdejava/koala/kdejava/KToolBarButton.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kdejava/koala/kdejava/KToolBarButton.cpp b/kdejava/koala/kdejava/KToolBarButton.cpp index 88e94af4..4915749c 100644 --- a/kdejava/koala/kdejava/KToolBarButton.cpp +++ b/kdejava/koala/kdejava/KToolBarButton.cpp @@ -14,7 +14,7 @@ class KToolBarButtonJBridge : public KToolBarButton { public: - KToolBarButtonJBridge(const TQString& arg1,int arg2,TQWidget* arg3,const char* arg4,const TQString& arg5,KInstance* arg6) : KToolBarButton(arg1,arg2,arg3,arg4,arg5,arg6) {}; + KToolBarButtonJBridge(const TQString& arg1,int arg2,TQWidget* arg3,const char* arg4,const TQString& arg5,TDEInstance* arg6) : KToolBarButton(arg1,arg2,arg3,arg4,arg5,arg6) {}; KToolBarButtonJBridge(const TQString& arg1,int arg2,TQWidget* arg3,const char* arg4,const TQString& arg5) : KToolBarButton(arg1,arg2,arg3,arg4,arg5) {}; KToolBarButtonJBridge(const TQString& arg1,int arg2,TQWidget* arg3,const char* arg4) : KToolBarButton(arg1,arg2,arg3,arg4) {}; KToolBarButtonJBridge(const TQString& arg1,int arg2,TQWidget* arg3) : KToolBarButton(arg1,arg2,arg3) {}; @@ -633,13 +633,13 @@ static TQString* _qstring_txt = 0; } JNIEXPORT void JNICALL -Java_org_kde_koala_KToolBarButton_newKToolBarButton__Ljava_lang_String_2ILorg_kde_qt_QWidget_2Ljava_lang_String_2Ljava_lang_String_2Lorg_kde_koala_KInstanceInterface_2(JNIEnv* env, jobject obj, jstring icon, jint id, jobject parent, jstring name, jstring txt, jobject _instance) +Java_org_kde_koala_KToolBarButton_newKToolBarButton__Ljava_lang_String_2ILorg_kde_qt_QWidget_2Ljava_lang_String_2Ljava_lang_String_2Lorg_kde_koala_TDEInstanceInterface_2(JNIEnv* env, jobject obj, jstring icon, jint id, jobject parent, jstring name, jstring txt, jobject _instance) { static TQString* _qstring_icon = 0; static TQCString* _qstring_name = 0; static TQString* _qstring_txt = 0; if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new KToolBarButtonJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, icon, &_qstring_icon), (int) id, (TQWidget*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name), (const TQString&)*(TQString*) QtSupport::toTQString(env, txt, &_qstring_txt), (KInstance*) QtSupport::getQt(env, _instance))); + QtSupport::setQt(env, obj, new KToolBarButtonJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, icon, &_qstring_icon), (int) id, (TQWidget*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name), (const TQString&)*(TQString*) QtSupport::toTQString(env, txt, &_qstring_txt), (TDEInstance*) QtSupport::getQt(env, _instance))); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; |