← Back to branch summary

~ubuntu-branches/ubuntu/natty/vlc/natty

« back to all changes in this revision

Viewing changes to modules/gui/qt4/components/complete_preferences.hpp

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2010-06-25 01:09:16 UTC
  • mfrom: (1.1.30 upstream)
  • Revision ID: james.westby@ubuntu.com-20100625010916-asxhep2mutg6g6pd
Tags: 1.1.0-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - build and install the libx264 plugin
  - add Xb-Npp header to vlc package
  - Add apport hook to include more vlc dependencies in bug reports
* Drop xulrunner patches.
* Drop 502_xulrunner_191.diff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/gui/qt4/components/complete_preferences.hpp
2
2
 * preferences_tree.hpp : Tree of modules for preferences
3
3
 ****************************************************************************
4
4
 * Copyright (C) 2006-2007 the VideoLAN team
5
 
 * $Id: 29105e863833b57b53def05801f55b10e4c0e9ea $
 
5
 * $Id: 32ad1896b8e0c5ed91449ef802a0c51ff4ad3a3c $
6
6
 *
7
7
 * Authors: Clément Stenac <zorglub@videolan.org>
8
8
 *
64
64
 
65
65
class PrefsTree : public QTreeWidget
66
66
{
67
 
    Q_OBJECT;
 
67
    Q_OBJECT
68
68
public:
69
69
    PrefsTree( intf_thread_t *, QWidget * );
70
70
    virtual ~PrefsTree();