Changeset 846 for trunk/demos/qmediaplayer/mediaplayer.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• demos/qmediaplayer/mediaplayer.h (modified) (6 diffs)

trunk/demos/qmediaplayer/mediaplayer.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -105 +105 @@
     Q_OBJECT
 public:
-    MediaPlayer(const QString &,
-                const bool hasSmallScreen);
+    MediaPlayer();
 
     void dragEnterEvent(QDragEnterEvent *e);
@@ -116 +115 @@
     void initVideoWindow();
     void initSettingsDialog();
+
+
 
 public slots:
@@ -141 +142 @@
     void bufferStatus(int percent);
     void openUrl();
+
+
+
     void openRamFile();
     void configureEffect();
@@ -147 +151 @@
 private:
     bool playPauseForDialog();
+
+
+
 
     QIcon playIcon;
@@ -172 +179 @@
     MediaVideoWidget *m_videoWidget;
     Phonon::Path m_audioOutputPath;
-    const bool m_hasSmallScreen;
+    mallScreen;
 };