Skip to content

Commit 1cd5ada

Browse files
committed
Remove last vestiges of DeviceInfo
This removes more of the DeviceInfo things that were not already converted to DeviceSpecs. Signed-off-by: Ed Beroset <beroset@ieee.org>
1 parent ac9ac0b commit 1cd5ada

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/utils/src/devicespecs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const char* CONFIG_FILE = "/etc/asteroid/machine.conf";
2222
const char* HOST_FILE = "/etc/hostname";
2323
const char* OS_RELEASE_FILE = "/etc/os-release";
2424

25-
DeviceSpecs::DeviceInfo()
25+
DeviceSpecs::DeviceSpecs()
2626
: m_settings(CONFIG_FILE, QSettings::IniFormat)
2727
{
2828
QSettings::Status status(m_settings.status());

src/utils/src/devicespecs.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1616
*/
1717

18-
#ifndef DEVICEINFO_H
19-
#define DEVICEINFO_H
18+
#ifndef DEVICESPECS_H
19+
#define DEVICESPECS_H
2020

2121
#include <QObject>
2222
#include <QJSEngine>
@@ -60,4 +60,4 @@ class DeviceSpecs : public QObject
6060
QString m_buildid;
6161
};
6262

63-
#endif // DEVICEINFO_H
63+
#endif // DEVICESPECS_H

src/utils/src/utils_plugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ void UtilsPlugin::registerTypes(const char *uri)
2929
{
3030
Q_ASSERT(uri == QLatin1String("org.asteroid.utils"));
3131

32-
qmlRegisterSingletonType<DeviceSpecs>(uri, 1,0, "DeviceInfo", &DeviceInfo::qmlInstance);
32+
qmlRegisterSingletonType<DeviceSpecs>(uri, 1,0, "DeviceSpecs", &DeviceSpecs::qmlInstance);
3333
qmlRegisterSingletonType<FileInfo>(uri, 1, 0, "FileInfo", &FileInfo::qmlInstance);
3434
qmlRegisterType<BluetoothStatus>(uri, 1, 0, "BluetoothStatus");
3535
}

0 commit comments

Comments
 (0)