From 926082e75681b8be6dc51e8f91f93ec10e1924e7 Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Tue, 18 Dec 2018 16:05:13 +0000 Subject: [PATCH] Fixed clazy warning: signal CLineReader::quit hides signal QThread::quit. --- samples/weatherdata/main.cpp | 2 +- samples/weatherdata/reader.cpp | 2 +- samples/weatherdata/reader.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/weatherdata/main.cpp b/samples/weatherdata/main.cpp index 95346ba78..523e14029 100644 --- a/samples/weatherdata/main.cpp +++ b/samples/weatherdata/main.cpp @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) CLineReader lineReader(&a); CWeatherDataPrinter printer(&a); QObject::connect(&lineReader, &CLineReader::weatherDataRequest, &printer, &CWeatherDataPrinter::fetchAndPrintWetherData); - QObject::connect(&lineReader, &CLineReader::quit, &lineReader, &CLineReader::terminate); + QObject::connect(&lineReader, &CLineReader::wantsToQuit, &lineReader, &CLineReader::terminate); QObject::connect(&lineReader, &CLineReader::finished, &a, &QCoreApplication::quit); QTextStream qtout(stdout); diff --git a/samples/weatherdata/reader.cpp b/samples/weatherdata/reader.cpp index 014fb7452..250628ee1 100644 --- a/samples/weatherdata/reader.cpp +++ b/samples/weatherdata/reader.cpp @@ -40,7 +40,7 @@ void CLineReader::run() if (line == "x") { - emit quit(); + emit wantsToQuit(); continue; } diff --git a/samples/weatherdata/reader.h b/samples/weatherdata/reader.h index c5b8956ed..80ad65ec0 100644 --- a/samples/weatherdata/reader.h +++ b/samples/weatherdata/reader.h @@ -38,7 +38,7 @@ signals: void weatherDataRequest(const BlackMisc::Geo::CCoordinateGeodetic &position); //! User is asking to quit - void quit(); + void wantsToQuit(); }; #endif // guard