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

List:       kde-commits
Subject:    KDE/kdelibs/kio/kio
From:       David Faure <faure () kde ! org>
Date:       2007-11-26 10:53:35
Message-ID: 1196074415.075287.17498.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 741757 by dfaure:

Fix overloaded-virtual warning by moving SimpleJob::slotInfoMessage to a private slot;
doesn't need to be a protected virtual since we have a signal anyway.


 M  +3 -3      job.cpp  
 M  +7 -0      job_p.h  
 M  +2 -8      jobclasses.h  


--- trunk/KDE/kdelibs/kio/kio/job.cpp #741756:741757
@@ -409,7 +409,7 @@
                 SLOT( slotWarning( const QString & ) ) );
 
     q->connect( slave, SIGNAL( infoMessage( const QString & ) ),
-                SLOT( slotInfoMessage( const QString & ) ) );
+                SLOT( _k_slotSlaveInfoMessage( const QString & ) ) );
 
     q->connect( slave, SIGNAL( connected() ),
                 SLOT( slotConnected() ) );
@@ -521,9 +521,9 @@
     emit warning( this, errorText );
 }
 
-void SimpleJob::slotInfoMessage( const QString & msg )
+void SimpleJobPrivate::_k_slotSlaveInfoMessage( const QString & msg )
 {
-    emit infoMessage( this, msg );
+    emit q_func()->infoMessage( q_func(), msg );
 }
 
 void SimpleJobPrivate::slotConnected()
--- trunk/KDE/kdelibs/kio/kio/job_p.h #741756:741757
@@ -126,6 +126,13 @@
         void slotTotalSize( KIO::filesize_t data_size );
 
         /**
+         * Called on a slave's info message.
+         * @param s the info message
+         * @see infoMessage()
+         */
+        void _k_slotSlaveInfoMessage( const QString &s );
+
+        /**
          * @internal
          * Called by the scheduler when a slave gets to
          * work on this job.
--- trunk/KDE/kdelibs/kio/kio/jobclasses.h #741756:741757
@@ -37,7 +37,7 @@
 
     /**
      * Flags for the job properties.
-     * Not all flags are supported in all cases. Please see documentation of 
+     * Not all flags are supported in all cases. Please see documentation of
      * the calling function!
      */
     enum JobFlag {
@@ -386,13 +386,6 @@
         virtual void slotWarning( const QString & );
 
         /**
-         * Called on a slave's info message.
-	 * @param s the info message
-	 * @see infoMessage()
-         */
-        virtual void slotInfoMessage( const QString &s );
-
-        /**
          * MetaData from the slave is received.
 	 * @param _metaData the meta data
 	 * @see metaData()
@@ -419,6 +412,7 @@
         Q_PRIVATE_SLOT(d_func(), void slotProcessedSize( KIO::filesize_t data_size ))
         Q_PRIVATE_SLOT(d_func(), void slotSpeed( unsigned long speed ))
         Q_PRIVATE_SLOT(d_func(), void slotTotalSize( KIO::filesize_t data_size ))
+        Q_PRIVATE_SLOT(d_func(), void _k_slotSlaveInfoMessage(const QString&))
 
         Q_DECLARE_PRIVATE(SimpleJob)
     };
[prev in list] [next in list] [prev in thread] [next in thread]