Index: Sys/FOP/QueueItem.cls.xml
===================================================================
diff -u -r2337 -r2692
--- Sys/FOP/QueueItem.cls.xml	(.../QueueItem.cls.xml)	(revision 2337)
+++ Sys/FOP/QueueItem.cls.xml	(.../QueueItem.cls.xml)	(revision 2692)
@@ -9,7 +9,6 @@
 <SqlTableName>TaskQueue</SqlTableName>
 <StorageStrategy>SysFOP</StorageStrategy>
 <Super>%Persistent,VHSys.Scheduler.QueueItem</Super>
-<ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="SchedulerClassName">
 <Default>BL.Sys.FOP.Scheduler</Default>
@@ -37,7 +36,7 @@
 <Property name="Task">
 <Description>
 De Task moet expliciet gedefinieerd worden.</Description>
-<Type>Sys.FOP.Task</Type>
+<Type>VHSys.Scheduler.Task</Type>
 <NotInheritable>1</NotInheritable>
 </Property>
 
@@ -65,7 +64,7 @@
 gntNextID()
 	Set NextID=""
 	&SQL(DECLARE crsNextQItem CURSOR FOR 
-	       SELECT ID, SingleLockKey  INTO :NextID, :SingleLockKey  FROM Sys_FOP.TaskQueue  WHERE Status=$$$qsWait ORDER BY Priority DESC, ID)
+	       SELECT ID, SingleLockKey  INTO :NextID, :SingleLockKey  FROM Sys_FOP.TaskQueue  WHERE Status='W' ORDER BY Priority DESC, ID)
 	&SQL(OPEN crsNextQItem)
 	For  &SQL(FETCH crsNextQItem) Quit:(SQLCODE)  Do:($L(SingleLockKey))  Quit:($L(NextID))
 	. d WL^vhDBG("NextID?")
@@ -104,7 +103,7 @@
 <ClassMethod>1</ClassMethod>
 <Implementation><![CDATA[
 	Kill Cnt
-	&SQL(SELECT Count(ID)  INTO :Cnt  FROM Sys_FOP.TaskQueue  WHERE Status=$$$qsStarted OR Status=$$$qsBusy)
+	&SQL(SELECT Count(ID)  INTO :Cnt  FROM Sys_FOP.TaskQueue  WHERE Status='S' OR Status='B')
 	Quit:(SQLCODE) 0
 	Quit +$G(Cnt)
 ]]></Implementation>
@@ -117,7 +116,7 @@
 	Kill arBusyCnt
 	&sql(DECLARE crsBTP CURSOR FOR 
 	       SELECT Priority, Count(ID) Cnt  INTO :Prio, :Cnt  FROM Sys_FOP.TaskQueue  
-           WHERE Status=$$$qsStarted OR Status=$$$qsBusy
+           WHERE Status='S' OR Status='B'
            GROUP BY Priority)
 	&sql(OPEN crsBTP)
 	For  &sql(FETCH crsBTP) Quit:SQLCODE  Set:($L($G(Prio))) arBusyCnt("V",Prio)=Cnt
@@ -134,7 +133,7 @@
 	Set tmpLB=""
 	Kill QItemID
 	&sql(DECLARE crsBTID CURSOR FOR 
-	       SELECT ID  INTO :QItemID  FROM Sys_FOP.TaskQueue  WHERE Status=$$$qsStarted OR Status=$$$qsBusy ORDER BY StatusNum, ID DESC)
+	       SELECT ID  INTO :QItemID  FROM Sys_FOP.TaskQueue  WHERE Status='S' OR Status='B' ORDER BY StatusNum, ID DESC)
 	&sql(OPEN crsBTID)
 	For  &sql(FETCH crsBTID) Quit:SQLCODE  Set:($L($G(QItemID))) tmpLB=tmpLB_$LB(QItemID)
 	&sql(CLOSE crsBTID)