From c6f46fa4c2b7481396e90836443104f22ba9a07f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 18 Dec 2018 15:58:03 +0100 Subject: [PATCH] Include guard for headers to support automoc --- ProgressEmitter.cc | 66 ++++++++++++++++++++++++++++++++++++++++++++++ ProgressEmitter.hh | 29 +++++--------------- 2 files changed, 72 insertions(+), 23 deletions(-) create mode 100644 ProgressEmitter.cc diff --git a/ProgressEmitter.cc b/ProgressEmitter.cc new file mode 100644 index 0000000..6eeab40 --- /dev/null +++ b/ProgressEmitter.cc @@ -0,0 +1,66 @@ +/*===========================================================================*\ +* * +* OpenFlipper * + * Copyright (c) 2001-2015, RWTH-Aachen University * + * Department of Computer Graphics and Multimedia * + * All rights reserved. * + * www.openflipper.org * + * * + *---------------------------------------------------------------------------* + * This file is part of OpenFlipper. * + *---------------------------------------------------------------------------* + * * + * Redistribution and use in source and binary forms, with or without * + * modification, are permitted provided that the following conditions * + * are met: * + * * + * 1. Redistributions of source code must retain the above copyright notice, * + * this list of conditions and the following disclaimer. * + * * + * 2. Redistributions in binary form must reproduce the above copyright * + * notice, this list of conditions and the following disclaimer in the * + * documentation and/or other materials provided with the distribution. * + * * + * 3. Neither the name of the copyright holder nor the names of its * + * contributors may be used to endorse or promote products derived from * + * this software without specific prior written permission. * + * * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A * + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER * + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF * + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * +* * +\*===========================================================================*/ + +#include "ProgressEmitter.hh" + +ProgressEmitter::ProgressEmitter() : valid_(false) {} + +void ProgressEmitter::attachJob(const QString& _jobId) { + jobId_ = _jobId; + valid_ = true; +} + +void ProgressEmitter::detachJob() { + jobId_ = ""; + valid_ = false; +} + +void ProgressEmitter::sendProgressSignal(double _percent) { + if(!valid_) return; + emit signalJobState(jobId_, (int)_percent); + +} + +void ProgressEmitter::sendChangeDescriptionSignal(QString _description) { + if(!valid_) return; + emit changeDescription(jobId_, _description); +} + diff --git a/ProgressEmitter.hh b/ProgressEmitter.hh index 66c4f12..78421ce 100644 --- a/ProgressEmitter.hh +++ b/ProgressEmitter.hh @@ -47,8 +47,7 @@ * * \*===========================================================================*/ -#ifndef PROGRESSEMITTER_HH -#define PROGRESSEMITTER_HH +#pragma once #include #include @@ -64,29 +63,15 @@ class ProgressEmitter : public QObject void backupRequest(int _objId, QString _desc); public: - ProgressEmitter() : valid_(false) {} + ProgressEmitter(); - void attachJob(const QString& _jobId) { - jobId_ = _jobId; - valid_ = true; - } + void attachJob(const QString& _jobId); - void detachJob() { - jobId_ = ""; - valid_ = false; - } + void detachJob(); - void sendProgressSignal(double _percent) { - if(!valid_) return; - emit signalJobState(jobId_, (int)_percent); -// std::cerr << "Job State for " << jobId_.toStdString() << ": " << (int)_percent << "%" << std::endl; - } + void sendProgressSignal(double _percent); - void sendChangeDescriptionSignal(QString _description) { - if(!valid_) return; - emit changeDescription(jobId_, _description); -// std::cerr << "Job description for " << jobId_.toStdString() << ": '" << _description.toStdString() << "'" << std::endl; - } + void sendChangeDescriptionSignal(QString _description); private: QString jobId_; @@ -94,5 +79,3 @@ class ProgressEmitter : public QObject bool valid_; }; - -#endif //PROGRESSEMITTER_HH -- GitLab