Hi Jonah,
On 11/12/19 3:37 PM, Jonah Brüchert wrote:
* Update CXX Standard to 14 to be able to use qOverload()
---
configure.ac | 4 +--
src/callmanager.cpp | 22 ++++++-------
src/control.cpp | 77 +++++++++++++++++++++------------------------
src/phonesim.cpp | 56 +++++++++++++++++----------------
src/phonesim.h | 3 +-
5 files changed, 80 insertions(+), 82 deletions(-)
<snip>
@@ -527,35 +528,36 @@ SimRules::SimRules(qintptr fd, QObject *p, const
QString& filename, HardwareMan
machine = hmf->create(this, nullptr);
if (machine) {
- connect(machine, SIGNAL(unsolicitedCommand(QString)),
- this, SLOT(unsolicited(QString)));
- connect(machine, SIGNAL(command(QString)),
- this, SLOT(command(QString)));
- connect(machine, SIGNAL(variableChanged(QString,QString)),
- this, SLOT(setVariable(QString,QString)));
- connect(machine, SIGNAL(switchTo(QString)),
- this, SLOT(switchTo(QString)));
+ connect(machine, &HardwareManipulator::unsolicitedCommand,
+ this, &SimRules::unsolicited);
+ connect(machine, &HardwareManipulator::command,
+ this, &SimRules::command);
+ connect(machine, &HardwareManipulator::variableChanged,
+ this, &SimRules::setVariable);
+ connect(machine, &HardwareManipulator::switchTo,
+ this, &SimRules::switchTo);
}
+
I squashed this stray whitespace...
_callManager = new CallManager(this);
- connect( _callManager, SIGNAL(send(QString)),
- this, SLOT(respond(QString)) );
- connect( _callManager, SIGNAL(unsolicited(QString)),
- this, SLOT(unsolicited(QString)) );
- connect( _callManager, SIGNAL(dialCheck(QString,bool&)),
- this, SLOT(dialCheck(QString,bool&)) );
+ connect( _callManager, &CallManager::send,
+ this, qOverload<const QString &>( &SimRules::respond ) );
+ connect( _callManager, &CallManager::unsolicited,
+ this, &SimRules::unsolicited );
+ connect( _callManager, &CallManager::dialCheck,
+ this, &SimRules::dialCheck );
if ( machine ) {
- connect( machine, SIGNAL(startIncomingCall(QString,QString,QString)),
- _callManager,
SLOT(startIncomingCall(QString,QString,QString)) );
- connect ( _callManager, SIGNAL( callStatesChanged( QList<CallInfo> * )
),
- machine, SLOT( callManagement( QList<CallInfo> * ) ) );
- connect ( machine, SIGNAL( stateChangedToAlerting() ), _callManager,
- SLOT( dialingToAlerting() ) );
- connect ( machine, SIGNAL( stateChangedToConnected() ), _callManager,
- SLOT( dialingToConnected() ) );
- connect ( machine, SIGNAL( stateChangedToHangup( int ) ), _callManager,
- SLOT( hangupRemote( int ) ) );
+ connect( machine, &HardwareManipulator::startIncomingCall,
_callManager,
+ qOverload<const QString &, const QString &, const QString &>(
&CallManager::startIncomingCall ) );
+ connect ( _callManager, &CallManager::callStatesChanged,
+ machine, &HardwareManipulator::callManagement);
+ connect ( machine, &HardwareManipulator::stateChangedToAlerting,
_callManager,
+ &CallManager::dialingToAlerting );
+ connect ( machine, &HardwareManipulator::stateChangedToConnected,
_callManager,
+ &CallManager::dialingToConnected );
+ connect ( machine, &HardwareManipulator::stateChangedToHangup,
_callManager,
+ &CallManager::hangupRemote );
}
connect(this,SIGNAL(readyRead()),
... and applied this patch.
Regards,
-Denis
_______________________________________________
ofono mailing list -- [email protected]
To unsubscribe send an email to [email protected]
