From: Francois Cartegnie Date: Wed, 14 Apr 2010 17:46:42 +0000 (-0700) Subject: Drop trailing semicolons X-Git-Tag: 1.2.0-pre1~7047 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8855ec28974a95e25ea6f4c52a5a1fd81876976b;p=vlc Drop trailing semicolons Signed-off-by: Jean-Baptiste Kempf --- diff --git a/modules/gui/qt4/components/complete_preferences.hpp b/modules/gui/qt4/components/complete_preferences.hpp index 29105e8638..32ad1896b8 100644 --- a/modules/gui/qt4/components/complete_preferences.hpp +++ b/modules/gui/qt4/components/complete_preferences.hpp @@ -64,7 +64,7 @@ Q_DECLARE_METATYPE( PrefsItemData* ); class PrefsTree : public QTreeWidget { - Q_OBJECT; + Q_OBJECT public: PrefsTree( intf_thread_t *, QWidget * ); virtual ~PrefsTree(); diff --git a/modules/gui/qt4/components/info_panels.hpp b/modules/gui/qt4/components/info_panels.hpp index d45d25e606..ec58f29cfb 100644 --- a/modules/gui/qt4/components/info_panels.hpp +++ b/modules/gui/qt4/components/info_panels.hpp @@ -52,7 +52,7 @@ class CoverArtLabel; class MetaPanel: public QWidget { - Q_OBJECT; + Q_OBJECT public: MetaPanel( QWidget *, struct intf_thread_t * ); void saveMeta(); @@ -95,7 +95,7 @@ signals: class ExtraMetaPanel: public QWidget { - Q_OBJECT; + Q_OBJECT public: ExtraMetaPanel( QWidget *, struct intf_thread_t * ); private: @@ -108,7 +108,7 @@ public slots: class InputStatsPanel: public QWidget { - Q_OBJECT; + Q_OBJECT public: InputStatsPanel( QWidget *, struct intf_thread_t * ); private: @@ -146,7 +146,7 @@ public slots: class InfoPanel: public QWidget { - Q_OBJECT; + Q_OBJECT public: InfoPanel( QWidget *, struct intf_thread_t * ); private: diff --git a/modules/gui/qt4/components/open_panels.hpp b/modules/gui/qt4/components/open_panels.hpp index 6d8cbb48a4..4d2d05b0a2 100644 --- a/modules/gui/qt4/components/open_panels.hpp +++ b/modules/gui/qt4/components/open_panels.hpp @@ -65,7 +65,7 @@ class QStringListModel; class OpenPanel: public QWidget { - Q_OBJECT; + Q_OBJECT public: OpenPanel( QWidget *p, intf_thread_t *_p_intf ) : QWidget( p ) { @@ -84,7 +84,7 @@ signals: class FileOpenBox: public QFileDialog { - Q_OBJECT; + Q_OBJECT public: FileOpenBox( QWidget *parent, const QString &caption, const QString &directory, const QString &filter ): @@ -97,7 +97,7 @@ public slots: class FileOpenPanel: public OpenPanel { - Q_OBJECT; + Q_OBJECT public: FileOpenPanel( QWidget *, intf_thread_t * ); virtual ~FileOpenPanel(); @@ -130,7 +130,7 @@ private slots: class NetOpenPanel: public OpenPanel { - Q_OBJECT; + Q_OBJECT public: NetOpenPanel( QWidget *, intf_thread_t * ); virtual ~NetOpenPanel(); @@ -146,7 +146,7 @@ private slots: class DiscOpenPanel: public OpenPanel { - Q_OBJECT; + Q_OBJECT public: DiscOpenPanel( QWidget *, intf_thread_t * ); virtual ~DiscOpenPanel(); @@ -167,7 +167,7 @@ private slots: class CaptureOpenPanel: public OpenPanel { - Q_OBJECT; + Q_OBJECT public: CaptureOpenPanel( QWidget *, intf_thread_t * ); virtual ~CaptureOpenPanel(); diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp index 364234af26..494df32046 100644 --- a/modules/gui/qt4/components/playlist/playlist_model.hpp +++ b/modules/gui/qt4/components/playlist/playlist_model.hpp @@ -179,7 +179,7 @@ private slots: class PlMimeData : public QMimeData { - Q_OBJECT; + Q_OBJECT public: PlMimeData(); diff --git a/modules/gui/qt4/components/playlist/selector.hpp b/modules/gui/qt4/components/playlist/selector.hpp index 41d37b1305..d98278788f 100644 --- a/modules/gui/qt4/components/playlist/selector.hpp +++ b/modules/gui/qt4/components/playlist/selector.hpp @@ -83,7 +83,7 @@ private: class PLSelItem : public QWidget { - Q_OBJECT; + Q_OBJECT public: PLSelItem( QTreeWidgetItem*, const QString& ); void setText( const QString& ); @@ -110,7 +110,7 @@ Q_DECLARE_METATYPE( playlist_item_t *); Q_DECLARE_METATYPE( input_item_t *); class PLSelector: public QTreeWidget { - Q_OBJECT; + Q_OBJECT public: PLSelector( QWidget *p, intf_thread_t *_p_intf ); virtual ~PLSelector(); diff --git a/modules/gui/qt4/components/playlist/standardpanel.hpp b/modules/gui/qt4/components/playlist/standardpanel.hpp index a3403308e6..97663c50ae 100644 --- a/modules/gui/qt4/components/playlist/standardpanel.hpp +++ b/modules/gui/qt4/components/playlist/standardpanel.hpp @@ -132,7 +132,7 @@ private: class LocationBar : public QWidget { - Q_OBJECT; + Q_OBJECT public: LocationBar( PLModel * ); void setIndex( const QModelIndex & ); diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp index fea298ed12..412f21e81e 100644 --- a/modules/gui/qt4/components/preferences_widgets.hpp +++ b/modules/gui/qt4/components/preferences_widgets.hpp @@ -303,7 +303,7 @@ private: class FileConfigControl : public VStringConfigControl { - Q_OBJECT; + Q_OBJECT public: FileConfigControl( vlc_object_t *, module_config_t *, QWidget *, QGridLayout *, int& ); @@ -324,7 +324,7 @@ protected: class DirectoryConfigControl : public FileConfigControl { - Q_OBJECT; + Q_OBJECT public: DirectoryConfigControl( vlc_object_t *, module_config_t *, QWidget *, QGridLayout *, int& ); @@ -337,7 +337,7 @@ public slots: class FontConfigControl : public VStringConfigControl { - Q_OBJECT; + Q_OBJECT public: FontConfigControl( vlc_object_t *, module_config_t *, QWidget *, QGridLayout *, int&); @@ -374,7 +374,7 @@ struct checkBoxListItem { class ModuleListConfigControl : public VStringConfigControl { - Q_OBJECT; + Q_OBJECT friend class ConfigControl; public: ModuleListConfigControl( vlc_object_t *, module_config_t *, QWidget *, @@ -396,7 +396,7 @@ private: class StringListConfigControl : public VStringConfigControl { - Q_OBJECT; + Q_OBJECT public: StringListConfigControl( vlc_object_t *, module_config_t *, QWidget *, bool, QGridLayout*, int& ); @@ -444,7 +444,7 @@ private slot: **********************************************************************/ class KeyShortcutEdit: public QLineEdit { - Q_OBJECT; + Q_OBJECT public: void setValue( int _value ){ value = _value; } int getValue() const { return value; } @@ -464,7 +464,7 @@ signals: class SearchLineEdit; class KeySelectorControl : public ConfigControl { - Q_OBJECT; + Q_OBJECT public: KeySelectorControl( vlc_object_t *, module_config_t *, QWidget *, QGridLayout*, int& ); diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp index e61e06bee0..626de8279b 100644 --- a/modules/gui/qt4/components/simple_preferences.hpp +++ b/modules/gui/qt4/components/simple_preferences.hpp @@ -93,7 +93,7 @@ class QTreeWidgetItem; class SPrefsCatList : public QWidget { - Q_OBJECT; + Q_OBJECT public: SPrefsCatList( intf_thread_t *, QWidget *, bool ); virtual ~SPrefsCatList() {}; diff --git a/modules/gui/qt4/components/sout/sout_widgets.hpp b/modules/gui/qt4/components/sout/sout_widgets.hpp index ce59f869c6..c7572e22a4 100644 --- a/modules/gui/qt4/components/sout/sout_widgets.hpp +++ b/modules/gui/qt4/components/sout/sout_widgets.hpp @@ -46,7 +46,7 @@ class SoutInputBox : public QGroupBox class VirtualDestBox : public QWidget { - Q_OBJECT; + Q_OBJECT public: VirtualDestBox( QWidget *_parent = NULL ) : QWidget( _parent ){} virtual QString getMRL( const QString& ) = 0; @@ -58,7 +58,7 @@ class VirtualDestBox : public QWidget class FileDestBox: public VirtualDestBox { - Q_OBJECT; + Q_OBJECT public: FileDestBox( QWidget *_parent = NULL ); virtual QString getMRL( const QString& ); @@ -70,7 +70,7 @@ class FileDestBox: public VirtualDestBox class HTTPDestBox: public VirtualDestBox { - Q_OBJECT; + Q_OBJECT public: HTTPDestBox( QWidget *_parent = NULL ); virtual QString getMRL( const QString& ); @@ -81,7 +81,7 @@ class HTTPDestBox: public VirtualDestBox class MMSHDestBox: public VirtualDestBox { - Q_OBJECT; + Q_OBJECT public: MMSHDestBox( QWidget *_parent = NULL ); virtual QString getMRL( const QString& ); @@ -92,7 +92,7 @@ class MMSHDestBox: public VirtualDestBox class RTSPDestBox: public VirtualDestBox { - Q_OBJECT; + Q_OBJECT public: RTSPDestBox( QWidget *_parent = NULL ); virtual QString getMRL( const QString& ); @@ -103,7 +103,7 @@ class RTSPDestBox: public VirtualDestBox class UDPDestBox: public VirtualDestBox { - Q_OBJECT; + Q_OBJECT public: UDPDestBox( QWidget *_parent = NULL ); virtual QString getMRL( const QString& ); @@ -114,7 +114,7 @@ class UDPDestBox: public VirtualDestBox class RTPDestBox: public VirtualDestBox { - Q_OBJECT; + Q_OBJECT public: RTPDestBox( QWidget *_parent = NULL, const char *mux = NULL ); virtual QString getMRL( const QString& ); @@ -126,7 +126,7 @@ class RTPDestBox: public VirtualDestBox class ICEDestBox: public VirtualDestBox { - Q_OBJECT; + Q_OBJECT public: ICEDestBox( QWidget *_parent = NULL ); virtual QString getMRL( const QString& ); diff --git a/modules/gui/qt4/dialogs/bookmarks.hpp b/modules/gui/qt4/dialogs/bookmarks.hpp index af55f4a1fd..119960c553 100644 --- a/modules/gui/qt4/dialogs/bookmarks.hpp +++ b/modules/gui/qt4/dialogs/bookmarks.hpp @@ -33,7 +33,7 @@ class BookmarksDialog : public QVLCFrame, public Singleton { - Q_OBJECT; + Q_OBJECT private: BookmarksDialog( intf_thread_t * ); virtual ~BookmarksDialog(); diff --git a/modules/gui/qt4/dialogs/convert.hpp b/modules/gui/qt4/dialogs/convert.hpp index 227aba2056..1df5186dd1 100644 --- a/modules/gui/qt4/dialogs/convert.hpp +++ b/modules/gui/qt4/dialogs/convert.hpp @@ -32,7 +32,7 @@ class VLCProfileSelector; class ConvertDialog : public QVLCDialog { - Q_OBJECT; + Q_OBJECT public: ConvertDialog( QWidget *, intf_thread_t *, const QString& ); virtual ~ConvertDialog(){} diff --git a/modules/gui/qt4/dialogs/epg.hpp b/modules/gui/qt4/dialogs/epg.hpp index d8d24a1fc2..9213182080 100644 --- a/modules/gui/qt4/dialogs/epg.hpp +++ b/modules/gui/qt4/dialogs/epg.hpp @@ -32,7 +32,7 @@ class EPGEvent; class EPGWidget; class EpgDialog : public QVLCFrame, public Singleton { - Q_OBJECT; + Q_OBJECT private: EpgDialog( intf_thread_t * ); virtual ~EpgDialog(); diff --git a/modules/gui/qt4/dialogs/errors.hpp b/modules/gui/qt4/dialogs/errors.hpp index ebe8f32831..8db1d3dd26 100644 --- a/modules/gui/qt4/dialogs/errors.hpp +++ b/modules/gui/qt4/dialogs/errors.hpp @@ -34,7 +34,7 @@ class QTextEdit; class ErrorsDialog : public QVLCDialog, public Singleton { - Q_OBJECT; + Q_OBJECT public: void addError( const QString&, const QString& ); diff --git a/modules/gui/qt4/dialogs/extended.hpp b/modules/gui/qt4/dialogs/extended.hpp index ed16ded6e0..0c651da8d8 100644 --- a/modules/gui/qt4/dialogs/extended.hpp +++ b/modules/gui/qt4/dialogs/extended.hpp @@ -33,7 +33,7 @@ class QTabWidget; class ExtendedDialog : public QVLCFrame, public Singleton { - Q_OBJECT; + Q_OBJECT public: void showTab( int i ); int currentTab(); diff --git a/modules/gui/qt4/dialogs/gototime.hpp b/modules/gui/qt4/dialogs/gototime.hpp index f84961dde0..a173d104af 100644 --- a/modules/gui/qt4/dialogs/gototime.hpp +++ b/modules/gui/qt4/dialogs/gototime.hpp @@ -31,7 +31,7 @@ class QTimeEdit; class GotoTimeDialog : public QVLCDialog, public Singleton { - Q_OBJECT; + Q_OBJECT private: GotoTimeDialog( intf_thread_t * ); virtual ~GotoTimeDialog(); diff --git a/modules/gui/qt4/dialogs/help.hpp b/modules/gui/qt4/dialogs/help.hpp index e5b04e990a..0f1a2b2366 100644 --- a/modules/gui/qt4/dialogs/help.hpp +++ b/modules/gui/qt4/dialogs/help.hpp @@ -42,7 +42,7 @@ class QTextEdit; class HelpDialog : public QVLCFrame, public Singleton { - Q_OBJECT; + Q_OBJECT private: HelpDialog( intf_thread_t * ); virtual ~HelpDialog(); @@ -56,7 +56,7 @@ public slots: class AboutDialog : public QVLCDialog, public Singleton { - Q_OBJECT; + Q_OBJECT private: AboutDialog( intf_thread_t * ); @@ -75,7 +75,7 @@ static const int UDErrorEvent = QEvent::User + DialogEventType + 22; class UpdateDialog : public QVLCFrame, public Singleton { - Q_OBJECT; + Q_OBJECT public: void updateNotify( bool ); diff --git a/modules/gui/qt4/dialogs/mediainfo.hpp b/modules/gui/qt4/dialogs/mediainfo.hpp index 4343bb719d..469ae67188 100644 --- a/modules/gui/qt4/dialogs/mediainfo.hpp +++ b/modules/gui/qt4/dialogs/mediainfo.hpp @@ -33,7 +33,7 @@ class QTabWidget; class MediaInfoDialog : public QVLCFrame, public Singleton { - Q_OBJECT; + Q_OBJECT public: MediaInfoDialog( intf_thread_t *, input_item_t * input = NULL ); diff --git a/modules/gui/qt4/dialogs/messages.hpp b/modules/gui/qt4/dialogs/messages.hpp index 720080abfd..762adb80d0 100644 --- a/modules/gui/qt4/dialogs/messages.hpp +++ b/modules/gui/qt4/dialogs/messages.hpp @@ -39,7 +39,7 @@ class QLineEdit; class MessagesDialog : public QVLCFrame, public Singleton { - Q_OBJECT; + Q_OBJECT private: MessagesDialog( intf_thread_t * ); virtual ~MessagesDialog(); diff --git a/modules/gui/qt4/dialogs/open.hpp b/modules/gui/qt4/dialogs/open.hpp index 694b465f57..db2efbb67f 100644 --- a/modules/gui/qt4/dialogs/open.hpp +++ b/modules/gui/qt4/dialogs/open.hpp @@ -57,7 +57,7 @@ class QTabWidget; class OpenDialog : public QVLCDialog { - Q_OBJECT; + Q_OBJECT public: static OpenDialog * getInstance( QWidget *parent, intf_thread_t *p_intf, bool b_rawInstance = false, int _action_flag = 0, diff --git a/modules/gui/qt4/dialogs/playlist.hpp b/modules/gui/qt4/dialogs/playlist.hpp index ac20a45e94..9b0c63f2f8 100644 --- a/modules/gui/qt4/dialogs/playlist.hpp +++ b/modules/gui/qt4/dialogs/playlist.hpp @@ -37,7 +37,7 @@ class QSettings; class PlaylistDialog : public QVLCMW, public Singleton { - Q_OBJECT; + Q_OBJECT private: PlaylistWidget *playlistWidget; diff --git a/modules/gui/qt4/dialogs/plugins.hpp b/modules/gui/qt4/dialogs/plugins.hpp index 2f97e9fea5..c61de2af61 100644 --- a/modules/gui/qt4/dialogs/plugins.hpp +++ b/modules/gui/qt4/dialogs/plugins.hpp @@ -53,7 +53,7 @@ class ExtensionCopy; class PluginDialog : public QVLCFrame, public Singleton { - Q_OBJECT; + Q_OBJECT private: PluginDialog( intf_thread_t * ); @@ -68,7 +68,7 @@ private: class PluginTab : public QVLCFrame { - Q_OBJECT; + Q_OBJECT private: PluginTab( intf_thread_t *p_intf ); @@ -86,7 +86,7 @@ private slots: class ExtensionTab : public QVLCFrame { - Q_OBJECT; + Q_OBJECT protected: virtual void keyPressEvent( QKeyEvent *keyEvent ); diff --git a/modules/gui/qt4/dialogs/podcast_configuration.hpp b/modules/gui/qt4/dialogs/podcast_configuration.hpp index b653cf87c4..b06ff12167 100644 --- a/modules/gui/qt4/dialogs/podcast_configuration.hpp +++ b/modules/gui/qt4/dialogs/podcast_configuration.hpp @@ -30,7 +30,7 @@ class PodcastConfigDialog : public QVLCDialog, public Singleton { - Q_OBJECT; + Q_OBJECT private: PodcastConfigDialog( intf_thread_t * ); diff --git a/modules/gui/qt4/dialogs/preferences.hpp b/modules/gui/qt4/dialogs/preferences.hpp index ef50b5201b..e14124009e 100644 --- a/modules/gui/qt4/dialogs/preferences.hpp +++ b/modules/gui/qt4/dialogs/preferences.hpp @@ -43,7 +43,7 @@ class QLabel; class PrefsDialog : public QVLCDialog { - Q_OBJECT; + Q_OBJECT public: PrefsDialog( QWidget *, intf_thread_t * ); virtual ~PrefsDialog() {} diff --git a/modules/gui/qt4/dialogs/sout.hpp b/modules/gui/qt4/dialogs/sout.hpp index 220333650a..85c1284ca3 100644 --- a/modules/gui/qt4/dialogs/sout.hpp +++ b/modules/gui/qt4/dialogs/sout.hpp @@ -111,7 +111,7 @@ private: class SoutDialog : public QVLCDialog { - Q_OBJECT; + Q_OBJECT public: SoutDialog( QWidget* parent, intf_thread_t *, const QString& mrl = ""); virtual ~SoutDialog(){} diff --git a/modules/gui/qt4/dialogs/toolbar.hpp b/modules/gui/qt4/dialogs/toolbar.hpp index 12b419c4cc..6a436d806c 100644 --- a/modules/gui/qt4/dialogs/toolbar.hpp +++ b/modules/gui/qt4/dialogs/toolbar.hpp @@ -49,7 +49,7 @@ class QComboBox; class WidgetListing : public QListWidget { - Q_OBJECT; + Q_OBJECT public: WidgetListing( intf_thread_t *, QWidget *_parent = 0 ); protected: @@ -60,7 +60,7 @@ private: class ToolbarEditDialog : public QVLCDialog { - Q_OBJECT; + Q_OBJECT public: ToolbarEditDialog( QWidget *, intf_thread_t * ); int getOptions() { return flatBox->isChecked() * WIDGET_FLAT + @@ -86,7 +86,7 @@ private slots: class DroppingController: public AbstractController { - Q_OBJECT; + Q_OBJECT public: DroppingController( intf_thread_t *, const QString& line, QWidget *parent = 0 ); QString getValue(); diff --git a/modules/gui/qt4/dialogs/vlm.hpp b/modules/gui/qt4/dialogs/vlm.hpp index ed68e58e70..bcb89dc53e 100644 --- a/modules/gui/qt4/dialogs/vlm.hpp +++ b/modules/gui/qt4/dialogs/vlm.hpp @@ -70,7 +70,7 @@ class VLMWrapper; class VLMDialog : public QVLCDialog, public Singleton { - Q_OBJECT; + Q_OBJECT public: void toggleVisible(); diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp index 60f1dd8f43..75f5e595d7 100644 --- a/modules/gui/qt4/dialogs_provider.hpp +++ b/modules/gui/qt4/dialogs_provider.hpp @@ -87,7 +87,7 @@ class QVLCMenu; class DialogsProvider : public QObject { - Q_OBJECT; + Q_OBJECT friend class QVLCMenu; public: diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp index d96c0a0afc..a85d2940f1 100644 --- a/modules/gui/qt4/input_manager.hpp +++ b/modules/gui/qt4/input_manager.hpp @@ -113,7 +113,7 @@ public: class InputManager : public QObject { - Q_OBJECT; + Q_OBJECT friend class MainInputManager; public: @@ -238,7 +238,7 @@ signals: class MainInputManager : public QObject { - Q_OBJECT; + Q_OBJECT public: static MainInputManager *getInstance( intf_thread_t *_p_intf ) { diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp index e26bfa4733..689da2b457 100644 --- a/modules/gui/qt4/main_interface.hpp +++ b/modules/gui/qt4/main_interface.hpp @@ -64,7 +64,7 @@ enum { class MainInterface : public QVLCMW { - Q_OBJECT; + Q_OBJECT friend class PlaylistWidget; diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp index f1d89f218e..f553679ba9 100644 --- a/modules/gui/qt4/menus.hpp +++ b/modules/gui/qt4/menus.hpp @@ -71,7 +71,7 @@ private: class QVLCMenu : public QObject { - Q_OBJECT; + Q_OBJECT friend class MenuFunc; public: diff --git a/modules/gui/qt4/util/customwidgets.hpp b/modules/gui/qt4/util/customwidgets.hpp index c903ba7426..13e685f220 100644 --- a/modules/gui/qt4/util/customwidgets.hpp +++ b/modules/gui/qt4/util/customwidgets.hpp @@ -61,7 +61,7 @@ private: class QVLCFramelessButton : public QPushButton { - Q_OBJECT; + Q_OBJECT public: QVLCFramelessButton( QWidget *parent = NULL ); QSize sizeHint() const;