refactor([q-s]*): apply API guidelines

Author: scop

completions/qdbus

@@ -1,6 +1,6 @@
 # Qt qdbus, dcop completion                                -*- shell-script -*-
 
-_qdbus()
+_comp_cmd_qdbus()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -9,6 +9,6 @@ _qdbus()
     COMPREPLY=($(compgen -W '$(command ${words[@]} 2>/dev/null | \
         command sed "s/(.*)//")' -- "$cur"))
 } &&
-    complete -F _qdbus qdbus dcop
+    complete -F _comp_cmd_qdbus qdbus dcop
 
 # ex: filetype=sh

completions/qemu

@@ -1,6 +1,6 @@
 # bash completion for qemu                                 -*- shell-script -*-
 
-_qemu()
+_comp_cmd_qemu()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -104,6 +104,6 @@ _qemu()
         _filedir
     fi
 } &&
-    complete -F _qemu qemu qemu-kvm qemu-system-i386 qemu-system-x86_64
+    complete -F _comp_cmd_qemu qemu qemu-kvm qemu-system-i386 qemu-system-x86_64
 
 # ex: filetype=sh

completions/qrunner

@@ -1,6 +1,6 @@
 # mailman qrunner completion                               -*- shell-script -*-
 
-_qrunner()
+_comp_cmd_qrunner()
 {
     local cur prev words cword split comp_args
     _comp_initialize -s -- "$@" || return
@@ -13,6 +13,6 @@ _qrunner()
     fi
 
 } &&
-    complete -F _qrunner qrunner
+    complete -F _comp_cmd_qrunner qrunner
 
 # ex: filetype=sh

completions/querybts

@@ -1,6 +1,6 @@
 # querybts completion                                      -*- shell-script -*-
 
-_querybts()
+_comp_cmd_querybts()
 {
     local cur prev words cword split comp_args
     _comp_initialize -s -- "$@" || return
@@ -37,6 +37,6 @@ _querybts()
             www.debian.org $(_comp_xfunc apt-cache packages)' -- "$cur"))
     fi
 } &&
-    complete -F _querybts querybts
+    complete -F _comp_cmd_querybts querybts
 
 # ex: filetype=sh

completions/quota

@@ -1,6 +1,6 @@
 # bash completion for quota-tools                          -*- shell-script -*-
 
-_user_or_group()
+_comp_cmd_quota__user_or_group()
 {
     local i
 
@@ -16,35 +16,35 @@ _user_or_group()
     COMPREPLY=($(compgen -u -- "$cur"))
 }
 
-_quota_parse_help()
+_comp_cmd_quota__parse_help()
 {
     COMPREPLY=($(
         compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
     ))
     [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 }
 
-_quota_formats()
+_comp_cmd_quota__formats()
 {
     COMPREPLY=($(compgen -W 'vfsold vfsv0 rpc xfs' -- "$cur"))
 }
 
-_filesystems()
+_comp_cmd_quota__filesystems()
 {
     #  Only list filesystems starting with "/", otherwise we also get
     #+ "binfmt_misc", "proc", "tmpfs", ...
     COMPREPLY=($(compgen -W "$(awk '/^\// {print $1}' /etc/mtab)" \
         -- "$cur"))
 }
 
-_quota()
+_comp_cmd_quota()
 {
     local cur prev words cword split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
         -F | --format)
-            _quota_formats
+            _comp_cmd_quota__formats
             return
             ;;
         -h | --help | -V | --version)
@@ -55,25 +55,25 @@ _quota()
     $split && return
 
     if [[ $cur == -* ]]; then
-        _quota_parse_help "$1"
+        _comp_cmd_quota__parse_help "$1"
     else
-        _user_or_group
+        _comp_cmd_quota__user_or_group
     fi
 } &&
-    complete -F _quota -o default quota
+    complete -F _comp_cmd_quota -o default quota
 
-_setquota()
+_comp_cmd_setquota()
 {
     local cur prev words cword split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
         -F | --format)
-            _quota_formats
+            _comp_cmd_quota__formats
             return
             ;;
         -p | --prototype)
-            _user_or_group
+            _comp_cmd_quota__user_or_group
             return
             ;;
         -h | --help | -V | --version)
@@ -84,40 +84,40 @@ _setquota()
     $split && return
 
     if [[ $cur == -* ]]; then
-        _quota_parse_help "$1"
+        _comp_cmd_quota__parse_help "$1"
     else
         local args
         _count_args
 
         case $args in
             1)
-                _user_or_group
+                _comp_cmd_quota__user_or_group
                 ;;
             2)
-                _filesystems
+                _comp_cmd_quota__filesystems
                 ;;
         esac
 
     fi
 } &&
-    complete -F _setquota -o default setquota
+    complete -F _comp_cmd_setquota -o default setquota
 
-_edquota()
+_comp_cmd_edquota()
 {
     local cur prev words cword split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
         -F | --format)
-            _quota_formats
+            _comp_cmd_quota__formats
             return
             ;;
         -f | --filesystem)
-            _filesystems
+            _comp_cmd_quota__filesystems
             return
             ;;
         -p | --prototype)
-            _user_or_group
+            _comp_cmd_quota__user_or_group
             return
             ;;
         -h | --help | -V | --version)
@@ -128,21 +128,21 @@ _edquota()
     $split && return
 
     if [[ $cur == -* ]]; then
-        _quota_parse_help "$1"
+        _comp_cmd_quota__parse_help "$1"
     else
-        _user_or_group
+        _comp_cmd_quota__user_or_group
     fi
 } &&
-    complete -F _edquota -o default edquota
+    complete -F _comp_cmd_edquota -o default edquota
 
-_quotacheck()
+_comp_cmd_quotacheck()
 {
     local cur prev words cword split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
         -F | --format)
-            _quota_formats
+            _comp_cmd_quota__formats
             return
             ;;
         -h | --help | -V | --version)
@@ -153,21 +153,21 @@ _quotacheck()
     $split && return
 
     if [[ $cur == -* ]]; then
-        _quota_parse_help "$1"
+        _comp_cmd_quota__parse_help "$1"
     else
-        _filesystems
+        _comp_cmd_quota__filesystems
     fi
 } &&
-    complete -F _quotacheck -o default quotacheck repquota
+    complete -F _comp_cmd_quotacheck -o default quotacheck repquota
 
-_quotaon()
+_comp_cmd_quotaon()
 {
     local cur prev words cword split comp_args
     _comp_initialize -s -- "$@" || return
 
     case $prev in
         -F | --format)
-            _quota_formats
+            _comp_cmd_quota__formats
             return
             ;;
         -x | --xfs-command)
@@ -182,11 +182,11 @@ _quotaon()
     $split && return
 
     if [[ $cur == -* ]]; then
-        _quota_parse_help "$1"
+        _comp_cmd_quota__parse_help "$1"
     else
-        _filesystems
+        _comp_cmd_quota__filesystems
     fi
 } &&
-    complete -F _quotaon -o default quotaon quotaoff
+    complete -F _comp_cmd_quotaon -o default quotaon quotaoff
 
 # ex: filetype=sh

completions/radvdump

@@ -1,6 +1,6 @@
 # radvdump(8) completion                                   -*- shell-script -*-
 
-_radvdump()
+_comp_cmd_radvdump()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -17,6 +17,6 @@ _radvdump()
 
     COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 } &&
-    complete -F _radvdump radvdump
+    complete -F _comp_cmd_radvdump radvdump
 
 # ex: filetype=sh

completions/rcs

@@ -1,6 +1,6 @@
 # bash completion for rcs                                  -*- shell-script -*-
 
-_rcs()
+_comp_cmd_rcs()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -31,6 +31,6 @@ _rcs()
     # otherwise, default to directories
     [[ ${#COMPREPLY[@]} -eq 0 && $1 == *ci ]] && _filedir || _filedir -d
 } &&
-    complete -F _rcs ci co rlog rcs rcsdiff
+    complete -F _comp_cmd_rcs ci co rlog rcs rcsdiff
 
 # ex: filetype=sh

completions/rdesktop

@@ -1,6 +1,6 @@
 # bash completion for rdesktop                             -*- shell-script -*-
 
-_rdesktop()
+_comp_cmd_rdesktop()
 {
     local cur prev words cword comp_args
     _comp_initialize -n : -- "$@" || return
@@ -54,6 +54,6 @@ _rdesktop()
     fi
 
 } &&
-    complete -F _rdesktop rdesktop
+    complete -F _comp_cmd_rdesktop rdesktop
 
 # ex: filetype=sh

completions/remove_members

@@ -1,6 +1,6 @@
 # mailman remove_members completion                        -*- shell-script -*-
 
-_remove_members()
+_comp_cmd_remove_members()
 {
     local cur prev words cword split comp_args
     _comp_initialize -s -- "$@" || return
@@ -22,6 +22,6 @@ _remove_members()
     fi
 
 } &&
-    complete -F _remove_members remove_members
+    complete -F _comp_cmd_remove_members remove_members
 
 # ex: filetype=sh

completions/removepkg

@@ -1,6 +1,6 @@
 # Slackware Linux removepkg completion                     -*- shell-script -*-
 
-_removepkg()
+_comp_cmd_removepkg()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -20,6 +20,6 @@ _removepkg()
         compgen -f -- "$cur"
     ))
 } &&
-    complete -F _removepkg removepkg
+    complete -F _comp_cmd_removepkg removepkg
 
 # ex: filetype=sh