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

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdepim/certmanager
From:       Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date:       2004-10-19 20:38:00
Message-ID: 20041019203800.AE0DD16C17 () office ! kde ! org
[Download RAW message or body]

CVS commit by mutz: 

Merge from HEAD (1/3): reduce diff (no code changes)


  M +1 -0      .cvsignore   1.4.2.1
  M +1 -0      conf/.cvsignore   1.3.2.1
  M +3 -3      conf/dnorderconfigpage.h   1.1.2.1
  M +1 -0      kwatchgnupg/.cvsignore   1.1.4.1
  M +1 -0      lib/.cvsignore   1.3.2.1
  M +1 -0      lib/backends/.cvsignore   1.3.2.1
  M +1 -0      lib/backends/kpgp/.cvsignore   1.1.6.1
  M +1 -0      lib/backends/qgpgme/.cvsignore   1.3.2.1
  M +6 -6      lib/backends/qgpgme/gnupgprocessbase.h   1.4.6.1
  M +1 -0      lib/kleo/.cvsignore   1.3.2.1
  M +1 -0      lib/pics/.cvsignore   1.2.4.1
  M +1 -0      lib/tests/.cvsignore   1.3.2.1
  M +1 -0      lib/ui/.cvsignore   1.4.2.1
  M +4 -4      lib/ui/progressbar.h   1.5.2.1
  M +1 -1      lib/ui/progressdialog.h   1.6.2.1


--- kdepim/certmanager/conf/dnorderconfigpage.h  #1.1:1.1.2.1
@@ -47,9 +47,9 @@ public:
   DNOrderConfigPage( QWidget * parent=0, const char * name=0 );
 
-  /*! \reimp */
+  /*! reimplementation */
   void load();
-  /*! \reimp */
+  /*! reimplementation */
   void save();
-  /*! \reimp */
+  /*! reimplementation */
   void defaults();
 

--- kdepim/certmanager/conf/.cvsignore  #1.3:1.3.2.1
@@ -1,4 +1,5 @@
 Makefile
 Makefile.in
+Doxyfile
 appearanceconfigwidgetbase.cpp
 appearanceconfigwidgetbase.h

--- kdepim/certmanager/lib/backends/qgpgme/gnupgprocessbase.h  #1.4:1.4.6.1
@@ -54,5 +54,5 @@ namespace Kleo {
     void setUseStatusFD( bool use );
 
-    /*! \reimp */
+    /*! reimplementation */
     bool start( RunMode runmode, Communication comm );
 
@@ -63,9 +63,9 @@ namespace Kleo {
 
   protected:
-    /* !\reimp */
+    /*! reimplementation */
     int setupCommunication( Communication comm );
-    /* !\reimp */
+    /*! reimplementation */
     int commSetupDoneP();
-    /* !\reimp */
+    /*! reimplementation */
     int commSetupDoneC();
 
@@ -83,5 +83,5 @@ namespace Kleo {
     Private * d;
   protected:
-    /*! \reimp */
+    /*! reimplementation */
     void virtual_hook( int id, void * data );
   };

--- kdepim/certmanager/lib/backends/qgpgme/.cvsignore  #1.3:1.3.2.1
@@ -1,2 +1,3 @@
 Makefile.in
 Makefile
+Doxyfile

--- kdepim/certmanager/lib/ui/progressbar.h  #1.5:1.5.2.1
@@ -51,11 +51,11 @@ namespace Kleo {
     void slotProgress( const QString & message, int type, int current, int total );
     void slotProgress( const QString & message, int current, int total );
-    /*! \reimp to support self-powered busy indicator */ 
+    /*! reimplementation to support self-powered busy indicator */
     void setProgress( int progress );
-    /*! \reimp to support self-powered busy indicator */ 
+    /*! reimplementation to support self-powered busy indicator */
     void setTotalSteps( int total );
-    /*! \reimp to support self-powered busy indicator */ 
+    /*! reimplementation to support self-powered busy indicator */
     void reset();
-    /*! \reimp to preserve visibility */
+    /*! reimplementation to preserve visibility */
     void setProgress( int cur, int tot ) { QProgressBar::setProgress( cur, tot ); }
 

--- kdepim/certmanager/lib/ui/progressdialog.h  #1.6:1.6.2.1
@@ -52,5 +52,5 @@ namespace Kleo {
 
   public slots:
-    /*! \reimp */
+    /*! reimplementation */
     void setMinimumDuration( int ms );
 

--- kdepim/certmanager/lib/ui/.cvsignore  #1.4:1.4.2.1
@@ -1,4 +1,5 @@
 Makefile.in
 Makefile
+Doxyfile
 adddirectoryservicedialog.cpp
 adddirectoryservicedialog.h

--- kdepim/certmanager/.cvsignore  #1.4:1.4.2.1
@@ -10,2 +10,3 @@
 kgpgcertmanager
 kleopatra
+Doxyfile

--- kdepim/certmanager/kwatchgnupg/.cvsignore  #1.1:1.1.4.1
@@ -1,3 +1,4 @@
 Makefile
 Makefile.in
+Doxyfile
 kwatchgnupg

--- kdepim/certmanager/lib/.cvsignore  #1.3:1.3.2.1
@@ -1,2 +1,3 @@
 Makefile.in
 Makefile
+Doxyfile

--- kdepim/certmanager/lib/backends/.cvsignore  #1.3:1.3.2.1
@@ -1,2 +1,3 @@
 Makefile.in
 Makefile
+Doxyfile

--- kdepim/certmanager/lib/kleo/.cvsignore  #1.3:1.3.2.1
@@ -1,2 +1,3 @@
 Makefile.in
 Makefile
+Doxyfile

--- kdepim/certmanager/lib/pics/.cvsignore  #1.2:1.2.4.1
@@ -1,2 +1,3 @@
 Makefile.in
 Makefile
+Doxyfile

--- kdepim/certmanager/lib/tests/.cvsignore  #1.3:1.3.2.1
@@ -1,2 +1,3 @@
 Makefile.in
 Makefile
+Doxyfile

--- kdepim/certmanager/lib/backends/kpgp/.cvsignore  #1.1:1.1.6.1
@@ -1,2 +1,3 @@
 Makefile.in
 Makefile
+Doxyfile


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