From 9a22e89125c4c9548fd7c5273fb88e1d393d77a9 Mon Sep 17 00:00:00 2001
From: George Hilliard <thirtythreeforty@gmail.com>
Date: Fri, 26 Oct 2018 09:26:18 -0500
Subject: [PATCH] Cleanup: make impl function order match header, fix
 declaration var name

---
 rtgui/batchqueuepanel.cc | 54 ++++++++++++++++++++--------------------
 rtgui/batchqueuepanel.h  |  2 +-
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/rtgui/batchqueuepanel.cc b/rtgui/batchqueuepanel.cc
index 1679d9365..8da66183a 100644
--- a/rtgui/batchqueuepanel.cc
+++ b/rtgui/batchqueuepanel.cc
@@ -324,13 +324,6 @@ void BatchQueuePanel::addBatchQueueJobs(const std::vector<BatchQueueEntry*>& ent
     }
 }
 
-bool BatchQueuePanel::canStartNext ()
-{
-    // This function is called from the background BatchQueue thread.
-    // It cannot call UI functions, so grab the stored state of qStartStop.
-    return qStartStopState;
-}
-
 void BatchQueuePanel::saveOptions ()
 {
 
@@ -339,6 +332,33 @@ void BatchQueuePanel::saveOptions ()
     options.procQueueEnabled    = qAutoStart->get_active();
 }
 
+bool BatchQueuePanel::handleShortcutKey (GdkEventKey* event)
+{
+    bool ctrl = event->state & GDK_CONTROL_MASK;
+
+    if (ctrl) {
+        switch(event->keyval) {
+        case GDK_KEY_s:
+            if (qStartStop->get_active()) {
+                stopBatchProc();
+            } else {
+                startBatchProc();
+            }
+
+            return true;
+        }
+    }
+
+    return batchQueue->keyPressed (event);
+}
+
+bool BatchQueuePanel::canStartNext ()
+{
+    // This function is called from the background BatchQueue thread.
+    // It cannot call UI functions, so grab the stored state of qStartStop.
+    return qStartStopState;
+}
+
 void BatchQueuePanel::pathFolderButtonPressed ()
 {
 
@@ -368,23 +388,3 @@ void BatchQueuePanel::formatChanged(const Glib::ustring& format)
 {
     options.saveFormatBatch = saveFormatPanel->getFormat();
 }
-
-bool BatchQueuePanel::handleShortcutKey (GdkEventKey* event)
-{
-    bool ctrl = event->state & GDK_CONTROL_MASK;
-
-    if (ctrl) {
-        switch(event->keyval) {
-        case GDK_KEY_s:
-            if (qStartStop->get_active()) {
-                stopBatchProc();
-            } else {
-                startBatchProc();
-            }
-
-            return true;
-        }
-    }
-
-    return batchQueue->keyPressed (event);
-}
diff --git a/rtgui/batchqueuepanel.h b/rtgui/batchqueuepanel.h
index a05d94fe3..74c9750e7 100644
--- a/rtgui/batchqueuepanel.h
+++ b/rtgui/batchqueuepanel.h
@@ -69,7 +69,7 @@ public:
     bool handleShortcutKey (GdkEventKey* event);
 
     // batchqueuelistener interface
-    void queueSizeChanged(int qsize, bool queueEmptied, bool queueError, const Glib::ustring& queueErrorMessage);
+    void queueSizeChanged(int qsize, bool queueRunning, bool queueError, const Glib::ustring& queueErrorMessage);
     bool canStartNext();
 
 private: