diff options
| author | Björn Hagemeister | 2014-05-19 17:30:55 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-05-19 17:30:55 +0200 |
| commit | 4d2cb705ed01094061eb281dc0a1130ebb3872c9 (patch) | |
| tree | f55586edb88bc4df60b2ef8385fc3d8e967b7675 /src/server/mainwindow/mainwindow.h | |
| parent | Help window (diff) | |
| parent | Commiting forgotten icon. (diff) | |
| download | pvs2-4d2cb705ed01094061eb281dc0a1130ebb3872c9.tar.gz pvs2-4d2cb705ed01094061eb281dc0a1130ebb3872c9.tar.xz pvs2-4d2cb705ed01094061eb281dc0a1130ebb3872c9.zip | |
Merge branch 'master' of git.openslx.org:pvs2
Diffstat (limited to 'src/server/mainwindow/mainwindow.h')
| -rw-r--r-- | src/server/mainwindow/mainwindow.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h index 02e9bac..d6b0265 100644 --- a/src/server/mainwindow/mainwindow.h +++ b/src/server/mainwindow/mainwindow.h @@ -49,7 +49,6 @@ private: // Internal stuff QList<ConnectionFrame*> _clientFrames; - int _timerId, _timerTimeout; ListenServer *_listenServer; DiscoveryListener *_discoveryListener; FileDownloader _fileDownloader; @@ -77,7 +76,6 @@ private: void changeEvent(QEvent *e); void resizeEvent(QResizeEvent *e); void mouseReleaseEvent(QMouseEvent* e); - void timerEvent(QTimerEvent* event); protected slots: |