diff options
| author | Manuel Schneider | 2014-09-03 15:40:39 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-09-03 15:40:39 +0200 |
| commit | 6017ad54c22bcb991c832f90d2a19722198886bb (patch) | |
| tree | 384bbf35357aba506d2bae131abc4747b8c30af0 /src/server/connectionframe | |
| parent | Change system settings path. Change name of config file (diff) | |
| parent | Added german translations for client. (diff) | |
| download | pvs2-6017ad54c22bcb991c832f90d2a19722198886bb.tar.gz pvs2-6017ad54c22bcb991c832f90d2a19722198886bb.tar.xz pvs2-6017ad54c22bcb991c832f90d2a19722198886bb.zip | |
Merge branch 'master' of git.openslx.org:pvs2
Diffstat (limited to 'src/server/connectionframe')
| -rw-r--r-- | src/server/connectionframe/connectionframe.cpp | 2 | ||||
| -rw-r--r-- | src/server/connectionframe/connectionframe.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/connectionframe/connectionframe.cpp b/src/server/connectionframe/connectionframe.cpp index 1bf6fb6..39aba12 100644 --- a/src/server/connectionframe/connectionframe.cpp +++ b/src/server/connectionframe/connectionframe.cpp @@ -188,7 +188,7 @@ void ConnectionFrame::mouseReleaseEvent(QMouseEvent* event) if ((this->pos() - _previousPosition).manhattanLength() > _startDragDistance ) { qDebug("Moved"); - emit frameMoved(this); + emit frameMoved(true, this); } else { diff --git a/src/server/connectionframe/connectionframe.h b/src/server/connectionframe/connectionframe.h index faa1390..188cdc7 100644 --- a/src/server/connectionframe/connectionframe.h +++ b/src/server/connectionframe/connectionframe.h @@ -61,7 +61,7 @@ public: const inline QPoint& getCurrentPosition() const { return _currentPosition; } const QString& computerId() const { return _computerId; } - inline void setComputerId(QString computerId) { _computerId = computerId; } + const inline void setComputerId(QString computerId) { _computerId = computerId; } Client* client() const { return _client; } inline const bool isTutor() const { return _isTutor; } @@ -78,7 +78,7 @@ protected: void timerEvent(QTimerEvent* event); signals: - void frameMoved(ConnectionFrame* frame); + void frameMoved(bool activateTrash, ConnectionFrame* frame); void doubleClicked(ConnectionFrame* frame); void clicked(ConnectionFrame* frame); |