android/: Whitespace and consistency fixes.

Use one tab as indentation for all XML and Java files.

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 3609c569375590d9da5c816a26bb9a218ddf52ff..24b3ccddf5c3cc7a30119a6d3a0e00550795fd9f 100644 (file)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,50 +1,50 @@
 <?xml version='1.0' encoding='utf-8'?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 <?xml version='1.0' encoding='utf-8'?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"

-               package="org.sigrok.pulseview" 
+               package="org.sigrok.pulseview"

                android:versionName="0.2.0"
                android:versionCode="20"
                android:installLocation="auto">
                android:versionName="0.2.0"
                android:versionCode="20"
                android:installLocation="auto">

-    <application android:hardwareAccelerated="true"
+       <application android:hardwareAccelerated="true"

                 android:name="org.sigrok.pulseview.PulseViewApplication"
                 android:label="@string/pv_app_name"
                 android:icon="@drawable/logo">
                 android:name="org.sigrok.pulseview.PulseViewApplication"
                 android:label="@string/pv_app_name"
                 android:icon="@drawable/logo">

-        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
-                  android:name="org.sigrok.pulseview.PulseViewActivity"
-                  android:label="@string/pv_app_name"
-                  android:screenOrientation="unspecified"
-                  android:launchMode="singleTop">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-            <meta-data android:name="android.app.lib_name" android:value="pulseview"/>
-            <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
-            <meta-data android:name="android.app.repository" android:value="default"/>
-            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
-            <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
-            <!-- Deploy Qt libs as part of package -->
-            <meta-data android:name="android.app.bundle_local_qt_libs" android:value="0"/>
-            <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
-            <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
-            <!-- Run with local libs -->
-            <meta-data android:name="android.app.use_local_qt_libs" android:value="0"/>
-            <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
-            <meta-data android:name="android.app.load_local_libs" android:value="plugins/platforms/android/libqtforandroid.so"/>
-            <meta-data android:name="android.app.load_local_jars" android:value="jar/QtAndroid.jar:jar/QtAndroidAccessibility.jar:jar/QtAndroid-bundled.jar:jar/QtAndroidAccessibility-bundled.jar"/>
-            <meta-data android:name="android.app.static_init_classes" android:value=""/>
-            <!--  Messages maps -->
-            <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
-            <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
-            <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
-            <!--  Messages maps -->
-            <!-- Splash screen -->
-            <!--
-            <meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/>
-            -->
-            <!-- Splash screen -->
-        </activity>
-    </application>
-    <uses-sdk android:minSdkVersion="12" android:targetSdkVersion="14"/>
-    <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+               <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
+                               android:name="org.sigrok.pulseview.PulseViewActivity"
+                               android:label="@string/pv_app_name"
+                               android:screenOrientation="unspecified"
+                               android:launchMode="singleTop">
+                       <intent-filter>
+                               <action android:name="android.intent.action.MAIN"/>
+                               <category android:name="android.intent.category.LAUNCHER"/>
+                       </intent-filter>
+                       <meta-data android:name="android.app.lib_name" android:value="pulseview"/>
+                       <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
+                       <meta-data android:name="android.app.repository" android:value="default"/>
+                       <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
+                       <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
+                       <!-- Deploy Qt libs as part of package -->
+                       <meta-data android:name="android.app.bundle_local_qt_libs" android:value="0"/>
+                       <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
+                       <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
+                       <!-- Run with local libs -->
+                       <meta-data android:name="android.app.use_local_qt_libs" android:value="0"/>
+                       <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
+                       <meta-data android:name="android.app.load_local_libs" android:value="plugins/platforms/android/libqtforandroid.so"/>
+                       <meta-data android:name="android.app.load_local_jars" android:value="jar/QtAndroid.jar:jar/QtAndroidAccessibility.jar:jar/QtAndroid-bundled.jar:jar/QtAndroidAccessibility-bundled.jar"/>
+                       <meta-data android:name="android.app.static_init_classes" android:value=""/>
+                       <!--  Messages maps -->
+                       <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
+                       <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
+                       <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
+                       <!--  Messages maps -->
+                       <!-- Splash screen -->
+                       <!--
+                       <meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/>
+                       -->
+                       <!-- Splash screen -->
+               </activity>
+       </application>
+       <uses-sdk android:minSdkVersion="12" android:targetSdkVersion="14"/>
+       <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
+       <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

 </manifest>
 </manifest>

diff --git a/android/bundled_libs.xml.in b/android/bundled_libs.xml.in
index 7ddaddf0f0985b539f486bd03999fd39ee532ad5..8975e6bf325fa196f5a2847167b698867b9956c2 100644 (file)
--- a/android/bundled_libs.xml.in
+++ b/android/bundled_libs.xml.in
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
 <?xml version='1.0' encoding='utf-8'?>
 <resources>

-    <array name="bundled_libs">
-@bundled_libs@
-    </array>
+       <array name="bundled_libs">
+               @bundled_libs@
+       </array>

 </resources>
 </resources>

diff --git a/android/custom_rules.xml b/android/custom_rules.xml
index 7331fe91db248bb1064b8f04c3a5981399b99220..44d66371f9fb5066d3180b1eba5fad3293630a53 100644 (file)
--- a/android/custom_rules.xml
+++ b/android/custom_rules.xml
@@ -1,81 +1,80 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 

-    This file is part of the PulseView project.
+   This file is part of the PulseView project.

 
 

-    Copyright (C) 2014 Marcus Comstedt <marcus@mc.pp.se>
+   Copyright (C) 2014 Marcus Comstedt <marcus@mc.pp.se>

 
 

-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
 

-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.

 
 

-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 -->
 <project>
 
 -->
 <project>

+       <property name="pulseview-source-path" value="${basedir}/.."/>
+       <property name="pulseview-build-path" value="${pulseview-source-path}"/>
+       <property name="cmake-cache" value="${pulseview-build-path}/CMakeCache.txt"/>

 
 

-  <property name="pulseview-source-path" value="${basedir}/.."/>
-  <property name="pulseview-build-path" value="${pulseview-source-path}"/>
-  <property name="cmake-cache" value="${pulseview-build-path}/CMakeCache.txt"/>
+       <target name="-get-prefix">
+               <loadproperties srcFile="${cmake-cache}" prefix="cmake">
+                       <filterchain>
+                               <replaceregex pattern=":[A-Z]*=" replace="="/>
+                       </filterchain>
+               </loadproperties>
+               <property name="prefix" value="${cmake.CMAKE_INSTALL_PREFIX}"/>
+       </target>

 
 

-  <target name="-get-prefix">
-    <loadproperties srcFile="${cmake-cache}" prefix="cmake">
-      <filterchain>
-       <replaceregex pattern=":[A-Z]*=" replace="=" />
-      </filterchain>
-    </loadproperties>
-    <property name="prefix" value="${cmake.CMAKE_INSTALL_PREFIX}"/>
-  </target>
+       <target name="-declare-anttasks" depends="-get-prefix">
+               <taskdef resource="anttasks.properties"
+                       classpath="${prefix}/jar/sigrok-androidutils-anttasks.jar"/>
+       </target>

 
 

-  <target name="-declare-anttasks" depends="-get-prefix">
-    <taskdef resource="anttasks.properties"
-       classpath="${prefix}/jar/sigrok-androidutils-anttasks.jar"/>
-  </target>
-
-  <target name="-pre-build" depends="-get-prefix, -declare-anttasks">
-    <copylibs todir="${native.libs.absolute.dir}" property="bundled_libs">
-      <fileset dir="${pulseview-build-path}/libs" />
-      <include name="libgnustl_shared.so"/>
-      <exclude name="lib*.so"/>
-    </copylibs>
-    <copy file="${prefix}/jar/sigrok-androidutils.jar"
-          tofile="${jar.libs.absolute.dir}/sigrok-androidutils.jar"/>
-    <copy file="${prefix}/share/sigrok-androidutils/device_filter.xml"
-          tofile="${resource.absolute.dir}/xml/device_filter.xml"/>
-    <copy file="bundled_libs.xml.in"
-          tofile="${resource.absolute.dir}/values/bundled_libs.xml">
-      <filterset>
-        <filter token="bundled_libs" value="${bundled_libs}"/>
-      </filterset>
-    </copy>
-    <copy file="${pulseview-source-path}/icons/sigrok-logo-notext.png"
-          tofile="${resource.absolute.dir}/drawable/logo.png" />
-    <copy todir="${source.absolute.dir}">
-      <fileset dir="${prefix}/src/android/java/src">
-       <include name="org/qtproject/qt5/android/bindings/**"/>
-       <include name="org/kde/necessitas/ministro/**"/>
-      </fileset>
-    </copy>
-    <copy todir="${resource.absolute.dir}">
-      <fileset dir="${prefix}/src/android/java/res">
-       <include name="**/strings.xml"/>
-      </fileset>
-    </copy>
-    <copy todir="${asset.absolute.dir}/libsigrokdecode">
-      <fileset dir="${prefix}/share/libsigrokdecode" />
-    </copy>
-    <copy todir="${asset.absolute.dir}/python3.3">
-      <fileset dir="${prefix}/lib/python3.3">
-       <include name="**/*.py"/>
-       <exclude name="**/test/**"/>
-      </fileset>
-    </copy>
-  </target>
+       <target name="-pre-build" depends="-get-prefix, -declare-anttasks">
+               <copylibs todir="${native.libs.absolute.dir}" property="bundled_libs">
+                       <fileset dir="${pulseview-build-path}/libs"/>
+                       <include name="libgnustl_shared.so"/>
+                       <exclude name="lib*.so"/>
+               </copylibs>
+               <copy file="${prefix}/jar/sigrok-androidutils.jar"
+                       tofile="${jar.libs.absolute.dir}/sigrok-androidutils.jar"/>
+               <copy file="${prefix}/share/sigrok-androidutils/device_filter.xml"
+                       tofile="${resource.absolute.dir}/xml/device_filter.xml"/>
+               <copy file="bundled_libs.xml.in"
+                       tofile="${resource.absolute.dir}/values/bundled_libs.xml">
+                       <filterset>
+                               <filter token="bundled_libs" value="${bundled_libs}"/>
+                       </filterset>
+               </copy>
+               <copy file="${pulseview-source-path}/icons/sigrok-logo-notext.png"
+                       tofile="${resource.absolute.dir}/drawable/logo.png"/>
+               <copy todir="${source.absolute.dir}">
+                       <fileset dir="${prefix}/src/android/java/src">
+                               <include name="org/qtproject/qt5/android/bindings/**"/>
+                               <include name="org/kde/necessitas/ministro/**"/>
+                       </fileset>
+               </copy>
+               <copy todir="${resource.absolute.dir}">
+                       <fileset dir="${prefix}/src/android/java/res">
+                               <include name="**/strings.xml"/>
+                       </fileset>
+               </copy>
+               <copy todir="${asset.absolute.dir}/libsigrokdecode">
+                       <fileset dir="${prefix}/share/libsigrokdecode"/>
+               </copy>
+               <copy todir="${asset.absolute.dir}/python3.3">
+                       <fileset dir="${prefix}/lib/python3.3">
+                               <include name="**/*.py"/>
+                               <exclude name="**/test/**"/>
+                       </fileset>
+               </copy>
+       </target>

 </project>
 </project>

diff --git a/android/loghandler.cpp b/android/loghandler.cpp
index b50242041bcc3a4171038defea48765eb440ee5e..3cd2e3b7e5c444e12d1eb19f155dcb98ac31a7c2 100644 (file)
--- a/android/loghandler.cpp
+++ b/android/loghandler.cpp
@@ -47,12 +47,12 @@ int AndroidLogHandler::sr_callback(void *cb_data, int loglevel, const char *form
 
        /* Only output messages of at least the selected loglevel(s). */
        if (loglevel > sr_log_loglevel_get())
 
        /* Only output messages of at least the selected loglevel(s). */
        if (loglevel > sr_log_loglevel_get())

-               return SR_OK; /* TODO? */
+               return SR_OK;

 
        if (loglevel < SR_LOG_NONE)
 
        if (loglevel < SR_LOG_NONE)

-         loglevel = SR_LOG_NONE;
+               loglevel = SR_LOG_NONE;

        else if (loglevel > SR_LOG_SPEW)
        else if (loglevel > SR_LOG_SPEW)

-         loglevel = SR_LOG_SPEW;
+               loglevel = SR_LOG_SPEW;

 
        ret = __android_log_vprint(prio[loglevel], "sr", format, args);
 
 
        ret = __android_log_vprint(prio[loglevel], "sr", format, args);
 


@@ -77,12 +77,12 @@ int AndroidLogHandler::srd_callback(void *cb_data, int loglevel, const char *for
 
        /* Only output messages of at least the selected loglevel(s). */
        if (loglevel > srd_log_loglevel_get())
 
        /* Only output messages of at least the selected loglevel(s). */
        if (loglevel > srd_log_loglevel_get())

-               return SRD_OK; /* TODO? */
+               return SRD_OK;

 
        if (loglevel < SRD_LOG_NONE)
 
        if (loglevel < SRD_LOG_NONE)

-         loglevel = SRD_LOG_NONE;
+               loglevel = SRD_LOG_NONE;

        else if (loglevel > SRD_LOG_SPEW)
        else if (loglevel > SRD_LOG_SPEW)

-         loglevel = SRD_LOG_SPEW;
+               loglevel = SRD_LOG_SPEW;

 
        ret = __android_log_vprint(prio[loglevel], "srd", format, args);
 
 
        ret = __android_log_vprint(prio[loglevel], "srd", format, args);
 

diff --git a/android/res/layout/splash.xml b/android/res/layout/splash.xml
index 6875521a128f70d1b032699bf578278045310408..df3675440d16124e81391e2098ee6c76eab90579 100644 (file)
--- a/android/res/layout/splash.xml
+++ b/android/res/layout/splash.xml
@@ -1,2 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>

-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" />
+<!--
+
+   This file is part of the PulseView project.
+
+   Copyright (C) 2014 Marcus Comstedt <marcus@mc.pp.se>
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"/>

diff --git a/android/res/values/libs.xml b/android/res/values/libs.xml
index 8aa5afaee408298c689136ad0d3a47bae6a0fe22..14555f29b216cfffc916ba68586dbcafa131720f 100644 (file)
--- a/android/res/values/libs.xml
+++ b/android/res/values/libs.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
 <?xml version='1.0' encoding='utf-8'?>
 <resources>

-    <array name="qt_sources">
-        <item>https://download.qt-project.org/ministro/android/qt5/qt-5.3</item>
-    </array>
-
-     <array name="qt_libs">
-         <!-- %%INSERT_QT_LIBS%% -->
-         <item>Qt5Core</item>
-         <item>Qt5Gui</item>
-         <item>Qt5Widgets</item>
-         <item>Qt5Svg</item>
-     </array>
-
-    <array name="bundled_in_lib">
-        <!-- %%INSERT_BUNDLED_IN_LIB%% -->
-    </array>
-    <array name="bundled_in_assets">
-        <!-- %%INSERT_BUNDLED_IN_ASSETS%% -->
-    </array>
-
+       <array name="qt_sources">
+               <item>https://download.qt-project.org/ministro/android/qt5/qt-5.3</item>
+       </array>
+       <array name="qt_libs">
+               <!-- %%INSERT_QT_LIBS%% -->
+               <item>Qt5Core</item>
+               <item>Qt5Gui</item>
+               <item>Qt5Widgets</item>
+               <item>Qt5Svg</item>
+       </array>
+       <array name="bundled_in_lib">
+               <!-- %%INSERT_BUNDLED_IN_LIB%% -->
+       </array>
+       <array name="bundled_in_assets">
+               <!-- %%INSERT_BUNDLED_IN_ASSETS%% -->
+       </array>

 </resources>
 </resources>

diff --git a/android/res/values/strings-pv.xml b/android/res/values/strings-pv.xml
index 991a086dc2b45606307639cc9cf2c5beafda1a26..729273a5d6304f9b952653eda54ec828568c4a25 100644 (file)
--- a/android/res/values/strings-pv.xml
+++ b/android/res/values/strings-pv.xml
@@ -1,4 +1,4 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
 <?xml version='1.0' encoding='utf-8'?>
 <resources>

-    <string name="pv_app_name">PulseView</string>
+       <string name="pv_app_name">PulseView</string>

 </resources>
 </resources>

diff --git a/android/src/org/sigrok/pulseview/PulseViewActivity.java b/android/src/org/sigrok/pulseview/PulseViewActivity.java
index 32f6c79ba75d99ea3e0f7934e877a4cefb1f214f..cdd914952038604bedb3d94f4f0cdabfe04ca3ea 100644 (file)
--- a/android/src/org/sigrok/pulseview/PulseViewActivity.java
+++ b/android/src/org/sigrok/pulseview/PulseViewActivity.java
@@ -26,26 +26,26 @@ import android.os.Bundle;
 
 public class PulseViewActivity extends QtActivity
 {
 
 public class PulseViewActivity extends QtActivity
 {

-    private UsbSupplicant supplicant;
+       private UsbSupplicant supplicant;

 
 

-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-       super.onCreate(savedInstanceState);
-       supplicant = new UsbSupplicant(getApplicationContext(), R.xml.device_filter);
-    }
+       @Override
+       public void onCreate(Bundle savedInstanceState)
+       {
+               super.onCreate(savedInstanceState);
+               supplicant = new UsbSupplicant(getApplicationContext(), R.xml.device_filter);
+       }

 
 

-    @Override
-    protected void onStart()
-    {
-        super.onStart();
-       supplicant.start();
-    }
+       @Override
+       protected void onStart()
+       {
+               super.onStart();
+               supplicant.start();
+       }

 
 

-    @Override
-    protected void onStop()
-    {
-       supplicant.stop();
-        super.onStop();
-    }
+       @Override
+       protected void onStop()
+       {
+               supplicant.stop();
+               super.onStop();
+       }

 }
 }

diff --git a/android/src/org/sigrok/pulseview/PulseViewApplication.java b/android/src/org/sigrok/pulseview/PulseViewApplication.java
index ba30b50f7e6431129b736f3d22108972d171747a..55d00d9cb1b97e1a88552d09a1c4c20220749a1b 100644 (file)
--- a/android/src/org/sigrok/pulseview/PulseViewApplication.java
+++ b/android/src/org/sigrok/pulseview/PulseViewApplication.java
@@ -28,12 +28,11 @@ import java.io.IOException;
 
 public class PulseViewApplication extends QtApplication
 {
 
 public class PulseViewApplication extends QtApplication
 {

-    @Override
-    public void onCreate()
-    {
-       Environment.initEnvironment(getApplicationInfo().sourceDir);
-       UsbHelper.setContext(getApplicationContext());
-       super.onCreate();
-    }
+       @Override
+       public void onCreate()
+       {
+               Environment.initEnvironment(getApplicationInfo().sourceDir);
+               UsbHelper.setContext(getApplicationContext());
+               super.onCreate();
+       }

 }
 }

-