Big-Ugly Style Update (#278)
* Bulk replaced tabs with spaces * Bulk removed trailing whitespace from lines * Replaced c-style comments with c++-style comments in file banners * Replace nested namespace definitions with single concise definitions (C++17), this keeps the indentation more manageable * Cleanup ordering and spacing of include directives * Bulk renaming of header file extensions from '.h' to '.hpp'. * Update CODING-STYLE.md * Update target_compile_features from cxx_std_11 to cxx_std_20. * Refresh .clang-format file. Still needs a lot of tweaking.
This commit is contained in:
+80
-80
@@ -1,25 +1,25 @@
|
||||
/* PrinterMonitor.cpp
|
||||
*
|
||||
* Copyright (C) 2025 Jaye Evins <evins@snaught.com>
|
||||
*
|
||||
* This file is part of gLabels-qt.
|
||||
*
|
||||
* gLabels-qt is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* gLabels-qt is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
// PrinterMonitor.cpp
|
||||
//
|
||||
// Copyright (C) 2025 Jaye Evins <evins@snaught.com>
|
||||
//
|
||||
// This file is part of gLabels-qt.
|
||||
//
|
||||
// gLabels-qt is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// gLabels-qt is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
|
||||
//
|
||||
|
||||
|
||||
#include "PrinterMonitor.h"
|
||||
#include "PrinterMonitor.hpp"
|
||||
|
||||
#include <QDebug>
|
||||
#include <QMutexLocker>
|
||||
@@ -30,79 +30,79 @@
|
||||
namespace glabels
|
||||
{
|
||||
|
||||
///
|
||||
/// Static data
|
||||
///
|
||||
std::unique_ptr<PrinterMonitor> PrinterMonitor::mInstance;
|
||||
///
|
||||
/// Static data
|
||||
///
|
||||
std::unique_ptr<PrinterMonitor> PrinterMonitor::mInstance;
|
||||
|
||||
|
||||
///
|
||||
/// Constructor
|
||||
///
|
||||
PrinterMonitor::PrinterMonitor()
|
||||
{
|
||||
using namespace std::chrono_literals;
|
||||
///
|
||||
/// Constructor
|
||||
///
|
||||
PrinterMonitor::PrinterMonitor()
|
||||
{
|
||||
using namespace std::chrono_literals;
|
||||
|
||||
mCurrentAvailablePrinters = QPrinterInfo::availablePrinterNames();
|
||||
mCurrentAvailablePrinters = QPrinterInfo::availablePrinterNames();
|
||||
|
||||
mTimer.reset( new QTimer( this ) );
|
||||
connect( mTimer.get(), SIGNAL(timeout()), this, SLOT(onTimerTimeout()) );
|
||||
mTimer->start( 10s );
|
||||
}
|
||||
mTimer.reset( new QTimer( this ) );
|
||||
connect( mTimer.get(), SIGNAL(timeout()), this, SLOT(onTimerTimeout()) );
|
||||
mTimer->start( 10s );
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// Get singleton instance
|
||||
///
|
||||
PrinterMonitor* PrinterMonitor::instance()
|
||||
{
|
||||
if ( !mInstance )
|
||||
{
|
||||
mInstance.reset( new PrinterMonitor() );
|
||||
}
|
||||
///
|
||||
/// Get singleton instance
|
||||
///
|
||||
PrinterMonitor* PrinterMonitor::instance()
|
||||
{
|
||||
if ( !mInstance )
|
||||
{
|
||||
mInstance.reset( new PrinterMonitor() );
|
||||
}
|
||||
|
||||
return mInstance.get();
|
||||
}
|
||||
return mInstance.get();
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// Get available printers
|
||||
///
|
||||
QStringList PrinterMonitor::availablePrinters()
|
||||
{
|
||||
QMutexLocker mutex( &mCurrentAvailablePrintersMutex );
|
||||
return mCurrentAvailablePrinters;
|
||||
}
|
||||
///
|
||||
/// Get available printers
|
||||
///
|
||||
QStringList PrinterMonitor::availablePrinters()
|
||||
{
|
||||
QMutexLocker mutex( &mCurrentAvailablePrintersMutex );
|
||||
return mCurrentAvailablePrinters;
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// On timer timeout
|
||||
///
|
||||
void PrinterMonitor::onTimerTimeout()
|
||||
{
|
||||
// Make sure previous poll is complete before starting a new one
|
||||
if ( mPollStatus.isFinished() )
|
||||
{
|
||||
mPollStatus = QtConcurrent::run( &PrinterMonitor::asyncPoll, this );
|
||||
}
|
||||
}
|
||||
///
|
||||
/// On timer timeout
|
||||
///
|
||||
void PrinterMonitor::onTimerTimeout()
|
||||
{
|
||||
// Make sure previous poll is complete before starting a new one
|
||||
if ( mPollStatus.isFinished() )
|
||||
{
|
||||
mPollStatus = QtConcurrent::run( &PrinterMonitor::asyncPoll, this );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// Asynchronous poll
|
||||
///
|
||||
void PrinterMonitor::asyncPoll()
|
||||
{
|
||||
auto newAvailablePrinters = QPrinterInfo::availablePrinterNames();
|
||||
if ( newAvailablePrinters != mCurrentAvailablePrinters )
|
||||
{
|
||||
QMutexLocker mutex( &mCurrentAvailablePrintersMutex );
|
||||
|
||||
mCurrentAvailablePrinters = newAvailablePrinters;
|
||||
///
|
||||
/// Asynchronous poll
|
||||
///
|
||||
void PrinterMonitor::asyncPoll()
|
||||
{
|
||||
auto newAvailablePrinters = QPrinterInfo::availablePrinterNames();
|
||||
if ( newAvailablePrinters != mCurrentAvailablePrinters )
|
||||
{
|
||||
QMutexLocker mutex( &mCurrentAvailablePrintersMutex );
|
||||
|
||||
mCurrentAvailablePrinters = newAvailablePrinters;
|
||||
|
||||
emit availablePrintersChanged( mCurrentAvailablePrinters );
|
||||
}
|
||||
}
|
||||
|
||||
emit availablePrintersChanged( mCurrentAvailablePrinters );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
} // namespace glabels
|
||||
|
||||
Reference in New Issue
Block a user