From 4a64465738cdd0cdf4d1310a0d952c007f1da9bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 16 Sep 2017 20:56:32 +0100 Subject: [PATCH] Remove MountEntry class. --- src/core/CMakeLists.txt | 2 -- src/core/mountentry.cpp | 45 ------------------------------------- src/core/mountentry.h | 49 ----------------------------------------- 3 files changed, 96 deletions(-) delete mode 100644 src/core/mountentry.cpp delete mode 100644 src/core/mountentry.h diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index f2624cd..c247027 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -11,7 +11,6 @@ set(CORE_SRC core/diskdevice.cpp core/fstab.cpp core/lvmdevice.cpp - core/mountentry.cpp core/operationrunner.cpp core/operationstack.cpp core/partition.cpp @@ -34,7 +33,6 @@ set(CORE_LIB_HDRS core/diskdevice.h core/fstab.h core/lvmdevice.h - core/mountentry.h core/operationrunner.h core/operationstack.h core/partition.h diff --git a/src/core/mountentry.cpp b/src/core/mountentry.cpp deleted file mode 100644 index 1b570c1..0000000 --- a/src/core/mountentry.cpp +++ /dev/null @@ -1,45 +0,0 @@ -/************************************************************************* - * Copyright (C) 2009, 2010 by Volker Lanz * - * Copyright (C) 2016 by Andrius Štikonas * - * * - * This program 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. * - * * - * This program 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 this program. If not, see .* - *************************************************************************/ - -#include "core/mountentry.h" - -#include - -MountEntry::MountEntry(const QString& n, const QString& p, const QString& t, const QStringList& o, qint32 d, qint32 pn, IdentifyType type) : - name(n), - path(p), - type(t), - options(o), - dumpFreq(d), - passNumber(pn), - identifyType(type) -{ -} - -MountEntry::MountEntry(struct mntent* p, IdentifyType type) : - name(QString::fromUtf8(p->mnt_fsname)), - path(QString::fromUtf8(p->mnt_dir)), - type(QString::fromUtf8(p->mnt_type)), - options(QString::fromUtf8(p->mnt_opts).split(QStringLiteral(","))), - dumpFreq(p->mnt_freq), - passNumber(p->mnt_passno), - identifyType(type) -{ -} - - diff --git a/src/core/mountentry.h b/src/core/mountentry.h deleted file mode 100644 index 1d9018c..0000000 --- a/src/core/mountentry.h +++ /dev/null @@ -1,49 +0,0 @@ -/************************************************************************* - * Copyright (C) 2009, 2010 by Volker Lanz * - * * - * This program 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. * - * * - * This program 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 this program. If not, see .* - *************************************************************************/ - -#if !defined(KPMCORE_MOUNTENTRY_H) - -#define KPMCORE_MOUNTENTRY_H - -#include "util/libpartitionmanagerexport.h" - -#include -#include -#include - -struct mntent; - -class LIBKPMCORE_EXPORT MountEntry -{ -public: - enum IdentifyType { deviceNode, uuid, label }; - -public: - MountEntry(const QString& n, const QString& p, const QString& t, const QStringList& o, qint32 d, qint32 pn, IdentifyType type); - MountEntry(struct mntent* p, IdentifyType type); - -public: - QString name; - QString path; - QString type; - QStringList options; - qint32 dumpFreq; - qint32 passNumber; - IdentifyType identifyType; -}; - -#endif