Skip to content

Commit 574a260

Browse files
neochapayneochapay
committed
Don't use QDebug
1 parent 895ebf4 commit 574a260

10 files changed

+99
-27
lines changed

‎src/lib/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ set(PUBLIC_HEADERS
1818
glaciersettingsplugin.h
1919
glaciersettings_global.h)
2020

21-
add_library(glaciersettings SHARED ${SRC} ${HEADERS} ${PUBLIC_HEADERS})
21+
add_library(glaciersettings SHARED ${SRC} ${HEADERS} ${PUBLIC_HEADERS}
22+
logging.h logging.cpp)
2223
add_library(Glacier::Settings ALIAS glaciersettings)
2324
add_definitions(-DINSTALLLIBDIR="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
2425

‎src/lib/logging.cpp

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/****************************************************************************************
2+
**
3+
** Copyright (C) 2024 Chupligin Sergey <neochapay@gmail.com>
4+
** All rights reserved.
5+
**
6+
** You may use this file under the terms of BSD license as follows:
7+
**
8+
** Redistribution and use in source and binary forms, with or without
9+
** modification, are permitted provided that the following conditions are met:
10+
** * Redistributions of source code must retain the above copyright
11+
** notice, this list of conditions and the following disclaimer.
12+
** * Redistributions in binary form must reproduce the above copyright
13+
** notice, this list of conditions and the following disclaimer in the
14+
** documentation and/or other materials provided with the distribution.
15+
** * Neither the name of the author nor the
16+
** names of its contributors may be used to endorse or promote products
17+
** derived from this software without specific prior written permission.
18+
**
19+
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
20+
** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
21+
** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
22+
** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR
23+
** ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
24+
** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
25+
** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
26+
** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27+
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
28+
** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29+
**
30+
****************************************************************************************/
31+
32+
#include "logging.h"
33+
34+
Q_LOGGING_CATEGORY(lcGlacierSettingsCoreLog, "org.glacier.settings", QtWarningMsg)

‎src/lib/logging.h

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/****************************************************************************************
2+
**
3+
** Copyright (C) 2024 Chupligin Sergey <neochapay@gmail.com>
4+
** All rights reserved.
5+
**
6+
** You may use this file under the terms of BSD license as follows:
7+
**
8+
** Redistribution and use in source and binary forms, with or without
9+
** modification, are permitted provided that the following conditions are met:
10+
** * Redistributions of source code must retain the above copyright
11+
** notice, this list of conditions and the following disclaimer.
12+
** * Redistributions in binary form must reproduce the above copyright
13+
** notice, this list of conditions and the following disclaimer in the
14+
** documentation and/or other materials provided with the distribution.
15+
** * Neither the name of the author nor the
16+
** names of its contributors may be used to endorse or promote products
17+
** derived from this software without specific prior written permission.
18+
**
19+
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
20+
** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
21+
** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
22+
** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR
23+
** ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
24+
** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
25+
** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
26+
** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27+
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
28+
** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29+
**
30+
****************************************************************************************/
31+
32+
#ifndef LOGGING_H
33+
#define LOGGING_H
34+
35+
#include <QLoggingCategory>
36+
37+
Q_DECLARE_LOGGING_CATEGORY(lcGlacierSettingsCoreLog)
38+
39+
#endif // LOGGING_H

‎src/lib/satellitemodel.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2017-2022 Chupligin Sergey <neochapay@gmail.com>
2+
* Copyright (C) 2017-2024 Chupligin Sergey <neochapay@gmail.com>
33
*
44
* This library is free software; you can redistribute it and/or
55
* modify it under the terms of the GNU Library General Public
@@ -17,8 +17,8 @@
1717
* Boston, MA 02110-1301, USA.
1818
*/
1919

20+
#include "logging.h"
2021
#include "satellitemodel.h"
21-
#include <QDebug>
2222
#include <QFile>
2323
#include <QTimer>
2424

@@ -35,11 +35,11 @@ SatelliteModel::SatelliteModel(QObject* parent)
3535
source = QGeoSatelliteInfoSource::createDefaultSource(this);
3636
QStringList aS = QGeoSatelliteInfoSource::availableSources();
3737
for (int i = 0; i < aS.size(); ++i) {
38-
qDebug() << " - " << aS[i];
38+
qCDebug(lcGlacierSettingsCoreLog) << " - " << aS[i];
3939
}
4040

4141
if (!demo && !source) {
42-
qWarning() << "No satellite data source found. Changing to demo mode.";
42+
qCDebug(lcGlacierSettingsCoreLog) << "No satellite data source found. Changing to demo mode.";
4343
demo = true;
4444
}
4545

@@ -78,7 +78,7 @@ QVariant SatelliteModel::data(const QModelIndex& index, int role) const
7878
return QVariant();
7979

8080
if (index.row() >= knownSatellites.count()) {
81-
qWarning() << "SatelliteModel: Index out of bound";
81+
qCWarning(lcGlacierSettingsCoreLog) << "SatelliteModel: Index out of bound";
8282
return QVariant();
8383
}
8484

@@ -145,7 +145,7 @@ bool SatelliteModel::isSingleRequest() const
145145
void SatelliteModel::setSingleRequest(bool single)
146146
{
147147
if (running()) {
148-
qWarning() << "Cannot change single request mode while running";
148+
qCWarning(lcGlacierSettingsCoreLog) << "Cannot change single request mode while running";
149149
return;
150150
}
151151

‎src/lib/settingsmodel.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2017-2022 Chupligin Sergey <neochapay@gmail.com>
2+
* Copyright (C) 2017-2024 Chupligin Sergey <neochapay@gmail.com>
33
*
44
* This library is free software; you can redistribute it and/or
55
* modify it under the terms of the GNU Library General Public
@@ -20,7 +20,6 @@
2020

2121
#include <QAbstractListModel>
2222
#include <QCoreApplication>
23-
#include <QDebug>
2423
#include <QDir>
2524
#include <QJsonDocument>
2625
#include <QJsonObject>

‎src/lib/settingspluginhost.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2022 Chupligin Sergey <neochapay@gmail.com>
2+
* Copyright (C) 2022-2024 Chupligin Sergey <neochapay@gmail.com>
33
*
44
* This library is free software; you can redistribute it and/or
55
* modify it under the terms of the GNU Library General Public
@@ -17,8 +17,8 @@
1717
* Boston, MA 02110-1301, USA.
1818
*/
1919

20+
#include "logging.h"
2021
#include "settingspluginhost.h"
21-
#include <QDebug>
2222
#include <QGuiApplication>
2323
#include <QTranslator>
2424

@@ -32,7 +32,7 @@ SettingsPluginHost::SettingsPluginHost(const QString& fileName, QObject* parent)
3232
if (plugin) {
3333
m_plugin = qobject_cast<GlacierSettingsPlugin*>(plugin);
3434
if (!m_plugin) {
35-
qWarning("Can't cast plugin");
35+
qCWarning(lcGlacierSettingsCoreLog) << "Can't cast plugin";
3636
pluginLoader.unload();
3737
} else {
3838
m_valid = true;
@@ -41,16 +41,16 @@ SettingsPluginHost::SettingsPluginHost(const QString& fileName, QObject* parent)
4141
QTranslator* myappTranslator = new QTranslator(qApp);
4242
if (myappTranslator->load(QLocale(), m_plugin->id(), QLatin1String("_"), QLatin1String("/usr/share/glacier-settings/translations/"))) {
4343
if (qApp->installTranslator(myappTranslator)) {
44-
qDebug() << "Plugin " << m_plugin->id() << " installTranslator() success" << QLocale::system().name();
44+
qCDebug(lcGlacierSettingsCoreLog) << "Plugin " << m_plugin->id() << " installTranslator() success" << QLocale::system().name();
4545
} else {
46-
qWarning() << "Plugin " << m_plugin->id() << " installTranslator() failed" << QLocale::system().name();
46+
qCWarning(lcGlacierSettingsCoreLog) << "Plugin " << m_plugin->id() << " installTranslator() failed" << QLocale::system().name();
4747
}
4848
} else {
49-
qWarning() << "Plugin " << m_plugin->id() << " translation.load() failed" << QLocale::system().name();
49+
qCWarning(lcGlacierSettingsCoreLog) << "Plugin " << m_plugin->id() << " translation.load() failed" << QLocale::system().name();
5050
}
5151

5252
} else {
53-
qDebug() << "Plugin not found" << fileName << pluginLoader.errorString();
53+
qCDebug(lcGlacierSettingsCoreLog) << "Plugin not found" << fileName << pluginLoader.errorString();
5454
}
5555
}
5656

‎src/lib/settingspluginmanager.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2022 Chupligin Sergey <neochapay@gmail.com>
2+
* Copyright (C) 2022-2024 Chupligin Sergey <neochapay@gmail.com>
33
*
44
* This library is free software; you can redistribute it and/or
55
* modify it under the terms of the GNU Library General Public
@@ -17,9 +17,9 @@
1717
* Boston, MA 02110-1301, USA.
1818
*/
1919

20+
#include "logging.h"
2021
#include "settingspluginmanager.h"
2122

22-
#include <QDebug>
2323
#include <QDir>
2424

2525
SettingsPluginManager::SettingsPluginManager()
@@ -32,10 +32,10 @@ SettingsPluginManager::SettingsPluginManager()
3232
m_pluginList.push_back(shp->get());
3333
connect(shp->get(), &GlacierSettingsPlugin::pluginChanged, this, &SettingsPluginManager::pluginDataChanged);
3434
} else {
35-
qDebug() << "Loading" << pluginsDir.absoluteFilePath(file) << " fail";
35+
qCDebug(lcGlacierSettingsCoreLog) << "Loading" << pluginsDir.absoluteFilePath(file) << " fail";
3636
}
3737
} else {
38-
qWarning() << "can't load" << pluginsDir.absoluteFilePath(file);
38+
qCWarning(lcGlacierSettingsCoreLog) << "can't load" << pluginsDir.absoluteFilePath(file);
3939
}
4040
delete (shp);
4141
}

‎src/plugins/about/aboutsettingsplugin.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2022 Chupligin Sergey <neochapay@gmail.com>
2+
* Copyright (C) 2022-2024 Chupligin Sergey <neochapay@gmail.com>
33
*
44
* This library is free software; you can redistribute it and/or
55
* modify it under the terms of the GNU Library General Public
@@ -18,8 +18,6 @@
1818
*/
1919

2020
#include "aboutsettingsplugin.h"
21-
22-
#include <QDebug>
2321
#include <QtPlugin>
2422

2523
AboutSettingsPlugin::AboutSettingsPlugin(QObject* parent)

‎src/plugins/wifi/wifisettingsplugin.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2022 Chupligin Sergey <neochapay@gmail.com>
2+
* Copyright (C) 2022-2024 Chupligin Sergey <neochapay@gmail.com>
33
*
44
* This library is free software; you can redistribute it and/or
55
* modify it under the terms of the GNU Library General Public
@@ -17,6 +17,7 @@
1717
* Boston, MA 02110-1301, USA.
1818
*/
1919

20+
#include <logging.h>
2021
#include "wifisettingsplugin.h"
2122

2223
#include <networktechnology.h>
@@ -37,7 +38,7 @@ WiFiSettingsPlugin::WiFiSettingsPlugin(QObject* parent)
3738
connect(m_wifiTech, &NetworkTechnology::poweredChanged, this, &WiFiSettingsPlugin::onPoweredChanded);
3839
connect(m_wifiTech, &NetworkTechnology::connectedChanged, this, &WiFiSettingsPlugin::onConnectedChanged);
3940
} else {
40-
qDebug() << "WiFi not found";
41+
qCWarning(lcGlacierSettingsCoreLog) << "WiFi not found";
4142
}
4243
}
4344

‎src/plugins/wifi/wifisettingsplugin.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2022 Chupligin Sergey <neochapay@gmail.com>
2+
* Copyright (C) 2022-2024 Chupligin Sergey <neochapay@gmail.com>
33
*
44
* This library is free software; you can redistribute it and/or
55
* modify it under the terms of the GNU Library General Public
@@ -36,7 +36,7 @@ class WiFiSettingsPlugin : public GlacierSettingsPlugin {
3636
QString description() { return m_description; }
3737
QString qmlPath() { return "/usr/share/glacier-settings/plugins/wifi/wifi.qml"; }
3838
QString icon() { return "/usr/share/glacier-settings/plugins/wifi/wifi.svg"; }
39-
bool enabled() { return m_enabled; };
39+
bool enabled() { return m_enabled; }
4040

4141
private slots:
4242
void onPoweredChanded(const bool& powered);

0 commit comments

Comments
 (0)