summaryrefslogtreecommitdiffstats
path: root/src/pvsgui.h
diff options
context:
space:
mode:
authorFabian Schillinger2010-07-10 02:14:20 +0200
committerFabian Schillinger2010-07-10 02:14:20 +0200
commit99021fc683c36f57fdad8dc812e2267fca4cbcf7 (patch)
tree5fd77585e4e5dbd171427186e4c31ad09ca18e68 /src/pvsgui.h
parentInserted some Buttons in GUI and TouchGUI and modified handling of commands i... (diff)
parentConfiguration by pvs via D-Bus. Old .allow ist now deprecated, config file: .... (diff)
downloadpvs-99021fc683c36f57fdad8dc812e2267fca4cbcf7.tar.gz
pvs-99021fc683c36f57fdad8dc812e2267fca4cbcf7.tar.xz
pvs-99021fc683c36f57fdad8dc812e2267fca4cbcf7.zip
Merge branch 'master' of openslx.org:pvs
Conflicts: i18n/pvs_ar_JO.ts i18n/pvs_de_DE.ts i18n/pvs_es_MX.ts i18n/pvs_fr_FR.ts i18n/pvs_pl_PL.ts
Diffstat (limited to 'src/pvsgui.h')
-rw-r--r--src/pvsgui.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/pvsgui.h b/src/pvsgui.h
index f9a0ab8..90fe50e 100644
--- a/src/pvsgui.h
+++ b/src/pvsgui.h
@@ -62,7 +62,6 @@ private Q_SLOTS:
void delHost(QString host);
void pvsConnect(QAction *action);
void pvsDisconnect();
- void setVncAllow(int i);
void sendFile();
void receiveFile();