diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-04-23 10:16:54 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-04-23 08:33:45 +0000 |
commit | bb9cb085d80d62b0b781115d34c8c1a7b4624094 (patch) | |
tree | 35a2355e15cc6bbba18bf2ef8ac2e2bb76ea56f2 | |
parent | d97b0a39b68db7f4823e66620d4402bec8ee4165 (diff) |
Rename the Java classes: QtFoo.java -> QmlFoo.java
It's hopefully less confusing with a bit of distinction to the built-in
Qt Java classes such as QtActivity...
Change-Id: If4cce06952fcd6a317aad77bb5aa113a086325f3
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
32 files changed, 91 insertions, 91 deletions
diff --git a/examples/android/catalog/android/AndroidManifest.xml b/examples/android/catalog/android/AndroidManifest.xml index 20c04ba..11d18f7 100644 --- a/examples/android/catalog/android/AndroidManifest.xml +++ b/examples/android/catalog/android/AndroidManifest.xml @@ -1,9 +1,9 @@ <?xml version='1.0' encoding='utf-8'?> <manifest package="org.qtproject.example" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto"> <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:theme="@android:style/Theme.Material.Light.DarkActionBar"> - <service android:name="qt.android.app.QtService" /> + <service android:name="qt.android.app.QmlService" /> <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" - android:name="qt.android.app.QtActivity" + android:name="qt.android.app.QmlActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop"> diff --git a/src/java/java.pro b/src/java/java.pro index 96e2f05..2fddabc 100644 --- a/src/java/java.pro +++ b/src/java/java.pro @@ -1,20 +1,20 @@ CONFIG -= qt android_install OTHER_FILES += \ - $$PWD/qt/android/app/QtActivity.java \ - $$PWD/qt/android/app/QtService.java \ - $$PWD/qt/android/support/v4/widget/QtSwipeRefreshLayoutListener.java \ - $$PWD/qt/android/support/v7/widget/QtRecyclerAdapter.java \ - $$PWD/qt/android/view/QtMenu.java \ - $$PWD/qt/android/view/QtMenuItem.java \ - $$PWD/qt/android/view/QtViewListener.java \ - $$PWD/qt/android/widget/QtCompoundButtonListener.java \ - $$PWD/qt/android/widget/QtNumberPickerListener.java \ - $$PWD/qt/android/widget/QtRadioGroupListener.java \ - $$PWD/qt/android/widget/QtRatingBarListener.java \ - $$PWD/qt/android/widget/QtScrollView.java \ - $$PWD/qt/android/widget/QtSeekBarListener.java \ - $$PWD/qt/android/widget/QtTabHostListener.java + $$PWD/qt/android/app/QmlActivity.java \ + $$PWD/qt/android/app/QmlService.java \ + $$PWD/qt/android/support/v4/widget/QmlSwipeRefreshLayoutListener.java \ + $$PWD/qt/android/support/v7/widget/QmlRecyclerAdapter.java \ + $$PWD/qt/android/view/QmlMenu.java \ + $$PWD/qt/android/view/QmlMenuItem.java \ + $$PWD/qt/android/view/QmlViewListener.java \ + $$PWD/qt/android/widget/QmlCompoundButtonListener.java \ + $$PWD/qt/android/widget/QmlNumberPickerListener.java \ + $$PWD/qt/android/widget/QmlRadioGroupListener.java \ + $$PWD/qt/android/widget/QmlRatingBarListener.java \ + $$PWD/qt/android/widget/QmlScrollView.java \ + $$PWD/qt/android/widget/QmlSeekBarListener.java \ + $$PWD/qt/android/widget/QmlTabHostListener.java java.files = $$PWD/qt java.path = $$[QT_INSTALL_PREFIX]/src/java diff --git a/src/java/qt/android/app/QtActivity.java b/src/java/qt/android/app/QmlActivity.java index 195be1b..1cda31d 100644 --- a/src/java/qt/android/app/QtActivity.java +++ b/src/java/qt/android/app/QmlActivity.java @@ -9,15 +9,15 @@ import android.util.TypedValue; import android.view.Menu; -import qt.android.view.QtMenu; +import qt.android.view.QmlMenu; -public class QtActivity extends org.qtproject.qt5.android.bindings.QtActivity +public class QmlActivity extends org.qtproject.qt5.android.bindings.QtActivity { - public QtActivity() { + public QmlActivity() { m_menu = null; } - public void setOptionsMenu(QtMenu menu) { + public void setOptionsMenu(QmlMenu menu) { if (m_menu != menu) { m_menu = menu; invalidateOptionsMenu(); @@ -54,5 +54,5 @@ public class QtActivity extends org.qtproject.qt5.android.bindings.QtActivity m_menu.closed(menu); } - private QtMenu m_menu; + private QmlMenu m_menu; } diff --git a/src/java/qt/android/app/QtService.java b/src/java/qt/android/app/QmlService.java index 7c844f3..3188be6 100644 --- a/src/java/qt/android/app/QtService.java +++ b/src/java/qt/android/app/QmlService.java @@ -4,54 +4,54 @@ import android.app.Service; import android.os.IBinder; import android.content.Intent; -public class QtService extends Service +public class QmlService extends Service { - public QtService() { + public QmlService() { } @Override public void onCreate() { - System.out.println("### QtService.onCreate"); + System.out.println("### QmlService.onCreate"); onCreated(0); } @Override public void onDestroy() { - System.out.println("### QtService.onDestroy"); + System.out.println("### QmlService.onDestroy"); onDestroyed(0); } @Override public IBinder onBind(Intent intent) { - long instance = intent.getLongExtra("QtService", 0); - System.out.println("### TODO: QtService.onBind " + instance); + long instance = intent.getLongExtra("QmlService", 0); + System.out.println("### TODO: QmlService.onBind " + instance); return null; } @Override public void onRebind(Intent intent) { - long instance = intent.getLongExtra("QtService", 0); - System.out.println("### TODO: QtService.onRebind " + instance); + long instance = intent.getLongExtra("QmlService", 0); + System.out.println("### TODO: QmlService.onRebind " + instance); } @Override public boolean onUnbind(Intent intent) { - long instance = intent.getLongExtra("QtService", 0); - System.out.println("### TODO: QtService.onUnbind " + instance); + long instance = intent.getLongExtra("QmlService", 0); + System.out.println("### TODO: QmlService.onUnbind " + instance); return false; } @Override public int onStartCommand(Intent intent, int flags, int startId) { - long instance = intent.getLongExtra("QtService", 0); - System.out.println("### QtService.onStartCommand " + instance); + long instance = intent.getLongExtra("QmlService", 0); + System.out.println("### QmlService.onStartCommand " + instance); return onStartCommand(instance, flags, startId) ? START_STICKY : START_NOT_STICKY; } @Override public void onTaskRemoved(Intent rootIntent) { - long instance = rootIntent.getLongExtra("QtService", 0); - System.out.println("### QtService.onTaskRemoved " + instance); + long instance = rootIntent.getLongExtra("QmlService", 0); + System.out.println("### QmlService.onTaskRemoved " + instance); } private static native void onCreated(long instance); diff --git a/src/java/qt/android/support/v4/widget/QtSwipeRefreshLayoutListener.java b/src/java/qt/android/support/v4/widget/QmlSwipeRefreshLayoutListener.java index 7edf311..c29eca5 100644 --- a/src/java/qt/android/support/v4/widget/QtSwipeRefreshLayoutListener.java +++ b/src/java/qt/android/support/v4/widget/QmlSwipeRefreshLayoutListener.java @@ -2,9 +2,9 @@ package qt.android.support.v4.widget; import android.support.v4.widget.SwipeRefreshLayout; -public class QtSwipeRefreshLayoutListener implements SwipeRefreshLayout.OnRefreshListener +public class QmlSwipeRefreshLayoutListener implements SwipeRefreshLayout.OnRefreshListener { - public QtSwipeRefreshLayoutListener(SwipeRefreshLayout layout, long instance) { + public QmlSwipeRefreshLayoutListener(SwipeRefreshLayout layout, long instance) { m_instance = instance; layout.setOnRefreshListener(this); } diff --git a/src/java/qt/android/support/v7/widget/QtRecyclerAdapter.java b/src/java/qt/android/support/v7/widget/QmlRecyclerAdapter.java index 98756f7..dde3d6a 100644 --- a/src/java/qt/android/support/v7/widget/QtRecyclerAdapter.java +++ b/src/java/qt/android/support/v7/widget/QmlRecyclerAdapter.java @@ -6,9 +6,9 @@ import android.support.v7.widget.RecyclerView; import java.lang.Integer; -public class QtRecyclerAdapter extends RecyclerView.Adapter<QtRecyclerAdapter.ViewHolder> +public class QmlRecyclerAdapter extends RecyclerView.Adapter<QmlRecyclerAdapter.ViewHolder> { - public QtRecyclerAdapter(int count, long instance) { + public QmlRecyclerAdapter(int count, long instance) { m_count = count; m_instance = instance; } diff --git a/src/java/qt/android/view/QtMenu.java b/src/java/qt/android/view/QmlMenu.java index fc17a46..bc802b2 100644 --- a/src/java/qt/android/view/QtMenu.java +++ b/src/java/qt/android/view/QmlMenu.java @@ -5,20 +5,20 @@ import java.util.ArrayList; import android.view.Menu; import android.view.MenuItem; -import qt.android.view.QtMenuItem; +import qt.android.view.QmlMenuItem; -public class QtMenu +public class QmlMenu { - public QtMenu() { - m_items = new ArrayList<QtMenuItem>(); + public QmlMenu() { + m_items = new ArrayList<QmlMenuItem>(); } - public void add(QtMenuItem item) { + public void add(QmlMenuItem item) { m_items.add(item); } public boolean create(Menu menu) { - for (QtMenuItem item : m_items) { + for (QmlMenuItem item : m_items) { MenuItem mi = menu.add(item.getTitle()); item.create(mi); } @@ -32,5 +32,5 @@ public class QtMenu public void closed(Menu menu) { } - private ArrayList<QtMenuItem> m_items; + private ArrayList<QmlMenuItem> m_items; } diff --git a/src/java/qt/android/view/QtMenuItem.java b/src/java/qt/android/view/QmlMenuItem.java index c6ec53d..59809e1 100644 --- a/src/java/qt/android/view/QtMenuItem.java +++ b/src/java/qt/android/view/QmlMenuItem.java @@ -4,10 +4,10 @@ import java.lang.CharSequence; import android.view.MenuItem; import android.view.View; -public class QtMenuItem implements MenuItem.OnMenuItemClickListener, - MenuItem.OnActionExpandListener +public class QmlMenuItem implements MenuItem.OnMenuItemClickListener, + MenuItem.OnActionExpandListener { - public QtMenuItem(long instance) { + public QmlMenuItem(long instance) { m_instance = instance; m_enabled = true; m_visible = true; diff --git a/src/java/qt/android/view/QtViewListener.java b/src/java/qt/android/view/QmlViewListener.java index 2b724e4..97008c2 100644 --- a/src/java/qt/android/view/QtViewListener.java +++ b/src/java/qt/android/view/QmlViewListener.java @@ -3,12 +3,12 @@ package qt.android.view; import android.view.View; import android.widget.AdapterView; -public class QtViewListener implements View.OnClickListener, - View.OnFocusChangeListener, - View.OnLayoutChangeListener, - View.OnLongClickListener +public class QmlViewListener implements View.OnClickListener, + View.OnFocusChangeListener, + View.OnLayoutChangeListener, + View.OnLongClickListener { - public QtViewListener(View view, long instance) { + public QmlViewListener(View view, long instance) { m_instance = instance; if (!(view instanceof AdapterView)) { view.setOnClickListener(this); diff --git a/src/java/qt/android/widget/QtAdapterViewListener.java b/src/java/qt/android/widget/QmlAdapterViewListener.java index bb8a32f..86f8c6f 100644 --- a/src/java/qt/android/widget/QtAdapterViewListener.java +++ b/src/java/qt/android/widget/QmlAdapterViewListener.java @@ -4,9 +4,9 @@ import android.view.View; import android.widget.Spinner; import android.widget.AdapterView; -public class QtAdapterViewListener implements AdapterView.OnItemClickListener +public class QmlAdapterViewListener implements AdapterView.OnItemClickListener { - public QtAdapterViewListener(AdapterView view, long instance) { + public QmlAdapterViewListener(AdapterView view, long instance) { m_instance = instance; if (!(view instanceof Spinner)) { view.setOnItemClickListener(this); diff --git a/src/java/qt/android/widget/QtCompoundButtonListener.java b/src/java/qt/android/widget/QmlCompoundButtonListener.java index 3edcb9a..b9b68c2 100644 --- a/src/java/qt/android/widget/QtCompoundButtonListener.java +++ b/src/java/qt/android/widget/QmlCompoundButtonListener.java @@ -2,9 +2,9 @@ package qt.android.widget; import android.widget.CompoundButton; -public class QtCompoundButtonListener implements CompoundButton.OnCheckedChangeListener +public class QmlCompoundButtonListener implements CompoundButton.OnCheckedChangeListener { - public QtCompoundButtonListener(CompoundButton button, long instance) { + public QmlCompoundButtonListener(CompoundButton button, long instance) { m_instance = instance; button.setOnCheckedChangeListener(this); } diff --git a/src/java/qt/android/widget/QtNumberPickerListener.java b/src/java/qt/android/widget/QmlNumberPickerListener.java index 60eb026..5fcfb33 100644 --- a/src/java/qt/android/widget/QtNumberPickerListener.java +++ b/src/java/qt/android/widget/QmlNumberPickerListener.java @@ -2,9 +2,9 @@ package qt.android.widget; import android.widget.NumberPicker; -public class QtNumberPickerListener implements NumberPicker.OnValueChangeListener +public class QmlNumberPickerListener implements NumberPicker.OnValueChangeListener { - public QtNumberPickerListener(NumberPicker picker, long instance) { + public QmlNumberPickerListener(NumberPicker picker, long instance) { m_instance = instance; picker.setOnValueChangedListener(this); } diff --git a/src/java/qt/android/widget/QtRadioGroupListener.java b/src/java/qt/android/widget/QmlRadioGroupListener.java index 9187571..7e94282 100644 --- a/src/java/qt/android/widget/QtRadioGroupListener.java +++ b/src/java/qt/android/widget/QmlRadioGroupListener.java @@ -3,9 +3,9 @@ package qt.android.widget; import android.widget.RadioGroup; import android.widget.RadioButton; -public class QtRadioGroupListener implements RadioGroup.OnCheckedChangeListener +public class QmlRadioGroupListener implements RadioGroup.OnCheckedChangeListener { - public QtRadioGroupListener(RadioGroup group, long instance) { + public QmlRadioGroupListener(RadioGroup group, long instance) { m_instance = instance; group.setOnCheckedChangeListener(this); } diff --git a/src/java/qt/android/widget/QtRatingBarListener.java b/src/java/qt/android/widget/QmlRatingBarListener.java index 0fd1411..2139de2 100644 --- a/src/java/qt/android/widget/QtRatingBarListener.java +++ b/src/java/qt/android/widget/QmlRatingBarListener.java @@ -2,9 +2,9 @@ package qt.android.widget; import android.widget.RatingBar; -public class QtRatingBarListener implements RatingBar.OnRatingBarChangeListener +public class QmlRatingBarListener implements RatingBar.OnRatingBarChangeListener { - public QtRatingBarListener(RatingBar ratingBar, long instance) { + public QmlRatingBarListener(RatingBar ratingBar, long instance) { m_instance = instance; ratingBar.setOnRatingBarChangeListener(this); } diff --git a/src/java/qt/android/widget/QtScrollView.java b/src/java/qt/android/widget/QmlScrollView.java index af6ccad..937da26 100644 --- a/src/java/qt/android/widget/QtScrollView.java +++ b/src/java/qt/android/widget/QmlScrollView.java @@ -3,9 +3,9 @@ package qt.android.widget; import android.content.Context; import android.widget.ScrollView; -public class QtScrollView extends ScrollView +public class QmlScrollView extends ScrollView { - public QtScrollView(Context context, long instance) { + public QmlScrollView(Context context, long instance) { super(context); m_instance = instance; } diff --git a/src/java/qt/android/widget/QtSeekBarListener.java b/src/java/qt/android/widget/QmlSeekBarListener.java index 0d789c4..60eff57 100644 --- a/src/java/qt/android/widget/QtSeekBarListener.java +++ b/src/java/qt/android/widget/QmlSeekBarListener.java @@ -2,9 +2,9 @@ package qt.android.widget; import android.widget.SeekBar; -public class QtSeekBarListener implements SeekBar.OnSeekBarChangeListener +public class QmlSeekBarListener implements SeekBar.OnSeekBarChangeListener { - public QtSeekBarListener(SeekBar seekBar, long instance) { + public QmlSeekBarListener(SeekBar seekBar, long instance) { m_instance = instance; seekBar.setOnSeekBarChangeListener(this); } diff --git a/src/java/qt/android/widget/QtTabHostListener.java b/src/java/qt/android/widget/QmlTabHostListener.java index 511a291..5431aeb 100644 --- a/src/java/qt/android/widget/QtTabHostListener.java +++ b/src/java/qt/android/widget/QmlTabHostListener.java @@ -2,9 +2,9 @@ package qt.android.widget; import android.widget.TabHost; -public class QtTabHostListener implements TabHost.OnTabChangeListener +public class QmlTabHostListener implements TabHost.OnTabChangeListener { - public QtTabHostListener(TabHost host, long instance) { + public QmlTabHostListener(TabHost host, long instance) { m_instance = instance; host.setOnTabChangedListener(this); } diff --git a/src/qmlandroid/app/qqmlandroidactivity.cpp b/src/qmlandroid/app/qqmlandroidactivity.cpp index 76c1162..3bf56d6 100644 --- a/src/qmlandroid/app/qqmlandroidactivity.cpp +++ b/src/qmlandroid/app/qqmlandroidactivity.cpp @@ -139,7 +139,7 @@ void QQmlAndroidActivity::updateOptionsMenu() QAndroidJniObject activity = instance(); QtQmlAndroid::callFunction([=]() { - activity.callMethod<void>("setOptionsMenu", "(Lqt/android/view/QtMenu;)V", menu.object()); + activity.callMethod<void>("setOptionsMenu", "(Lqt/android/view/QmlMenu;)V", menu.object()); }); } diff --git a/src/qmlandroid/app/qqmlandroidservice.cpp b/src/qmlandroid/app/qqmlandroidservice.cpp index 4bce707..2597e3e 100644 --- a/src/qmlandroid/app/qqmlandroidservice.cpp +++ b/src/qmlandroid/app/qqmlandroidservice.cpp @@ -37,7 +37,7 @@ void QQmlAndroidService::start() cls.object()); intent.callObjectMethod("putExtra", "(Ljava/lang/String;J)Landroid/content/Intent;", - QAndroidJniObject::fromString(QStringLiteral("QtService")).object(), + QAndroidJniObject::fromString(QStringLiteral("QmlService")).object(), reinterpret_cast<jlong>(this)); QAndroidJniObject component = context.callObjectMethod("startService", "(Landroid/content/Intent;)Landroid/content/ComponentName;", @@ -62,7 +62,7 @@ void QQmlAndroidService::stop() cls.object()); intent.callObjectMethod("putExtra", "(Ljava/lang/String;J)Landroid/content/Intent;", - QAndroidJniObject::fromString(QStringLiteral("QtService")).object(), + QAndroidJniObject::fromString(QStringLiteral("QmlService")).object(), reinterpret_cast<jlong>(this)); context.callMethod<jboolean>("stopService", "(Landroid/content/Intent;)Z", @@ -72,7 +72,7 @@ void QQmlAndroidService::stop() QAndroidJniObject QQmlAndroidService::onCreate() { - return QAndroidJniObject("qt/android/app/QtService"); + return QAndroidJniObject("qt/android/app/QmlService"); } void QQmlAndroidService::onInflate(QAndroidJniObject& instance) diff --git a/src/qmlandroid/support/v4/widget/qqmlandroidswiperefreshlayout.cpp b/src/qmlandroid/support/v4/widget/qqmlandroidswiperefreshlayout.cpp index 47296e6..0f78941 100644 --- a/src/qmlandroid/support/v4/widget/qqmlandroidswiperefreshlayout.cpp +++ b/src/qmlandroid/support/v4/widget/qqmlandroidswiperefreshlayout.cpp @@ -40,7 +40,7 @@ void QQmlAndroidSwipeRefreshLayout::onInflate(QAndroidJniObject &instance) { QQmlAndroidViewGroup::onInflate(instance); - m_listener = QAndroidJniObject("qt/android/support/v4/widget/QtSwipeRefreshLayoutListener", + m_listener = QAndroidJniObject("qt/android/support/v4/widget/QmlSwipeRefreshLayoutListener", "(Landroid/support/v4/widget/SwipeRefreshLayout;J)V", instance.object(), reinterpret_cast<jlong>(this)); diff --git a/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter.cpp b/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter.cpp index 65efd34..34ade1c 100644 --- a/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter.cpp +++ b/src/qmlandroid/support/v7/widget/qqmlandroidrecycleradapter.cpp @@ -41,7 +41,7 @@ void QQmlAndroidRecyclerAdapter::setDelegate(QQmlComponent *delegate) QAndroidJniObject QQmlAndroidRecyclerAdapter::onCreate() { - return QAndroidJniObject("qt/android/support/v7/widget/QtRecyclerAdapter", + return QAndroidJniObject("qt/android/support/v7/widget/QmlRecyclerAdapter", "(IJ)V", m_count, reinterpret_cast<jlong>(this)); @@ -63,8 +63,8 @@ void QQmlAndroidRecyclerAdapter::onInflate(QAndroidJniObject &instance) void QQmlAndroidRecyclerAdapter::onRegisterNativeMethods(jobject adapter) { - JNINativeMethod methods[] {{"onCreateViewHolder", "(JLandroid/view/ViewGroup;I)Lqt/android/support/v7/widget/QtRecyclerAdapter$ViewHolder;", reinterpret_cast<void *>(onCreateViewHolder)}, - {"onBindViewHolder", "(JLqt/android/support/v7/widget/QtRecyclerAdapter$ViewHolder;I)V", reinterpret_cast<void *>(onBindViewHolder)}}; + JNINativeMethod methods[] {{"onCreateViewHolder", "(JLandroid/view/ViewGroup;I)Lqt/android/support/v7/widget/QmlRecyclerAdapter$ViewHolder;", reinterpret_cast<void *>(onCreateViewHolder)}, + {"onBindViewHolder", "(JLqt/android/support/v7/widget/QmlRecyclerAdapter$ViewHolder;I)V", reinterpret_cast<void *>(onBindViewHolder)}}; QAndroidJniEnvironment env; jclass cls = env->GetObjectClass(adapter); @@ -83,7 +83,7 @@ jobject QQmlAndroidRecyclerAdapter::onCreateViewHolder(JNIEnv *env, jobject obje QQmlAndroidView *item = 0; QMetaObject::invokeMethod(adapter, "createItem", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QQmlAndroidView *, item)); item->construct(); - adapter->m_holders += QAndroidJniObject("qt/android/support/v7/widget/QtRecyclerAdapter$ViewHolder", + adapter->m_holders += QAndroidJniObject("qt/android/support/v7/widget/QmlRecyclerAdapter$ViewHolder", "(Landroid/view/View;J)V", item->instance().object(), reinterpret_cast<jlong>(item)); diff --git a/src/qmlandroid/view/qqmlandroidmenu.cpp b/src/qmlandroid/view/qqmlandroidmenu.cpp index a5f0b8c..92ffbac 100644 --- a/src/qmlandroid/view/qqmlandroidmenu.cpp +++ b/src/qmlandroid/view/qqmlandroidmenu.cpp @@ -21,7 +21,7 @@ QList<QQmlAndroidMenuItem *> QQmlAndroidMenu::items() const QAndroidJniObject QQmlAndroidMenu::onCreate() { - return QAndroidJniObject("qt/android/view/QtMenu"); + return QAndroidJniObject("qt/android/view/QmlMenu"); } void QQmlAndroidMenu::onInflate(QAndroidJniObject &instance) @@ -29,7 +29,7 @@ void QQmlAndroidMenu::onInflate(QAndroidJniObject &instance) foreach (QQmlAndroidMenuItem *item, items()) { item->construct(); if (item->isValid()) - instance.callMethod<void>("add", "(Lqt/android/view/QtMenuItem;)V", item->instance().object()); + instance.callMethod<void>("add", "(Lqt/android/view/QmlMenuItem;)V", item->instance().object()); } } diff --git a/src/qmlandroid/view/qqmlandroidmenuitem.cpp b/src/qmlandroid/view/qqmlandroidmenuitem.cpp index 9b86fd0..7922422 100644 --- a/src/qmlandroid/view/qqmlandroidmenuitem.cpp +++ b/src/qmlandroid/view/qqmlandroidmenuitem.cpp @@ -123,7 +123,7 @@ void QQmlAndroidMenuItem::setActionView(QQmlAndroidView *view) QAndroidJniObject QQmlAndroidMenuItem::onCreate() { - return QAndroidJniObject("qt/android/view/QtMenuItem", + return QAndroidJniObject("qt/android/view/QmlMenuItem", "(J)V", reinterpret_cast<jlong>(this)); } diff --git a/src/qmlandroid/view/qqmlandroidview.cpp b/src/qmlandroid/view/qqmlandroidview.cpp index 957a7a2..53757cc 100644 --- a/src/qmlandroid/view/qqmlandroidview.cpp +++ b/src/qmlandroid/view/qqmlandroidview.cpp @@ -461,7 +461,7 @@ void QQmlAndroidView::onInflate(QAndroidJniObject &instance) QQmlAndroidContextual::onInflate(instance); - m_listener = QAndroidJniObject("qt/android/view/QtViewListener", + m_listener = QAndroidJniObject("qt/android/view/QmlViewListener", "(Landroid/view/View;J)V", instance.object(), reinterpret_cast<jlong>(this)); diff --git a/src/qmlandroid/widget/qqmlandroidadapterview.cpp b/src/qmlandroid/widget/qqmlandroidadapterview.cpp index 8a56563..f2d8629 100644 --- a/src/qmlandroid/widget/qqmlandroidadapterview.cpp +++ b/src/qmlandroid/widget/qqmlandroidadapterview.cpp @@ -47,7 +47,7 @@ QAndroidJniObject QQmlAndroidAdapterView::onCreate() void QQmlAndroidAdapterView::onInflate(QAndroidJniObject &instance) { - m_listener = QAndroidJniObject("qt/android/widget/QtAdapterViewListener", + m_listener = QAndroidJniObject("qt/android/widget/QmlAdapterViewListener", "(Landroid/widget/AdapterView;J)V", instance.object(), reinterpret_cast<jlong>(this)); diff --git a/src/qmlandroid/widget/qqmlandroidcompoundbutton.cpp b/src/qmlandroid/widget/qqmlandroidcompoundbutton.cpp index b51e91b..fd46ca2 100644 --- a/src/qmlandroid/widget/qqmlandroidcompoundbutton.cpp +++ b/src/qmlandroid/widget/qqmlandroidcompoundbutton.cpp @@ -45,7 +45,7 @@ void QQmlAndroidCompoundButton::onInflate(QAndroidJniObject &instance) { QQmlAndroidButton::onInflate(instance); - m_listener = QAndroidJniObject("qt/android/widget/QtCompoundButtonListener", + m_listener = QAndroidJniObject("qt/android/widget/QmlCompoundButtonListener", "(Landroid/widget/CompoundButton;J)V", instance.object(), reinterpret_cast<jlong>(this)); diff --git a/src/qmlandroid/widget/qqmlandroidnumberpicker.cpp b/src/qmlandroid/widget/qqmlandroidnumberpicker.cpp index 4b5f1b6..73db60e 100644 --- a/src/qmlandroid/widget/qqmlandroidnumberpicker.cpp +++ b/src/qmlandroid/widget/qqmlandroidnumberpicker.cpp @@ -40,7 +40,7 @@ void QQmlAndroidNumberPicker::onInflate(QAndroidJniObject &instance) { QQmlAndroidLinearLayout::onInflate(instance); - m_listener = QAndroidJniObject("qt/android/widget/QtNumberPickerListener", + m_listener = QAndroidJniObject("qt/android/widget/QmlNumberPickerListener", "(Landroid/widget/NumberPicker;J)V", instance.object(), reinterpret_cast<jlong>(this)); diff --git a/src/qmlandroid/widget/qqmlandroidradiogroup.cpp b/src/qmlandroid/widget/qqmlandroidradiogroup.cpp index 4abf099..e677b74 100644 --- a/src/qmlandroid/widget/qqmlandroidradiogroup.cpp +++ b/src/qmlandroid/widget/qqmlandroidradiogroup.cpp @@ -36,7 +36,7 @@ void QQmlAndroidRadioGroup::onInflate(QAndroidJniObject &instance) { QQmlAndroidLinearLayout::onInflate(instance); - m_listener = QAndroidJniObject("qt/android/widget/QtRadioGroupListener", + m_listener = QAndroidJniObject("qt/android/widget/QmlRadioGroupListener", "(Landroid/widget/RadioGroup;J)V", instance.object(), reinterpret_cast<jlong>(this)); diff --git a/src/qmlandroid/widget/qqmlandroidratingbar.cpp b/src/qmlandroid/widget/qqmlandroidratingbar.cpp index 3b11b82..679934a 100644 --- a/src/qmlandroid/widget/qqmlandroidratingbar.cpp +++ b/src/qmlandroid/widget/qqmlandroidratingbar.cpp @@ -40,7 +40,7 @@ void QQmlAndroidRatingBar::onInflate(QAndroidJniObject &instance) { QQmlAndroidAbsSeekBar::onInflate(instance); - m_listener = QAndroidJniObject("qt/android/widget/QtRatingBarListener", + m_listener = QAndroidJniObject("qt/android/widget/QmlRatingBarListener", "(Landroid/widget/RatingBar;J)V", instance.object(), reinterpret_cast<jlong>(this)); diff --git a/src/qmlandroid/widget/qqmlandroidscrollview.cpp b/src/qmlandroid/widget/qqmlandroidscrollview.cpp index cc35e84..15b0ed0 100644 --- a/src/qmlandroid/widget/qqmlandroidscrollview.cpp +++ b/src/qmlandroid/widget/qqmlandroidscrollview.cpp @@ -54,7 +54,7 @@ bool QQmlAndroidScrollView::updateScrollY(int y) QAndroidJniObject QQmlAndroidScrollView::onCreate() { - return QAndroidJniObject("qt/android/widget/QtScrollView", + return QAndroidJniObject("qt/android/widget/QmlScrollView", "(Landroid/content/Context;J)V", ctx().object(), reinterpret_cast<jlong>(this)); diff --git a/src/qmlandroid/widget/qqmlandroidseekbar.cpp b/src/qmlandroid/widget/qqmlandroidseekbar.cpp index 074b20e..c4b4d25 100644 --- a/src/qmlandroid/widget/qqmlandroidseekbar.cpp +++ b/src/qmlandroid/widget/qqmlandroidseekbar.cpp @@ -18,7 +18,7 @@ void QQmlAndroidSeekBar::onInflate(QAndroidJniObject &instance) { QQmlAndroidAbsSeekBar::onInflate(instance); - m_listener = QAndroidJniObject("qt/android/widget/QtSeekBarListener", + m_listener = QAndroidJniObject("qt/android/widget/QmlSeekBarListener", "(Landroid/widget/SeekBar;J)V", instance.object(), reinterpret_cast<jlong>(this)); diff --git a/src/qmlandroid/widget/qqmlandroidtabhost.cpp b/src/qmlandroid/widget/qqmlandroidtabhost.cpp index 94bc408..4c87a6b 100644 --- a/src/qmlandroid/widget/qqmlandroidtabhost.cpp +++ b/src/qmlandroid/widget/qqmlandroidtabhost.cpp @@ -19,7 +19,7 @@ void QQmlAndroidTabHost::onInflate(QAndroidJniObject &instance) { QQmlAndroidFrameLayout::onInflate(instance); - m_listener = QAndroidJniObject("qt/android/widget/QtTabHostListener", + m_listener = QAndroidJniObject("qt/android/widget/QmlTabHostListener", "(Landroid/widget/TabHost;J)V", instance.object(), reinterpret_cast<jlong>(this)); |