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

List:       kde-commits
Subject:    new_kcm_code: kdelibs/kutils
From:       Frans Englich <frans.englich () telia ! com>
Date:       2004-11-14 21:30:46
Message-ID: 20041114213046.ED0E216DCF () office ! kde ! org
[Download RAW message or body]

CVS commit by englich: 

Docs, deprecate API.


  M +4 -4      kcmodulecontainer.cpp   1.1.2.6
  M +4 -4      kcmodulecontainer.h   1.1.2.5
  M +0 -1      kcmoduleloader.h   1.17.2.8
  M +14 -7     kcmultidialog.h   1.31.4.6


--- kdelibs/kutils/kcmultidialog.h  #1.31.4.5:1.31.4.6
@@ -82,4 +82,5 @@ public:
      * render them useless, it is a good idea to use another constructor. In KDE 4 
      * the argument @p user3 will be removed.
+     *
      * @param dialogFace You can use TreeList, Tabbed, Plain, Swallow or
      *        IconList.
@@ -101,6 +102,6 @@ public:
             const KGuiItem &user3=KGuiItem(), int buttonMask=User2,
             const QString &caption=i18n("Configure"), QWidget *parent=0,
-            const char *name=0, bool modal=false );
-    // KDE4 remove the user3 argument... We need it for the Administrator button..
+            const char *name=0, bool modal=false ) KDE_DEPRECATED;
+    // KDE4 remove the user3 argument, and instead initialize it to KStdGuiItem::adminMode.
 
     /**
@@ -233,11 +234,12 @@ private slots:
     void clientChanged(bool state);
 
+    /**
+     * Called when the current module exits from root 
+     * mode. Enables the Administrator Mode button, again.
+     *
+     * @since 3.4
+     */
     void rootExit();
 
-private:
-
-    void init();
-    void apply();
-
     /**
      *
@@ -249,4 +251,9 @@ private:
     void dialogClosed();
 
+private:
+
+    void init();
+    void apply();
+
     struct CreatedModule
     {

--- kdelibs/kutils/kcmodulecontainer.cpp  #1.1.2.5:1.1.2.6
@@ -168,9 +168,9 @@ void KCModuleContainer::tabSwitched( QWi
         KCModuleProxy* mod = (KCModuleProxy *) module;
 
-        if ( mod->moduleInfo().needsRootPrivileges() && !mod->rootMode() )
+        if ( mod->moduleInfo().needsRootPrivileges() && !mod->runningRoot() )
         {
                 d->btnRootMode->setEnabled( true );
                 connect( d->btnRootMode, SIGNAL( clicked() ), 
-                                SLOT( rootMode() ));
+                                SLOT( runAsRoot() ));
                 connect( mod, SIGNAL( childClosed() ), 
                                 SLOT ( rootExited() ));
@@ -184,5 +184,5 @@ void KCModuleContainer::tabSwitched( QWi
 }
 
-void KCModuleContainer::rootMode()
+void KCModuleContainer::runAsRoot()
 {
         if ( d->tabWidget->currentPage() )
@@ -193,5 +193,5 @@ void KCModuleContainer::rootMode()
 void KCModuleContainer::rootExited()
 {
-        connect( d->btnRootMode, SIGNAL( clicked() ), SLOT( rootMode() ));
+        connect( d->btnRootMode, SIGNAL( clicked() ), SLOT( runAsRoot() ));
         d->btnRootMode->setEnabled( true );
 }

--- kdelibs/kutils/kcmodulecontainer.h  #1.1.2.4:1.1.2.5
@@ -48,5 +48,5 @@ class KCModuleProxy;
  *
  * @author Frans Englich <frans.englich@telia.com>
- * @since 3.3
+ * @since 3.4
  */
 class KUTILS_EXPORT KCModuleContainer : public KCModule
@@ -145,5 +145,5 @@ class KUTILS_EXPORT KCModuleContainer : 
                  * Called when the user clicks our custom root button.
                  */
-                void rootMode();
+                void runAsRoot();
 
                 /**
@@ -162,5 +162,5 @@ class KUTILS_EXPORT KCModuleContainer : 
 
 /**
- * This define creates an factory declaration which when run creates an KCModule with specified 
+ * This macro creates an factory declaration which when run creates an KCModule with specified 
  * modules. For example:
  * \code

--- kdelibs/kutils/kcmoduleloader.h  #1.17.2.7:1.17.2.8
@@ -40,5 +40,4 @@ class KLibLoader;
  * @author Frans Englich <frans.englich@telia.com>
  * @since 3.2
- * @internal
  */
 class KUTILS_EXPORT KCModuleLoader


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