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

List:       kde-commits
Subject:    KDE/kdelibs/kdeui
From:       Michael Jansen <kde () michael-jansen ! biz>
Date:       2008-03-01 3:12:21
Message-ID: 1204341141.151164.29799.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 780808 by mjansen:

- KActionCollection::(read|write)GlobalSetting -> **GlobalShortcuts
- div. @since



 M  +2 -0      actions/kaction.h  
 M  +2 -2      actions/kactioncollection.cpp  
 M  +7 -3      actions/kactioncollection.h  
 M  +2 -2      dialogs/kshortcutseditor.cpp  


--- trunk/KDE/kdelibs/kdeui/actions/kaction.h #780807:780808
@@ -258,6 +258,8 @@
     /**
      * Differs the shortcut from the default setting?
      *
+     * @since 4.1
+     *
      * @return yes/no
      */
     //@{
--- trunk/KDE/kdelibs/kdeui/actions/kactioncollection.cpp #780807:780808
@@ -322,7 +322,7 @@
   d->configIsGlobal = global;
 }
 
-void KActionCollection::readGlobalSettings( KConfigGroup* config )
+void KActionCollection::readGlobalShortcuts( KConfigGroup* config )
 {
   Q_ASSERT(config);
   if (!config) {
@@ -384,7 +384,7 @@
   //kDebug(125) << " done";
 }
 
-void KActionCollection::writeGlobalSettings( KConfigGroup* config, bool writeAll, \
QAction* oneAction ) const +void KActionCollection::writeGlobalShortcuts( \
KConfigGroup* config, bool writeAll, QAction* oneAction ) const  {
   Q_ASSERT(config);
   if (!config) {
--- trunk/KDE/kdelibs/kdeui/actions/kactioncollection.h #780807:780808
@@ -145,23 +145,27 @@
     * in the group set by setConfigGroup().
     */
   void readSettings( KConfigGroup* config = 0 );
-  
+
   /**
     * Read from @p config all configurable global key associations.
     *
+    * \since 4.1
+    *
     * \param config Config object to read from
     */
-  void readGlobalSettings( KConfigGroup* config );
+  void readGlobalShortcuts( KConfigGroup* config );
 
   /**
     * Write the current configurable global key associations to @p config.
     *
+    * \since 4.1
+    *
     * \param config Config object to save to
     * \param writeDefaults set to true to write settings which are already at \
                defaults.
     * \param oneAction pass an action here if you just want to save the values for \
                one action, eg.
     *                  if you know that action is the only one which has changed.
     */
-  void writeGlobalSettings( KConfigGroup* config = 0, bool writeDefaults = false, \
QAction* oneAction = 0 ) const; +  void writeGlobalShortcuts( KConfigGroup* config, \
bool writeDefaults = false, QAction* oneAction = 0 ) const;  
   /**
     * Write the current configurable key associations to @p config,
--- trunk/KDE/kdelibs/kdeui/dialogs/kshortcutseditor.cpp #780807:780808
@@ -137,7 +137,7 @@
         QString groupName = "Global Shortcuts";
         KConfigGroup group( config, groupName );
         foreach (KActionCollection* collection, d->actionCollections) {
-            collection->readGlobalSettings( &group );
+            collection->readGlobalShortcuts( &group );
         }
     }
     if (d->actionTypes & !KShortcutsEditor::GlobalAction) {
@@ -155,7 +155,7 @@
         QString groupName = "Global Shortcuts";
         KConfigGroup group( config, groupName );
         foreach (KActionCollection* collection, d->actionCollections) {
-            collection->writeGlobalSettings( &group, true );
+            collection->writeGlobalShortcuts( &group, true );
         }
     }
     if (d->actionTypes & !KShortcutsEditor::GlobalAction) {


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