← Back to branch summary

~ubuntu-branches/ubuntu/wily/psi/wily-proposed

« back to all changes in this revision

Viewing changes to src/libpsi/tools/globalshortcut/globalshortcutmanager_win.cpp

  • Committer: Package Import Robot
  • Author(s): Jan Niehusmann
  • Date: 2014-07-01 21:49:34 UTC
  • mfrom: (6.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20140701214934-gt4dkgm94byi4vnn
Tags: 0.15-1
* New upstream version
* set debhelper compat level to 9
* set Standards-Version to 3.9.5 (no further changes)
* add lintian override regarding license-problem-non-free-RFC
* use qconf to regenerate configure script
* implement hardening using buildflags instead of hardening-wrapper

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libpsi/tools/globalshortcut/globalshortcutmanager_win.cpp
14
14
 *
15
15
 * You should have received a copy of the GNU General Public License
16
16
 * along with this library; if not, write to the Free Software
17
 
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
17
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
18
 *
19
19
 */
20
20
 
64
64
 
65
65
private:
66
66
        KeyTrigger* trigger_;
67
 
        int id_;
68
 
        static int nextId;
 
67
        WPARAM id_;
 
68
        static WPARAM nextId;
69
69
 
70
70
private:
71
71
        struct Qt_VK_Keymap
189
189
        { Qt::Key_unknown,     0 },
190
190
};
191
191
 
192
 
int GlobalShortcutManager::KeyTrigger::Impl::nextId = 1;
 
192
WPARAM GlobalShortcutManager::KeyTrigger::Impl::nextId = 1;
193
193
 
194
194
GlobalShortcutManager::KeyTrigger::KeyTrigger(const QKeySequence& key)
195
195
{