Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorvald Natvig <slicer@users.sourceforge.net>2007-08-31 01:15:36 +0400
committerThorvald Natvig <slicer@users.sourceforge.net>2007-08-31 01:15:36 +0400
commit732292284da3604fcd771be4ad0ae24766dcc7e2 (patch)
tree0822b307c29568e055d7e124047e041e40e66372 /src/mumble/GlobalShortcut_unix.h
parent92ad768ccd00619bcf1e0aba45d77310a5410722 (diff)
Patch #1785183 by metz. Unix client compiles again.
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@756 05730e5d-ab1b-0410-a4ac-84af385074fa
Diffstat (limited to 'src/mumble/GlobalShortcut_unix.h')
-rw-r--r--src/mumble/GlobalShortcut_unix.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mumble/GlobalShortcut_unix.h b/src/mumble/GlobalShortcut_unix.h
index 05a977412..83a867558 100644
--- a/src/mumble/GlobalShortcut_unix.h
+++ b/src/mumble/GlobalShortcut_unix.h
@@ -61,11 +61,12 @@ class GlobalShortcutXConfig : public ConfigWidget {
protected:
QHash<GlobalShortcut *,XInputKeyWidget *> qhKeys;
public:
- GlobalShortcutXConfig(QWidget *p = NULL);
+ GlobalShortcutXConfig(Settings &st);
virtual QString title() const;
virtual QIcon icon() const;
public slots:
- void accept();
+ void save() const;
+ void load(const Settings &r);
};
#define NUM_BUTTONS 0x2ff