[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-10-11 19:29:37
Message-ID: 20041011192937.5628C16C08 () office ! kde ! org
[Download RAW message or body]

CVS commit by englich: 

Small cleanups:
- Forward port win32 merge
- Make reportError public, needed by KCModuleProxy
- Small cosmetics


  M +1 -1      kcmodulecontainer.h   1.1.2.4
  M +1 -0      kcmoduleloader.cpp   1.34.4.4
  M +28 -8     kcmoduleloader.h   1.17.2.5


--- kdelibs/kutils/kcmoduleloader.cpp  #1.34.4.3:1.34.4.4
@@ -122,4 +122,5 @@ KCModule* KCModuleLoader::loadModule(con
    */
 
+  kdDebug(1208) << "TODO main loadModule function" << endl;
   if ( !mod.service() )
   {

--- kdelibs/kutils/kcmoduleloader.h  #1.17.2.4:1.17.2.5
@@ -41,5 +41,5 @@ class KLibLoader;
  * @internal
 **/
-class KCModuleLoader
+class KUTILS_EXPORT KCModuleLoader
 {
   public:
@@ -75,12 +75,20 @@ class KCModuleLoader
      */
     enum ErrorReporting {
-      /** no error reporting is done */
+      /** 
+       * no error reporting is done 
+       * */
       None = 0,
-      /** the error report is shown instead of the KCModule that should have
-       * been loaded */
+      /**
+       * the error report is shown instead of the 
+       * KCModule that should have * been loaded 
+       */
       Inline = 1,
-      /** shows a dialog with the error report */
+      /** 
+       * shows a dialog with the error report 
+       */
       Dialog = 2,
-      /** does both Inline and Dialog */
+      /** 
+       * does both Inline and Dialog 
+       */
       Both = 3
     };
@@ -171,8 +179,22 @@ class KCModuleLoader
     static bool testModule( const KCModuleInfo& module );
 
+    /**
+     * Returns a @see KCModule containing the messages @p report and @p text.
+     *
+     * @param report the type of error reporting, @see ErrorReporting
+     * @param text the main message
+     * @param details any additional details
+     *
+     * @since 3.4
+     * @internal
+     */
+    static KCModule* reportError( ErrorReporting report, const QString & text,
+        QString details, QWidget * parent );
+
   private:
 
     /**
      * Internal loader called by the public loaders.
+     * @internal
      */
     static KCModule* load(const KCModuleInfo &mod, const QString &libname, 
@@ -180,6 +202,4 @@ class KCModuleLoader
         const char * name = 0, const QStringList & args = QStringList() );
 
-    static KCModule* reportError( ErrorReporting report, const QString & text,
-        QString details, QWidget * parent );
 };
 

--- kdelibs/kutils/kcmodulecontainer.h  #1.1.2.3:1.1.2.4
@@ -50,5 +50,5 @@ class KCModuleProxy;
  * @since 3.3
  */
-class KCModuleContainer : public KCModule
+class KUTILS_EXPORT KCModuleContainer : public KCModule
 {
         Q_OBJECT


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