Skip to content

Commit

Permalink
Avoid checks for new returning null
Browse files Browse the repository at this point in the history 
This doesn't happen.
  • Loading branch information
@pvuorela
pvuorela committed Apr 7, 2021
1 parent df007c2 commit fd7cc60
Show file tree
Hide file tree
Showing 12 changed files with 86 additions and 164 deletions.
44 changes: 22 additions & 22 deletions libbuteosyncfw/clientfw/SyncClientInterfacePrivate.cpp
View file
Expand Up @@ -42,37 +42,37 @@ SyncClientInterfacePrivate::SyncClientInterfacePrivate(SyncClientInterface *aPar
FUNCTION_CALL_TRACE;
iSyncDaemon = new SyncDaemonProxy(SYNC_DBUS_SERVICE, SYNC_DBUS_OBJECT,
QDBusConnection::sessionBus(), this);
if (iSyncDaemon) {
connect(iSyncDaemon, SIGNAL(signalProfileChanged(QString, int, QString)),
this, SLOT(slotProfileChanged(QString, int, QString)));

connect(iSyncDaemon, SIGNAL(resultsAvailable(QString, QString)), this,
SLOT(resultsAvailable(QString, QString)));
connect(iSyncDaemon, SIGNAL(signalProfileChanged(QString, int, QString)),
this, SLOT(slotProfileChanged(QString, int, QString)));

connect(this, SIGNAL(profileChanged(QString, int, QString)),
iParent, SIGNAL(profileChanged(QString, int, QString)));
connect(iSyncDaemon, SIGNAL(resultsAvailable(QString, QString)), this,
SLOT(resultsAvailable(QString, QString)));

connect(this, SIGNAL(resultsAvailable(QString, Buteo::SyncResults)),
iParent, SIGNAL(resultsAvailable(QString, Buteo::SyncResults)));
connect(this, SIGNAL(profileChanged(QString, int, QString)),
iParent, SIGNAL(profileChanged(QString, int, QString)));

connect (iSyncDaemon, SIGNAL(syncStatus(QString, int, QString, int)),
iParent, SIGNAL(syncStatus(QString, int, QString, int)));
connect(this, SIGNAL(resultsAvailable(QString, Buteo::SyncResults)),
iParent, SIGNAL(resultsAvailable(QString, Buteo::SyncResults)));

connect(iSyncDaemon, SIGNAL(transferProgress(QString, int, int, QString, int)),
iParent, SIGNAL(transferProgress(QString, int, int, QString, int)));
connect (iSyncDaemon, SIGNAL(syncStatus(QString, int, QString, int)),
iParent, SIGNAL(syncStatus(QString, int, QString, int)));

connect(iSyncDaemon, SIGNAL(backupInProgress()),
iParent, SIGNAL(backupInProgress()));
connect(iSyncDaemon, SIGNAL(transferProgress(QString, int, int, QString, int)),
iParent, SIGNAL(transferProgress(QString, int, int, QString, int)));

connect(iSyncDaemon, SIGNAL(backupDone()),
iParent, SIGNAL(backupDone()));
connect(iSyncDaemon, SIGNAL(backupInProgress()),
iParent, SIGNAL(backupInProgress()));

connect(iSyncDaemon, SIGNAL(restoreInProgress()),
iParent, SIGNAL(restoreInProgress()));
connect(iSyncDaemon, SIGNAL(backupDone()),
iParent, SIGNAL(backupDone()));

connect(iSyncDaemon, SIGNAL(restoreInProgress()),
iParent, SIGNAL(restoreInProgress()));

connect(iSyncDaemon, SIGNAL(restoreDone()),
iParent, SIGNAL(restoreDone()));

connect(iSyncDaemon, SIGNAL(restoreDone()),
iParent, SIGNAL(restoreDone()));
}
qRegisterMetaType<Buteo::Profile>("Buteo::Profile");
qRegisterMetaType<Buteo::SyncResults>("Buteo::SyncResults");
}
Expand Down
3 changes: 0 additions & 3 deletions libbuteosyncfw/common/NetworkManager.cpp
View file
Expand Up @@ -74,7 +74,6 @@ NetworkManager::NetworkManager(QObject *parent /* = 0*/) :
{
FUNCTION_CALL_TRACE;
m_networkConfigManager = new QNetworkConfigurationManager();
Q_ASSERT(m_networkConfigManager);

// check for network status and configuration change (switch wifi, ethernet, mobile) a
connect(m_networkConfigManager,
Expand Down Expand Up @@ -153,8 +152,6 @@ void NetworkManager::connectSession(bool connectInBackground /* = false*/)
m_networkSession = new QNetworkSession(netConfig);
m_errorEmitted = false;

Q_ASSERT(m_networkSession);

connect(m_networkSession, SIGNAL(error(QNetworkSession::SessionError)),
SLOT(slotSessionError(QNetworkSession::SessionError)));
connect(m_networkSession, SIGNAL(stateChanged(QNetworkSession::State)),
Expand Down
12 changes: 4 additions & 8 deletions libbuteosyncfw/common/TransportTracker.cpp
View file
Expand Up @@ -78,15 +78,11 @@ TransportTracker::TransportTracker(QObject *aParent) :
// Internet
// @todo: enable when internet state is reported correctly.
iInternet = new NetworkManager(this);
if (iInternet != 0) {
iTransportStates[Sync::CONNECTIVITY_INTERNET] =
iTransportStates[Sync::CONNECTIVITY_INTERNET] =
iInternet->isOnline();
connect(iInternet,
SIGNAL(statusChanged(bool, Sync::InternetConnectionType)),
SLOT(onInternetStateChanged(bool, Sync::InternetConnectionType)) /*, Qt::QueuedConnection*/);
} else {
LOG_WARNING("Failed to listen for Internet state changes");
}
connect(iInternet,
SIGNAL(statusChanged(bool, Sync::InternetConnectionType)),
SLOT(onInternetStateChanged(bool, Sync::InternetConnectionType)) /*, Qt::QueuedConnection*/);
}

TransportTracker::~TransportTracker()
Expand Down
25 changes: 5 additions & 20 deletions libbuteosyncfw/pluginmgr/PluginManager.cpp
View file
Expand Up @@ -264,15 +264,7 @@ ClientPlugin *PluginManager::createClient(const QString &aPluginName,
}

// Create the client plugin interface to talk to the process
OOPClientPlugin *plugin = new OOPClientPlugin(aPluginName, aProfile, aCbInterface, *process);
if (plugin) {
return plugin;
} else {
LOG_CRITICAL( "Could not create plugin instance" );
// Stop the process plugin
stopOOPPlugin(libraryName);
return NULL;
}
return new OOPClientPlugin(aPluginName, aProfile, aCbInterface, *process);
}

return NULL;
Expand Down Expand Up @@ -351,17 +343,10 @@ ServerPlugin *PluginManager::createServer(const QString &aPluginName,
return NULL;
}

OOPServerPlugin *plugin = new OOPServerPlugin(aPluginName,
aProfile,
aCbInterface,
*process);
if (plugin) {
return plugin;
} else {
LOG_CRITICAL( "Could not start server plugin" );
stopOOPPlugin(libraryName);
return NULL;
}
return new OOPServerPlugin(aPluginName,
aProfile,
aCbInterface,
*process);
}

return NULL;
Expand Down
4 changes: 0 additions & 4 deletions msyncd/ClientPluginRunner.cpp
View file
Expand Up @@ -80,10 +80,6 @@ bool ClientPluginRunner::init()
}

iThread = new ClientThread();
if (iThread == 0) {
LOG_WARNING("Failed to create client thread");
return false;
}

// Pass connectivity state change signal to the plug-in.
connect(this, SIGNAL(connectivityStateChanged(Sync::ConnectivityType, bool)),
Expand Down
4 changes: 0 additions & 4 deletions msyncd/ServerPluginRunner.cpp
View file
Expand Up @@ -80,10 +80,6 @@ bool ServerPluginRunner::init()
}

iThread = new ServerThread();
if (iThread == 0) {
LOG_WARNING("Failed to create server thread");
return false;
}

// Pass connectivity state change signal to the plug-in.
connect(this, SIGNAL(connectivityStateChanged(Sync::ConnectivityType, bool)),
Expand Down
11 changes: 3 additions & 8 deletions msyncd/SyncAlarmInventory.cpp
View file
Expand Up @@ -77,14 +77,9 @@ bool SyncAlarmInventory::init()

// Create the iTimer object
iTimer = new QTimer(this);
if (iTimer) {
connect(iTimer, SIGNAL(timeout()), this, SLOT(timerTriggered()));
currentAlarm = 0;
return true;
} else {
LOG_WARNING("Failed to create a QTimer");
return false;
}
connect(iTimer, SIGNAL(timeout()), this, SLOT(timerTriggered()));
currentAlarm = 0;
return true;
}

SyncAlarmInventory::~SyncAlarmInventory()
Expand Down
8 changes: 0 additions & 8 deletions msyncd/SyncBackup.cpp
View file
Expand Up @@ -43,10 +43,6 @@ SyncBackup::SyncBackup() :
FUNCTION_CALL_TRACE;

iAdaptor = new SyncBackupAdaptor(this);
if (!iAdaptor) {
LOG_CRITICAL("Failed to initialize adaptor");
Q_ASSERT(false);
}

QDBusConnection dbus = QDBusConnection::sessionBus();

Expand All @@ -58,10 +54,6 @@ SyncBackup::SyncBackup() :
}

iWatchService = new QDBusServiceWatcher (BACKUP_SERVICE_NAME, dbus, QDBusServiceWatcher::WatchForUnregistration);
if (!iWatchService) {
LOG_CRITICAL("Failed to initialize watch service : backup");
Q_ASSERT(false);
}

connect(iWatchService, SIGNAL(serviceUnregistered(const QString &)),
this, SLOT(backupServiceUnregistered(const QString &)));
Expand Down
11 changes: 5 additions & 6 deletions msyncd/SyncScheduler.cpp
View file
Expand Up @@ -53,13 +53,12 @@ SyncScheduler::SyncScheduler(QObject *aParent)

// Create the alarm inventory object
iAlarmInventory = new SyncAlarmInventory();
if (iAlarmInventory) {
connect(iAlarmInventory, SIGNAL(triggerAlarm(int)),
this, SLOT(doAlarmActions(int)));
if (!iAlarmInventory->init()) {
LOG_WARNING("AlarmInventory Init Failed");
}
connect(iAlarmInventory, SIGNAL(triggerAlarm(int)),
this, SLOT(doAlarmActions(int)));
if (!iAlarmInventory->init()) {
LOG_WARNING("AlarmInventory Init Failed");
}

#endif
}

Expand Down
1 change: 0 additions & 1 deletion msyncd/SyncSession.cpp
View file
Expand Up @@ -127,7 +127,6 @@ bool SyncSession::start()

if ((iProfile->destinationType() == SyncProfile::DESTINATION_TYPE_ONLINE) && !iScheduled) {
iNetworkManager = new NetworkManager(this);
Q_ASSERT(iNetworkManager);
connect(iNetworkManager, SIGNAL(connectionSuccess()),
SLOT(onNetworkSessionOpened()), Qt::QueuedConnection);
connect(iNetworkManager, SIGNAL(connectionError()),
Expand Down

0 comments on commit fd7cc60

Please sign in to comment.