Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Frameworks
Solid
Commits
83a2de6d
Commit
83a2de6d
authored
Nov 05, 2018
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Normalize signal/slot
parent
b34d13cb
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
autotests/solidfreedesktoptest.cpp
autotests/solidfreedesktoptest.cpp
+1
-1
src/solid/devices/backends/win/windevicemanager.cpp
src/solid/devices/backends/win/windevicemanager.cpp
+2
-2
src/solid/power/backends/freedesktop/fdpowernotifier.cpp
src/solid/power/backends/freedesktop/fdpowernotifier.cpp
+1
-1
src/tools/solid-hardware/solid-hardware.cpp
src/tools/solid-hardware/solid-hardware.cpp
+6
-6
No files found.
autotests/solidfreedesktoptest.cpp
View file @
83a2de6d
...
...
@@ -93,7 +93,7 @@ void solidFreedesktopTest::testAcPluggedChanged()
void
solidFreedesktopTest
::
testAddInhibition
()
{
QSignalSpy
spy
(
m_fakeLogind
,
SIGNAL
(
newInhibition
(
QString
,
QString
,
QString
,
QString
)));
QSignalSpy
spy
(
m_fakeLogind
,
SIGNAL
(
newInhibition
(
QString
,
QString
,
QString
,
QString
)));
auto
job
=
new
InhibitionJob
(
this
);
job
->
setDescription
(
QStringLiteral
(
"Foo! I am inhibing!"
));
job
->
setInhibitions
(
Power
::
Shutdown
|
Power
::
Sleep
);
...
...
src/solid/devices/backends/win/windevicemanager.cpp
View file @
83a2de6d
...
...
@@ -139,8 +139,8 @@ WinDeviceManager::WinDeviceManager(QObject *parent)
:
DeviceManager
(
parent
)
{
connect
(
solidWineventFilter
,
SIGNAL
(
deviceAdded
(
const
QSet
<
QString
>
&
)),
this
,
SLOT
(
slotDeviceAdded
(
QSet
<
QString
>
)));
connect
(
solidWineventFilter
,
SIGNAL
(
deviceRemoved
(
const
QSet
<
QString
>
&
)),
this
,
SLOT
(
slotDeviceRemoved
(
QSet
<
QString
>
)));
connect
(
solidWineventFilter
,
SIGNAL
(
deviceAdded
(
QSet
<
QString
>
)),
this
,
SLOT
(
slotDeviceAdded
(
QSet
<
QString
>
)));
connect
(
solidWineventFilter
,
SIGNAL
(
deviceRemoved
(
QSet
<
QString
>
)),
this
,
SLOT
(
slotDeviceRemoved
(
QSet
<
QString
>
)));
m_supportedInterfaces
<<
Solid
::
DeviceInterface
::
GenericInterface
// << Solid::DeviceInterface::Block
...
...
src/solid/power/backends/freedesktop/fdpowernotifier.cpp
View file @
83a2de6d
...
...
@@ -32,7 +32,7 @@ Solid::FDPowerNotifier::FDPowerNotifier(QObject* parent): PowerNotifier(parent)
QStringLiteral
(
"org.freedesktop.DBus.Properties"
),
QStringLiteral
(
"PropertiesChanged"
),
this
,
SLOT
(
upowerPropertiesChanged
(
QString
,
QVariantMap
,
QStringList
))
SLOT
(
upowerPropertiesChanged
(
QString
,
QVariantMap
,
QStringList
))
);
conn
.
connect
(
QStringLiteral
(
"org.freedesktop.login1"
),
...
...
src/tools/solid-hardware/solid-hardware.cpp
View file @
83a2de6d
...
...
@@ -381,23 +381,23 @@ bool SolidHardware::hwVolumeCall(SolidHardware::VolumeCallType type, const QStri
{
case
Mount
:
connect
(
device
.
as
<
Solid
::
StorageAccess
>
(),
SIGNAL
(
setupDone
(
Solid
::
ErrorType
,
QVariant
,
const
QString
&
)),
SIGNAL
(
setupDone
(
Solid
::
ErrorType
,
QVariant
,
QString
)),
this
,
SLOT
(
slotStorageResult
(
Solid
::
ErrorType
,
QVariant
)));
SLOT
(
slotStorageResult
(
Solid
::
ErrorType
,
QVariant
)));
device
.
as
<
Solid
::
StorageAccess
>
()
->
setup
();
break
;
case
Unmount
:
connect
(
device
.
as
<
Solid
::
StorageAccess
>
(),
SIGNAL
(
teardownDone
(
Solid
::
ErrorType
,
QVariant
,
const
QString
&
)),
SIGNAL
(
teardownDone
(
Solid
::
ErrorType
,
QVariant
,
QString
)),
this
,
SLOT
(
slotStorageResult
(
Solid
::
ErrorType
,
QVariant
)));
SLOT
(
slotStorageResult
(
Solid
::
ErrorType
,
QVariant
)));
device
.
as
<
Solid
::
StorageAccess
>
()
->
teardown
();
break
;
case
Eject
:
connect
(
device
.
as
<
Solid
::
OpticalDrive
>
(),
SIGNAL
(
ejectDone
(
Solid
::
ErrorType
,
QVariant
,
const
QString
&
)),
SIGNAL
(
ejectDone
(
Solid
::
ErrorType
,
QVariant
,
QString
)),
this
,
SLOT
(
slotStorageResult
(
Solid
::
ErrorType
,
QVariant
)));
SLOT
(
slotStorageResult
(
Solid
::
ErrorType
,
QVariant
)));
device
.
as
<
Solid
::
OpticalDrive
>
()
->
eject
();
break
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment