summaryrefslogtreecommitdiffstats
path: root/src/fbgui/javascriptinterface.h
diff options
context:
space:
mode:
authorMichael Neves2012-02-03 17:34:58 +0100
committerMichael Neves2012-02-03 17:34:58 +0100
commit785c497c07c6f55ac9a3364f36914bc6e755ca4d (patch)
tree2b4dc12a45227707f7f70ef4b3e5f0d0ecb5b6b9 /src/fbgui/javascriptinterface.h
parentmutual auth test (diff)
parentfix merge error (diff)
downloadfbgui-785c497c07c6f55ac9a3364f36914bc6e755ca4d.tar.gz
fbgui-785c497c07c6f55ac9a3364f36914bc6e755ca4d.tar.xz
fbgui-785c497c07c6f55ac9a3364f36914bc6e755ca4d.zip
Merge branch 'ssl' of git.openslx.org:openslx-ng/fbgui into ssl
Diffstat (limited to 'src/fbgui/javascriptinterface.h')
-rw-r--r--src/fbgui/javascriptinterface.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/fbgui/javascriptinterface.h b/src/fbgui/javascriptinterface.h
index 5d45964..b15c134 100644
--- a/src/fbgui/javascriptinterface.h
+++ b/src/fbgui/javascriptinterface.h
@@ -66,8 +66,6 @@ public slots:
void downloadInfo(const QString& filename, const double& filesize);
void notify(const QString& msg);
- // functions to help test functionality
- void trigger();
};
#endif // JAVASCRIPTINTERFACE_H_