From b170ef90fc16f072be8b271a026aa355513e8966 Mon Sep 17 00:00:00 2001
From: Frans Englich <frans.englich@nokia.com>
Date: Thu, 24 Sep 2009 16:27:05 +0200
Subject: Revert "Modified MediaPlayer to set names on its child QObject
 instances"

This reverts commit ea6b181df68a18044a06063ab33dc6eb35b2aba1.

We revert it because although it's useful for us developers when debugging,
it's intended for customers, to demonstrate how to use Qt code.

Conflicts:

	demos/mediaplayer/mediaplayer.cpp
---
 demos/mediaplayer/mediaplayer.cpp | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/demos/mediaplayer/mediaplayer.cpp b/demos/mediaplayer/mediaplayer.cpp
index 30e3a5b..8dd0609 100644
--- a/demos/mediaplayer/mediaplayer.cpp
+++ b/demos/mediaplayer/mediaplayer.cpp
@@ -152,9 +152,6 @@ MediaPlayer::MediaPlayer(const QString &filePath) :
             m_AudioOutput(Phonon::VideoCategory),
             m_videoWidget(new MediaVideoWidget(this))
 {
-    m_videoWindow.setObjectName("videoWindow");
-    m_videoWidget->setObjectName("videoWidget");
-
     setWindowTitle(tr("Media Player"));
     setContextMenuPolicy(Qt::CustomContextMenu);
     m_videoWidget->setContextMenuPolicy(Qt::CustomContextMenu);
@@ -162,7 +159,6 @@ MediaPlayer::MediaPlayer(const QString &filePath) :
     QSize buttonSize(34, 28);
 
     QPushButton *openButton = new QPushButton(this);
-    openButton->setObjectName("openButton");
 
     openButton->setIcon(style()->standardIcon(QStyle::SP_DialogOpenButton));
     QPalette bpal;
@@ -173,25 +169,20 @@ MediaPlayer::MediaPlayer(const QString &filePath) :
     openButton->setPalette(bpal);
 
     rewindButton = new QPushButton(this);
-    rewindButton->setObjectName("rewindButton");
     rewindButton->setIcon(style()->standardIcon(QStyle::SP_MediaSkipBackward));
 
     forwardButton = new QPushButton(this);
-    forwardButton->setObjectName("forwardButton");
     forwardButton->setIcon(style()->standardIcon(QStyle::SP_MediaSkipForward));
     forwardButton->setEnabled(false);
 
     playButton = new QPushButton(this);
-    playButton->setObjectName("playButton");
     playIcon = style()->standardIcon(QStyle::SP_MediaPlay);
     pauseIcon = style()->standardIcon(QStyle::SP_MediaPause);
     playButton->setIcon(playIcon);
 
     slider = new Phonon::SeekSlider(this);
-    slider->setObjectName("slider");
     slider->setMediaObject(&m_MediaObject);
     volume = new Phonon::VolumeSlider(&m_AudioOutput);
-    volume->setObjectName("volume");
  
     QVBoxLayout *vLayout = new QVBoxLayout(this);
     vLayout->setContentsMargins(8, 8, 8, 8);    
@@ -199,7 +190,6 @@ MediaPlayer::MediaPlayer(const QString &filePath) :
     QHBoxLayout *layout = new QHBoxLayout();
 
     info = new QLabel(this);
-    info->setObjectName("info");
     info->setMinimumHeight(70);
     info->setAcceptDrops(false);
     info->setMargin(2);
@@ -237,11 +227,8 @@ MediaPlayer::MediaPlayer(const QString &filePath) :
     buttonPanelLayout->addLayout(layout);
     
     timeLabel = new QLabel(this);
-    timeLabel->setObjectName("timeLabel");
     progressLabel = new QLabel(this);
-    progressLabel->setObjectName("progressLabel");
     QWidget *sliderPanel = new QWidget(this);
-    sliderPanel->setObjectName("sliderPanel");
     QHBoxLayout *sliderLayout = new QHBoxLayout();
     sliderLayout->addWidget(slider);
     sliderLayout->addWidget(timeLabel);    
@@ -264,7 +251,6 @@ MediaPlayer::MediaPlayer(const QString &filePath) :
     // forwardButton->setStyle(flatButtonStyle);
  #endif
     QWidget *buttonPanelWidget = new QWidget(this);
-    buttonPanelWidget->setObjectName("buttonPanelWidget");
     buttonPanelWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); 
     buttonPanelWidget->setLayout(buttonPanelLayout);    
     vLayout->addWidget(buttonPanelWidget);
-- 
cgit v0.12