[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeui/actions
From:       David Faure <faure () kde ! org>
Date:       2008-02-05 12:01:56
Message-ID: 1202212916.069115.16457.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 771168 by dfaure:

++docu


 M  +7 -4      kaction.h  


--- trunk/KDE/kdelibs/kdeui/actions/kaction.h #771167:771168
@@ -353,11 +353,11 @@
      * setGlobalShortcut(KShortcut(), KAction::ActiveShortcut | \
                KAction::DefaultShortcut,
      *                   KAction::NoAutoloading)
      * \endcode
-     * \param shortcut global shortcut(s) to assign
+     * \param shortcut global shortcut(s) to assign. Will be ignored unless \p \
                loading is set to NoAutoloading.
      * \param type the type of shortcut to be set, whether the active shortcut, the \
                default shortcut,
      *             or both (the default).
-     * \param loading load the previous shortcut (Autoloading, the default) or \
                really set a new
-     *                shortcut (NoAutoloading).
+     * \param loading load the previous shortcut, which might have been changed by \
the user (Autoloading, the default) +     *                 or really set \param \
                shortcut as the new shortcut (NoAutoloading).
      *
      * \sa KGlobalAccel
      * \sa globalShortcut()
@@ -377,10 +377,13 @@
      * Defaults to false. Note that calling setGlobalShortcut() turns this on \
                automatically.
      *
      * \param allowed set to \e true if this action may have a global shortcut, \
otherwise \e false. +     * \param loading (see setGlobalShortcut). Ignore this \
                parameter.
      */
     void setGlobalShortcutAllowed(bool allowed, GlobalShortcutLoading loading = \
                Autoloading);
-    //^ TODO: document autoloading
+    //^ TODO: NoAutoloading would make little sense in this method, right? We don't \
have the shortcut to set... +    // KDE5: remove loading parameter.
 
+
     KShapeGesture shapeGesture(ShortcutTypes type = ActiveShortcut) const;
     KRockerGesture rockerGesture(ShortcutTypes type = ActiveShortcut) const;
 


[prev in list] [next in list] [prev in thread] [next in thread]