Changeset 176 for smplayer/trunk/src/actionseditor.h

Timestamp:

May 3, 2016, 5:25:45 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.4

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/actionseditor.h (modified) (3 diffs)

smplayer/trunk/src/actionseditor.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -19 +19 @@
 /* This is based on qq14-actioneditor-code.zip from Qt */
 
-#ifndef _ACTIONSEDITOR_H_
-#define _ACTIONSEDITOR_H_
+#ifndef ACTIONSEDITOR_H
+#define ACTIONSEDITOR_H
 
 #include <QWidget>
@@ -78 +78 @@
         int findActionAccel(const QString & accel, int ignoreRow = -1);
         bool hasConflicts();
+        static bool containsShortcut(const QString & accel, const QString & shortcut);
 
 protected slots: