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

List:       kde-commits
Subject:    KDE/kdelibs/kio/kio
From:       Kevin Ottens <ervin () kde ! org>
Date:       2010-11-23 10:38:20
Message-ID: 20101123103820.8EB0FAC8A3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1199951 by ervin:

Remove scheduleJob from the build in KDE_NO_DEPRECATED mode.


 M  +6 -0      scheduler.cpp  
 M  +2 -0      scheduler.h  


--- trunk/KDE/kdelibs/kio/kio/scheduler.cpp #1199950:1199951
@@ -683,7 +683,9 @@
     QMap<QObject *,WId> m_windowList;
 
     void doJob(SimpleJob *job);
+#ifndef KDE_NO_DEPRECATED
     void scheduleJob(SimpleJob *job);
+#endif
     void setJobPriority(SimpleJob *job, int priority);
     void cancelJob(SimpleJob *job);
     void jobFinished(KIO::SimpleJob *job, KIO::Slave *slave);
@@ -770,10 +772,12 @@
     schedulerPrivate->doJob(job);
 }
 
+#ifndef KDE_NO_DEPRECATED
 void Scheduler::scheduleJob(SimpleJob *job)
 {
     schedulerPrivate->scheduleJob(job);
 }
+#endif
 
 void Scheduler::setJobPriority(SimpleJob *job, int priority)
 {
@@ -917,11 +921,13 @@
     proto->queueJob(job);
 }
 
+#ifndef KDE_NO_DEPRECATED
 void SchedulerPrivate::scheduleJob(SimpleJob *job)
 {
     kDebug(7006) << job;
     setJobPriority(job, 1);
 }
+#endif
 
 void SchedulerPrivate::setJobPriority(SimpleJob *job, int priority)
 {
--- trunk/KDE/kdelibs/kio/kio/scheduler.h #1199950:1199951
@@ -125,7 +125,9 @@
          * execution. This just sets the job's priority to 1 now.
          * @param job the job to schedule
          */
+#ifndef KDE_NO_DEPRECATED
         KDE_DEPRECATED static void scheduleJob(SimpleJob *job);
+#endif
 
         /**
          * Changes the priority of @p job; jobs of the same priority run in the order in which
[prev in list] [next in list] [prev in thread] [next in thread]