Skip to content

Commit

Permalink
Reformat parenthesis and some minor detail
Browse files Browse the repository at this point in the history
  • Loading branch information
pvuorela committed Apr 7, 2021
1 parent 668441b commit df007c2
Show file tree
Hide file tree
Showing 54 changed files with 541 additions and 616 deletions.
2 changes: 1 addition & 1 deletion libbuteosyncfw/clientfw/SyncClientInterface.h
Expand Up @@ -282,7 +282,7 @@ class SyncClientInterface: public QObject
* \param aCommittedItems No. of items committed for this operation
*/
void transferProgress(QString aProfileId, int aTransferDatabase,
int aTransferType, QString aMimeType, int aCommittedItems );
int aTransferType, QString aMimeType, int aCommittedItems);

private:

Expand Down
2 changes: 1 addition & 1 deletion libbuteosyncfw/common/Logger.cpp
Expand Up @@ -187,7 +187,7 @@ void Logger::write(int aLevel, const char *aMsg)
QMutexLocker lock(&iMutex);

// Verify that the log message can and should be written.
if (aLevel < QtDebugMsg || aLevel > QtFatalMsg ) {
if (aLevel < QtDebugMsg || aLevel > QtFatalMsg) {
return;
}

Expand Down
23 changes: 7 additions & 16 deletions libbuteosyncfw/common/Logger.h
Expand Up @@ -147,25 +147,16 @@ class Q_DECL_EXPORT Logger

static Logger *sInstance;

QBitArray iEnabledLevels;

int iIndentLevel;

int iIndentSize;

QFile iFile;

QBitArray iEnabledLevels;
int iIndentLevel;
int iIndentSize;
QFile iFile;
QTextStream *iFileStream;

QTextStream *iStdOutStream;

QTextStream *iStdErrStream;

QMutex iMutex;

bool iEnabled;

int iLogLevel;
QMutex iMutex;
bool iEnabled;
int iLogLevel;
};

}
Expand Down
34 changes: 15 additions & 19 deletions libbuteosyncfw/common/NetworkManager.h
Expand Up @@ -63,7 +63,6 @@ class NetworkManager : public QObject

/*! \brief Returns the type of connection used by the device.
*
* @return Sync::InternetConnectionType the type of connection.
*/
Sync::InternetConnectionType connectionType() const;
Expand All @@ -82,38 +81,35 @@ class NetworkManager : public QObject
void connectSession(bool connectInBackground = false);

/*! \brief Disconnects an open session
*
*/
void disconnectSession();

signals:
/*! \brief This signal is emitted when the device's online status
* changes
/*! \brief This signal is emitted when the device's online status changes
*
* @param aConnected If true, the device is online
*/
void statusChanged(bool aConnected, Sync::InternetConnectionType aType);

/*! \brief This signal is emitted when a network session gets
* connected
*
/*! \brief This signal is emitted when a network session gets connected
*/
void connectionSuccess();

/*! \brief This signal is emitted when opening a network session
* fails
*
/*! \brief This signal is emitted when opening a network session fails
*/
void connectionError();

private:
QNetworkConfigurationManager *m_networkConfigManager; // QT network configuration manager
QNetworkSession *m_networkSession; // QT network session
static bool m_isSessionActive; // Flag to indicate if a network session is active
bool m_isOnline; // Flag to indicate if the device is online
static int m_refCount; // Reference counter for number of open connections
bool m_errorEmitted; // Network error emited flag
QTimer *m_sessionTimer;
Sync::InternetConnectionType m_connectionType;
QTimer m_idleRefreshTimer;
static bool m_isSessionActive;
static int m_refCount; // Reference counter for number of open connections

QNetworkConfigurationManager *m_networkConfigManager;
QNetworkSession *m_networkSession;
bool m_isOnline;
bool m_errorEmitted;
QTimer *m_sessionTimer;
Sync::InternetConnectionType m_connectionType;
QTimer m_idleRefreshTimer;

private slots:
void slotSessionState(QNetworkSession::State status);
Expand Down
10 changes: 5 additions & 5 deletions libbuteosyncfw/pluginmgr/ClientPlugin.cpp
Expand Up @@ -24,11 +24,11 @@

using namespace Buteo;

ClientPlugin::ClientPlugin( const QString &aPluginName,
const SyncProfile &aProfile,
PluginCbInterface *aCbInterface )
: SyncPluginBase( aPluginName, aProfile.name(), aCbInterface ),
iProfile( aProfile )
ClientPlugin::ClientPlugin(const QString &aPluginName,
const SyncProfile &aProfile,
PluginCbInterface *aCbInterface)
: SyncPluginBase(aPluginName, aProfile.name(), aCbInterface),
iProfile(aProfile)
{
}

Expand Down
10 changes: 3 additions & 7 deletions libbuteosyncfw/pluginmgr/ClientPlugin.h
Expand Up @@ -46,9 +46,9 @@ class ClientPlugin : public SyncPluginBase
* @param aProfile Sync profile for the client
* @param aCbInterface Pointer to the callback interface
*/
ClientPlugin( const QString &aPluginName,
const SyncProfile &aProfile,
PluginCbInterface *aCbInterface );
ClientPlugin(const QString &aPluginName,
const SyncProfile &aProfile,
PluginCbInterface *aCbInterface);

/*! \brief Destructor
*
Expand All @@ -71,12 +71,8 @@ class ClientPlugin : public SyncPluginBase
}

protected:

//! Sync Profile Object that the plugin is currently operating on
SyncProfile iProfile;

private:

};

}
Expand Down

0 comments on commit df007c2

Please sign in to comment.