diff options
| author | Manuel Schneider | 2014-07-21 23:51:08 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-07-21 23:51:08 +0200 |
| commit | faccaa924e30d3383a3574fe9166540162337e97 (patch) | |
| tree | 477994e5da1921e8295e7db667cae7f14a47909e /src/server/mainwindow/mainwindow.h | |
| parent | Correct indenting by tabs (diff) | |
| parent | Tried to implement the fixed room settings, but is not working correctly righ... (diff) | |
| download | pvs2-faccaa924e30d3383a3574fe9166540162337e97.tar.gz pvs2-faccaa924e30d3383a3574fe9166540162337e97.tar.xz pvs2-faccaa924e30d3383a3574fe9166540162337e97.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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h index 5373209..8b0f133 100644 --- a/src/server/mainwindow/mainwindow.h +++ b/src/server/mainwindow/mainwindow.h @@ -76,6 +76,7 @@ private: void placeFrameInFreeSlot(ConnectionFrame* frame); ConnectionFrame* createFrame(); + ConnectionFrame* createFrame(QString computerId, QPoint position); bool loadPosition(QSettings& settings, const QString& id, int& x, int& y); void savePosition(ConnectionFrame *cf); void startVncServerIfNecessary(int from); |