projects
/
jenirok
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some fixes to connection manager.
[jenirok]
/
src
/
common
/
connectionmanager.h
diff --git
a/src/common/connectionmanager.h
b/src/common/connectionmanager.h
index
547163d
..
b5a2c3c
100644
(file)
--- a/
src/common/connectionmanager.h
+++ b/
src/common/connectionmanager.h
@@
-46,7
+46,6
@@
public:
ConnectionManager(QObject* parent = 0);
~ConnectionManager();
ConnectionManager(QObject* parent = 0);
~ConnectionManager();
- void setBlocking(bool value);
bool connect();
bool connect(Connection const& connection);
bool connect(QString const& id);
bool connect();
bool connect(Connection const& connection);
bool connect(QString const& id);
@@
-55,13
+54,8
@@
public:
bool isConnected();
bool scanConnections(QList<Connection>& connections, ConnectionType type = NO_TYPE);
Error error() const;
bool isConnected();
bool scanConnections(QList<Connection>& connections, ConnectionType type = NO_TYPE);
Error error() const;
- static unsigned int const TIMEOUT = 20000;
-
-signals:
- void connectReply(bool connected);
- void isConnectedReply(bool connected);
- void newConnection(ConnectionManager::Connection const& connection);
- void scanReady();
+ static unsigned int const TIMEOUT = 15000;
+ static unsigned int const WAIT_AFTER_CONNECT = 400;
protected:
virtual void timerEvent(QTimerEvent* event);
protected:
virtual void timerEvent(QTimerEvent* event);
@@
-72,16
+66,17
@@
private slots:
void scanResult(const QDBusMessage& rep);
private:
void scanResult(const QDBusMessage& rep);
private:
+ void sleep(unsigned int ms);
bool waitSignal(bool* ready);
bool waitSignal(bool* ready);
- bool blocking_;
bool stateReady_;
bool connectionReady_;
bool scanReady_;
bool stateReady_;
bool connectionReady_;
bool scanReady_;
- bool connected_;
+ static bool connected_;
bool timeout_;
int numberOfConnections_;
int scannedConnections_;
int timer_;
bool timeout_;
int numberOfConnections_;
int scannedConnections_;
int timer_;
+ ConnectionType searchType_;
Error error_;
QList<Connection>* connections_;
QDBusInterface* icd2interface_;
Error error_;
QList<Connection>* connections_;
QDBusInterface* icd2interface_;