[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [solid] src: Fix minor EBN issues
From: Yuri Chornoivan <null () kde ! org>
Date: 2018-09-12 14:54:17
Message-ID: E1g06X3-0008I8-8w () code ! kde ! org
[Download RAW message or body]
Git commit 5abcd3773487ef60914d06c91028acb070bc53f9 by Yuri Chornoivan.
Committed on 12/09/2018 at 14:53.
Pushed by yurchor into branch 'master'.
Fix minor EBN issues
M +2 -2 src/imports/devices_p.h
M +1 -1 src/imports/solidextensionplugin.cpp
M +2 -2 src/imports/solidextensionplugin.h
M +3 -4 src/solid/devices/backends/fakehw/fakedevice.cpp
M +6 -6 src/solid/devices/backends/fstab/fstabhandling.cpp
M +3 -3 src/solid/devices/backends/iokit/dadictionary_p.h
M +7 -1 src/solid/devices/backends/udisks2/udisks2.h
M +5 -4 src/solid/devices/backends/udisks2/udisksblock.cpp
M +3 -3 src/solid/devices/backends/udisks2/udisksblock.h
M +1 -1 src/solid/devices/backends/udisks2/udisksdevice.cpp
M +3 -3 src/solid/devices/backends/udisks2/udisksdevice.h
M +4 -4 src/solid/devices/backends/udisks2/udisksdevicebackend.cpp
M +3 -3 src/solid/devices/backends/udisks2/udisksdeviceinterface.h
M +3 -3 src/solid/devices/backends/udisks2/udisksgenericinterface.h
M +6 -3 src/solid/devices/backends/udisks2/udisksmanager.cpp
M +3 -3 src/solid/devices/backends/udisks2/udisksmanager.h
M +1 -1 src/solid/devices/backends/udisks2/udisksopticaldisc.cpp
M +4 -4 src/solid/devices/backends/udisks2/udisksopticaldisc.h
M +2 -1 src/solid/devices/backends/udisks2/udisksopticaldrive.cpp
M +3 -3 src/solid/devices/backends/udisks2/udisksopticaldrive.h
M +1 -1 src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
M +3 -3 src/solid/devices/backends/udisks2/udisksstorageaccess.h
M +4 -4 src/solid/devices/backends/udisks2/udisksstoragedrive.h
M +2 -2 src/solid/devices/backends/udisks2/udisksstoragevolume.h
M +1 -1 src/solid/devices/backends/upower/upowerdevice.cpp
M +2 -2 src/solid/devices/backends/win/windevicemanager.cpp
M +3 -3 src/solid/power/acpluggedjob_p.h
M +1 -1 src/solid/power/backends/abstractinhibitionjob.h
M +3 -3 src/solid/power/backends/dummy/dummyacpluggedjob.h
M +3 -3 src/solid/power/backends/dummy/dummyinhibitionjob.h
M +3 -3 src/solid/power/backends/freedesktop/fdacpluggedjob.h
M +3 -3 src/solid/power/backends/freedesktop/fdinhibitionjob.h
M +3 -3 src/solid/power/statesjob_p.h
https://commits.kde.org/solid/5abcd3773487ef60914d06c91028acb070bc53f9
diff --git a/src/imports/devices_p.h b/src/imports/devices_p.h
index 7d5a1f9..dcc7521 100644
--- a/src/imports/devices_p.h
+++ b/src/imports/devices_p.h
@@ -15,8 +15,8 @@
* License along with this library. If not, see <http://www.gnu.org/lic=
enses/>.
*/
=
-#ifndef SOLID_DECALARATIVE_DEVICE_NOTIFIER_P_H
-#define SOLID_DECALARATIVE_DEVICE_NOTIFIER_P_H
+#ifndef SOLID_DEVICES_P_H
+#define SOLID_DEVICES_P_H
=
#include "devices.h"
=
diff --git a/src/imports/solidextensionplugin.cpp b/src/imports/solidextens=
ionplugin.cpp
index 6a959f1..f3bd9b1 100644
--- a/src/imports/solidextensionplugin.cpp
+++ b/src/imports/solidextensionplugin.cpp
@@ -17,7 +17,7 @@
=
#include "solidextensionplugin.h"
=
-#include <QtQml>
+#include <QQmlExtensionPlugin>
=
#include "devices.h"
#include "solid/deviceinterface.h"
diff --git a/src/imports/solidextensionplugin.h b/src/imports/solidextensio=
nplugin.h
index d600f32..5dbd0f1 100644
--- a/src/imports/solidextensionplugin.h
+++ b/src/imports/solidextensionplugin.h
@@ -15,8 +15,8 @@
* License along with this library. If not, see <http://www.gnu.org/lic=
enses/>.
*/
=
-#ifndef SOLID_DECLARATIVE_EXTENSION_PLUGIN_H
-#define SOLID_DECLARATIVE_EXTENSION_PLUGIN_H
+#ifndef SOLID_EXTENSION_PLUGIN_H
+#define SOLID_EXTENSION_PLUGIN_H
=
#include <QtQml/QQmlExtensionPlugin>
=
diff --git a/src/solid/devices/backends/fakehw/fakedevice.cpp b/src/solid/d=
evices/backends/fakehw/fakedevice.cpp
index 655e3ed..6150545 100644
--- a/src/solid/devices/backends/fakehw/fakedevice.cpp
+++ b/src/solid/devices/backends/fakehw/fakedevice.cpp
@@ -18,6 +18,7 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
#include "fakedevice.h"
+#include "fakedevice_p.h"
=
#include "fakedeviceinterface.h"
#include "fakegenericinterface.h"
@@ -33,13 +34,11 @@
#include "fakenetworkshare.h"
#include "fakebattery.h"
=
-#include <QtCore/QStringList>
-#include <QtDBus/QDBusConnection>
+#include <QStringList>
+#include <QDBusConnection>
=
#include <solid/genericinterface.h>
=
-#include "fakedevice_p.h"
-
using namespace Solid::Backends::Fake;
=
FakeDevice::FakeDevice(const QString &udi, const QMap<QString, QVariant> &=
propertyMap)
diff --git a/src/solid/devices/backends/fstab/fstabhandling.cpp b/src/solid=
/devices/backends/fstab/fstabhandling.cpp
index 5613736..44a41ec 100644
--- a/src/solid/devices/backends/fstab/fstabhandling.cpp
+++ b/src/solid/devices/backends/fstab/fstabhandling.cpp
@@ -21,15 +21,15 @@
=
#include "fstabhandling.h"
=
-#include <QtCore/QFile>
-#include <QtCore/QObject>
-#include <QtCore/QProcess>
-#include <QtCore/QTextStream>
-#include <QtCore/QTime>
+#include <QFile>
+#include <QObject>
+#include <QProcess>
+#include <QTextStream>
+#include <QTime>
=
#include <solid/devices/soliddefs_p.h>
=
-#include "solid/config-solid.h"
+#include <solid/config-solid.h>
#include <stdlib.h>
=
#if HAVE_SYS_MNTTAB_H
diff --git a/src/solid/devices/backends/iokit/dadictionary_p.h b/src/solid/=
devices/backends/iokit/dadictionary_p.h
index b8d4133..fec6ab3 100644
--- a/src/solid/devices/backends/iokit/dadictionary_p.h
+++ b/src/solid/devices/backends/iokit/dadictionary_p.h
@@ -18,8 +18,8 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#ifndef SOLID_BACKENDS_IOKIT_DADICTIONARY_H
-#define SOLID_BACKENDS_IOKIT_DADICTIONARY_H
+#ifndef SOLID_BACKENDS_IOKIT_DADICTIONARY_P_H
+#define SOLID_BACKENDS_IOKIT_DADICTIONARY_P_H
=
#include <QString>
=
@@ -78,4 +78,4 @@ public:
}
}
=
-#endif // SOLID_BACKENDS_IOKIT_DADICTIONARY_H
+#endif // SOLID_BACKENDS_IOKIT_DADICTIONARY_P_H
diff --git a/src/solid/devices/backends/udisks2/udisks2.h b/src/solid/devic=
es/backends/udisks2/udisks2.h
index e963993..2e6ce90 100644
--- a/src/solid/devices/backends/udisks2/udisks2.h
+++ b/src/solid/devices/backends/udisks2/udisks2.h
@@ -22,7 +22,13 @@
#define SOLID_BACKENDS_UDISKS2_H
=
#include <QMetaType>
-#include <QtDBus>
+#include <QDBusObjectPath>
+#include <QDBusPendingReply>
+#include <QDBusReply>
+#include <QDBusAbstractInterface>
+#include <QPointer>
+#include <QCoreApplication>
+#include <QTimer>
#include <QVariant>
#include <QMap>
#include <QList>
diff --git a/src/solid/devices/backends/udisks2/udisksblock.cpp b/src/solid=
/devices/backends/udisks2/udisksblock.cpp
index c0c39da..5244ecf 100644
--- a/src/solid/devices/backends/udisks2/udisksblock.cpp
+++ b/src/solid/devices/backends/udisks2/udisksblock.cpp
@@ -18,6 +18,8 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
+#include "udisksblock.h"
+
#if defined(Q_OS_LINUX)
#include <linux/kdev_t.h>
#else
@@ -29,12 +31,11 @@
#endif
=
#include <QFile>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusPendingReply>
-#include <QtXml/QDomDocument>
+#include <QDBusConnection>
+#include <QDBusPendingReply>
+#include <QDomDocument>
=
#include "udisks_debug.h"
-#include "udisksblock.h"
=
using namespace Solid::Backends::UDisks2;
=
diff --git a/src/solid/devices/backends/udisks2/udisksblock.h b/src/solid/d=
evices/backends/udisks2/udisksblock.h
index 3753a7e..e92fcae 100644
--- a/src/solid/devices/backends/udisks2/udisksblock.h
+++ b/src/solid/devices/backends/udisks2/udisksblock.h
@@ -18,8 +18,8 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#ifndef UDISKS2BLOCK_H
-#define UDISKS2BLOCK_H
+#ifndef UDISKSBLOCK_H
+#define UDISKSBLOCK_H
=
#include <solid/devices/ifaces/block.h>
#include "udisksdeviceinterface.h"
@@ -55,4 +55,4 @@ private:
}
}
=
-#endif // UDISKS2BLOCK_H
+#endif // UDISKSBLOCK_H
diff --git a/src/solid/devices/backends/udisks2/udisksdevice.cpp b/src/soli=
d/devices/backends/udisks2/udisksdevice.cpp
index 3a83879..7e25a28 100644
--- a/src/solid/devices/backends/udisks2/udisksdevice.cpp
+++ b/src/solid/devices/backends/udisks2/udisksdevice.cpp
@@ -19,8 +19,8 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#include "udisks_debug.h"
#include "udisksdevice.h"
+#include "udisks_debug.h"
#include "udisksdevicebackend.h"
#include "udisksblock.h"
#include "udisksdeviceinterface.h"
diff --git a/src/solid/devices/backends/udisks2/udisksdevice.h b/src/solid/=
devices/backends/udisks2/udisksdevice.h
index 420a0b5..acd77a3 100644
--- a/src/solid/devices/backends/udisks2/udisksdevice.h
+++ b/src/solid/devices/backends/udisks2/udisksdevice.h
@@ -19,8 +19,8 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#ifndef UDISKS2DEVICE_H
-#define UDISKS2DEVICE_H
+#ifndef UDISKSDEVICE_H
+#define UDISKSDEVICE_H
=
#include "udisks2.h"
=
@@ -103,4 +103,4 @@ private:
}
}
=
-#endif // UDISKS2DEVICE_H
+#endif // UDISKSDEVICE_H
diff --git a/src/solid/devices/backends/udisks2/udisksdevicebackend.cpp b/s=
rc/solid/devices/backends/udisks2/udisksdevicebackend.cpp
index 010547b..d106cd7 100644
--- a/src/solid/devices/backends/udisks2/udisksdevicebackend.cpp
+++ b/src/solid/devices/backends/udisks2/udisksdevicebackend.cpp
@@ -20,12 +20,12 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#include "udisks_debug.h"
#include "udisksdevicebackend.h"
+#include "udisks_debug.h"
=
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusInterface>
-#include <QtXml/QDomDocument>
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDomDocument>
=
#include "solid/deviceinterface.h"
#include "solid/genericinterface.h"
diff --git a/src/solid/devices/backends/udisks2/udisksdeviceinterface.h b/s=
rc/solid/devices/backends/udisks2/udisksdeviceinterface.h
index 871aad9..7d9ae5f 100644
--- a/src/solid/devices/backends/udisks2/udisksdeviceinterface.h
+++ b/src/solid/devices/backends/udisks2/udisksdeviceinterface.h
@@ -18,8 +18,8 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#ifndef UDISKS2DEVICEINTERFACE_H
-#define UDISKS2DEVICEINTERFACE_H
+#ifndef UDISKSDEVICEINTERFACE_H
+#define UDISKSDEVICEINTERFACE_H
=
#include <ifaces/deviceinterface.h>
#include "udisksdevice.h"
@@ -110,4 +110,4 @@ public:
}
}
=
-#endif // UDISKS2DEVICEINTERFACE_H
+#endif // UDISKSDEVICEINTERFACE_H
diff --git a/src/solid/devices/backends/udisks2/udisksgenericinterface.h b/=
src/solid/devices/backends/udisks2/udisksgenericinterface.h
index 25610f3..4954190 100644
--- a/src/solid/devices/backends/udisks2/udisksgenericinterface.h
+++ b/src/solid/devices/backends/udisks2/udisksgenericinterface.h
@@ -18,8 +18,8 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#ifndef SOLID_BACKENDS_UDISKS2_GENERICINTERFACE_H
-#define SOLID_BACKENDS_UDISKS2_GENERICINTERFACE_H
+#ifndef SOLID_BACKENDS_UDISKS_GENERICINTERFACE_H
+#define SOLID_BACKENDS_UDISKS_GENERICINTERFACE_H
=
#include <solid/devices/ifaces/genericinterface.h>
#include <solid/genericinterface.h>
@@ -54,4 +54,4 @@ Q_SIGNALS:
}
}
=
-#endif // SOLID_BACKENDS_UDISKS2_GENERICINTERFACE_H
+#endif // SOLID_BACKENDS_UDISKS_GENERICINTERFACE_H
diff --git a/src/solid/devices/backends/udisks2/udisksmanager.cpp b/src/sol=
id/devices/backends/udisks2/udisksmanager.cpp
index 4792d2f..341662c 100644
--- a/src/solid/devices/backends/udisks2/udisksmanager.cpp
+++ b/src/solid/devices/backends/udisks2/udisksmanager.cpp
@@ -22,9 +22,12 @@
#include "udisksdevicebackend.h"
#include "udisks_debug.h"
=
-#include <QtCore/QDebug>
-#include <QtDBus>
-#include <QtXml/QDomDocument>
+#include <QDebug>
+#include <QDBusConnection>
+#include <QDBusObjectPath>
+#include <QDBusMetaType>
+#include <QDBusConnectionInterface>
+#include <QDomDocument>
=
#include "../shared/rootdevice.h"
=
diff --git a/src/solid/devices/backends/udisks2/udisksmanager.h b/src/solid=
/devices/backends/udisks2/udisksmanager.h
index 2c649e7..f2a8bb1 100644
--- a/src/solid/devices/backends/udisks2/udisksmanager.h
+++ b/src/solid/devices/backends/udisks2/udisksmanager.h
@@ -19,8 +19,8 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#ifndef UDISKS2MANAGER_H
-#define UDISKS2MANAGER_H
+#ifndef UDISKSMANAGER_H
+#define UDISKSMANAGER_H
=
#include "udisks2.h"
#include "udisksdevice.h"
@@ -68,4 +68,4 @@ private:
}
}
}
-#endif // UDISKS2MANAGER_H
+#endif // UDISKSMANAGER_H
diff --git a/src/solid/devices/backends/udisks2/udisksopticaldisc.cpp b/src=
/solid/devices/backends/udisks2/udisksopticaldisc.cpp
index 3ad58dd..39a660c 100644
--- a/src/solid/devices/backends/udisks2/udisksopticaldisc.cpp
+++ b/src/solid/devices/backends/udisks2/udisksopticaldisc.cpp
@@ -19,6 +19,7 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
+#include "udisksopticaldisc.h"
#include <sys/types.h>
#include <unistd.h>
#include <sys/stat.h>
@@ -34,7 +35,6 @@
=
#include "udisks2.h"
#include "udisks_debug.h"
-#include "udisksopticaldisc.h"
#include "soliddefs_p.h"
=
// inspired by http://cgit.freedesktop.org/hal/tree/hald/linux/probing/pro=
be-volume.c
diff --git a/src/solid/devices/backends/udisks2/udisksopticaldisc.h b/src/s=
olid/devices/backends/udisks2/udisksopticaldisc.h
index 1e1acd5..457ae96 100644
--- a/src/solid/devices/backends/udisks2/udisksopticaldisc.h
+++ b/src/solid/devices/backends/udisks2/udisksopticaldisc.h
@@ -19,12 +19,12 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#ifndef UDISKS2OPTICALDISC_H
-#define UDISKS2OPTICALDISC_H
+#ifndef UDISKSOPTICALDISC_H
+#define UDISKSOPTICALDISC_H
=
#include <solid/devices/ifaces/opticaldisc.h>
=
-#include "config-solid.h"
+#include <config-solid.h>
#include "../shared/udevqt.h"
=
#include "udisksstoragevolume.h"
@@ -80,4 +80,4 @@ private:
}
}
}
-#endif // UDISKS2OPTICALDISC_H
+#endif // UDISKSOPTICALDISC_H
diff --git a/src/solid/devices/backends/udisks2/udisksopticaldrive.cpp b/sr=
c/solid/devices/backends/udisks2/udisksopticaldrive.cpp
index 8505c7f..db457ff 100644
--- a/src/solid/devices/backends/udisks2/udisksopticaldrive.cpp
+++ b/src/solid/devices/backends/udisks2/udisksopticaldrive.cpp
@@ -19,6 +19,8 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
+#include "udisksopticaldrive.h"
+
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@ -31,7 +33,6 @@
#include <QtCore/QDebug>
=
#include "udisks_debug.h"
-#include "udisksopticaldrive.h"
#include "udisks2.h"
#include "udisksdevice.h"
#include "dbus/manager.h"
diff --git a/src/solid/devices/backends/udisks2/udisksopticaldrive.h b/src/=
solid/devices/backends/udisks2/udisksopticaldrive.h
index fd2f7ee..00b06c1 100644
--- a/src/solid/devices/backends/udisks2/udisksopticaldrive.h
+++ b/src/solid/devices/backends/udisks2/udisksopticaldrive.h
@@ -19,8 +19,8 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#ifndef UDISKS2OPTICALDRIVE_H
-#define UDISKS2OPTICALDRIVE_H
+#ifndef UDISKSOPTICALDRIVE_H
+#define UDISKSOPTICALDRIVE_H
=
#include <solid/devices/ifaces/opticaldrive.h>
#include "udisksstoragedrive.h"
@@ -78,4 +78,4 @@ private:
}
}
=
-#endif // UDISKS2OPTICALDRIVE_H
+#endif // UDISKSOPTICALDRIVE_H
diff --git a/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp b/s=
rc/solid/devices/backends/udisks2/udisksstorageaccess.cpp
index fb97296..348b9c7 100644
--- a/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
+++ b/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
@@ -19,8 +19,8 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#include "udisks_debug.h"
#include "udisksstorageaccess.h"
+#include "udisks_debug.h"
#include "udisks2.h"
=
#include <QDomDocument>
diff --git a/src/solid/devices/backends/udisks2/udisksstorageaccess.h b/src=
/solid/devices/backends/udisks2/udisksstorageaccess.h
index f38d8c9..a126417 100644
--- a/src/solid/devices/backends/udisks2/udisksstorageaccess.h
+++ b/src/solid/devices/backends/udisks2/udisksstorageaccess.h
@@ -19,8 +19,8 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#ifndef UDISKS2STORAGEACCESS_H
-#define UDISKS2STORAGEACCESS_H
+#ifndef UDISKSSTORAGEACCESS_H
+#define UDISKSSTORAGEACCESS_H
=
#include <solid/devices/ifaces/storageaccess.h>
#include "udisksdeviceinterface.h"
@@ -101,4 +101,4 @@ private:
}
}
=
-#endif // UDISKS2STORAGEACCESS_H
+#endif // UDISKSSTORAGEACCESS_H
diff --git a/src/solid/devices/backends/udisks2/udisksstoragedrive.h b/src/=
solid/devices/backends/udisks2/udisksstoragedrive.h
index 1609e96..b593c2f 100644
--- a/src/solid/devices/backends/udisks2/udisksstoragedrive.h
+++ b/src/solid/devices/backends/udisks2/udisksstoragedrive.h
@@ -19,12 +19,12 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#ifndef UDISKS2STORAGEDRIVE_H
-#define UDISKS2STORAGEDRIVE_H
+#ifndef UDISKSSTORAGEDRIVE_H
+#define UDISKSSTORAGEDRIVE_H
=
#include <ifaces/storagedrive.h>
=
-#include "config-solid.h"
+#include <config-solid.h>
#include "../shared/udevqt.h"
=
#include "udisksblock.h"
@@ -61,4 +61,4 @@ private:
}
}
=
-#endif // UDISK2SSTORAGEDRIVE_H
+#endif // UDISKSSTORAGEDRIVE_H
diff --git a/src/solid/devices/backends/udisks2/udisksstoragevolume.h b/src=
/solid/devices/backends/udisks2/udisksstoragevolume.h
index a2e1d16..44fd3c2 100644
--- a/src/solid/devices/backends/udisks2/udisksstoragevolume.h
+++ b/src/solid/devices/backends/udisks2/udisksstoragevolume.h
@@ -18,8 +18,8 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#ifndef UDISKS2STORAGEVOLUME_H
-#define UDISKS2STORAGEVOLUME_H
+#ifndef UDISKSSTORAGEVOLUME_H
+#define UDISKSSTORAGEVOLUME_H
=
#include <ifaces/storagevolume.h>
#include "udisksblock.h"
diff --git a/src/solid/devices/backends/upower/upowerdevice.cpp b/src/solid=
/devices/backends/upower/upowerdevice.cpp
index a675e84..37ab471 100644
--- a/src/solid/devices/backends/upower/upowerdevice.cpp
+++ b/src/solid/devices/backends/upower/upowerdevice.cpp
@@ -19,8 +19,8 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#include "upower.h"
#include "upowerdevice.h"
+#include "upower.h"
#include "upowerdeviceinterface.h"
#include "upowergenericinterface.h"
#include "upowerbattery.h"
diff --git a/src/solid/devices/backends/win/windevicemanager.cpp b/src/soli=
d/devices/backends/win/windevicemanager.cpp
index 2c59703..022068c 100644
--- a/src/solid/devices/backends/win/windevicemanager.cpp
+++ b/src/solid/devices/backends/win/windevicemanager.cpp
@@ -18,13 +18,13 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#include <solid/deviceinterface.h>
#include "windevicemanager.h"
+#include "windevicemanager_p.h"
+#include <solid/deviceinterface.h>
#include "windevice.h"
#include "winprocessor.h"
#include "winblock.h"
#include "winbattery.h"
-#include "windevicemanager_p.h"
=
#include <dbt.h>
=
diff --git a/src/solid/power/acpluggedjob_p.h b/src/solid/power/acpluggedjo=
b_p.h
index 997cca7..a827e95 100644
--- a/src/solid/power/acpluggedjob_p.h
+++ b/src/solid/power/acpluggedjob_p.h
@@ -18,8 +18,8 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#ifndef SOLID_AC_PUGGED_JOB_PRIVATE_H
-#define SOLID_AC_PUGGED_JOB_PRIVATE_H
+#ifndef SOLID_AC_PLUGGED_JOB_P_H
+#define SOLID_AC_PLUGGED_JOB_P_H
=
#include "job_p.h"
=
@@ -38,4 +38,4 @@ public:
};
}//Solid namespace
=
-#endif //SOLID_AC_PUGGED_JOB_PRIVATE_H
+#endif //SOLID_AC_PLUGGED_JOB_P_H
diff --git a/src/solid/power/backends/abstractinhibitionjob.h b/src/solid/p=
ower/backends/abstractinhibitionjob.h
index 019f06d..dbf8a75 100644
--- a/src/solid/power/backends/abstractinhibitionjob.h
+++ b/src/solid/power/backends/abstractinhibitionjob.h
@@ -37,4 +37,4 @@ public:
};
}
=
-#endif //ABSTRACT_ADD_INHIBITION_JOB_H
\ No newline at end of file
+#endif //ABSTRACT_ADD_INHIBITION_JOB_H
diff --git a/src/solid/power/backends/dummy/dummyacpluggedjob.h b/src/solid=
/power/backends/dummy/dummyacpluggedjob.h
index f9bbd7c..b448e58 100644
--- a/src/solid/power/backends/dummy/dummyacpluggedjob.h
+++ b/src/solid/power/backends/dummy/dummyacpluggedjob.h
@@ -18,8 +18,8 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#ifndef UPOWER_AC_PLUGGED_JOB_H
-#define UPOWER_AC_PLUGGED_JOB_H
+#ifndef UPOWER_DUMMY_AC_PLUGGED_JOB_H
+#define UPOWER_DUMMY_AC_PLUGGED_JOB_H
=
#include "backends/abstractacpluggedjob.h"
=
@@ -36,4 +36,4 @@ private Q_SLOTS:
};
}
=
-#endif //UPOWER_AC_PLUGGED_JOB_H
+#endif //UPOWER_DUMMY_AC_PLUGGED_JOB_H
diff --git a/src/solid/power/backends/dummy/dummyinhibitionjob.h b/src/soli=
d/power/backends/dummy/dummyinhibitionjob.h
index 75886e7..d34372a 100644
--- a/src/solid/power/backends/dummy/dummyinhibitionjob.h
+++ b/src/solid/power/backends/dummy/dummyinhibitionjob.h
@@ -18,8 +18,8 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#ifndef SOLID_DUMMY_ADD_INHIBITION_JOB_H
-#define SOLID_DUMMY_ADD_INHIBITION_JOB_H
+#ifndef SOLID_DUMMY_INHIBITION_JOB_H
+#define SOLID_DUMMY_INHIBITION_JOB_H
=
#include "backends/abstractinhibitionjob.h"
#include "solid/power.h"
@@ -42,4 +42,4 @@ private:
QString m_description;
};
}
-#endif //SOLID_DUMMY_ADD_INHIBITION_JOB_H
+#endif //SOLID_DUMMY_INHIBITION_JOB_H
diff --git a/src/solid/power/backends/freedesktop/fdacpluggedjob.h b/src/so=
lid/power/backends/freedesktop/fdacpluggedjob.h
index 3a38ab2..decb526 100644
--- a/src/solid/power/backends/freedesktop/fdacpluggedjob.h
+++ b/src/solid/power/backends/freedesktop/fdacpluggedjob.h
@@ -18,8 +18,8 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#ifndef FREEDESKTOP_AC_PLUGGED_JOB_H
-#define FREEDESKTOP_AC_PLUGGED_JOB_H
+#ifndef FD_AC_PLUGGED_JOB_H
+#define FD_AC_PLUGGED_JOB_H
=
#include "backends/abstractacpluggedjob.h"
=
@@ -46,4 +46,4 @@ private:
};
}
=
-#endif //FREEDESKTOP_AC_PLUGGED_JOB_H
+#endif //FD_AC_PLUGGED_JOB_H
diff --git a/src/solid/power/backends/freedesktop/fdinhibitionjob.h b/src/s=
olid/power/backends/freedesktop/fdinhibitionjob.h
index d99d889..1d31fd0 100644
--- a/src/solid/power/backends/freedesktop/fdinhibitionjob.h
+++ b/src/solid/power/backends/freedesktop/fdinhibitionjob.h
@@ -18,8 +18,8 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#ifndef SOLID_FD_ADD_INHIBITION_JOB_H
-#define SOLID_FD_ADD_INHIBITION_JOB_H
+#ifndef SOLID_FD_INHIBITION_JOB_H
+#define SOLID_FD_INHIBITION_JOB_H
=
#include "backends/abstractinhibitionjob.h"
#include "solid/power.h"
@@ -48,4 +48,4 @@ private:
FdInhibition *m_inhibition;
};
}
-#endif //SOLID_FD_ADD_INHIBITION_JOB_H
+#endif //SOLID_FD_INHIBITION_JOB_H
diff --git a/src/solid/power/statesjob_p.h b/src/solid/power/statesjob_p.h
index 1fb097c..87a1a54 100644
--- a/src/solid/power/statesjob_p.h
+++ b/src/solid/power/statesjob_p.h
@@ -18,8 +18,8 @@
License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
*/
=
-#ifndef SOLID_SLEEP_STAES_JOB_PRIVATE_H
-#define SOLID_SLEEP_STAES_JOB_PRIVATE_H
+#ifndef SOLID_SLEEP_STATES_JOB_P_H
+#define SOLID_SLEEP_STATES_JOB_P_H
=
#include "job_p.h"
=
@@ -37,4 +37,4 @@ public:
};
}//Solid namespace
=
-#endif //SOLID_SLEEP_STAES_JOB_PRIVATE_H
+#endif //SOLID_SLEEP_STATES_JOB_P_H
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic