[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [phonon/five] /: Change phononnamespace to phononglobal, remove phononnamespace_p
From: Casian Andrei <skeletk13 () gmail ! com>
Date: 2014-01-18 19:23:21
Message-ID: E1W4bUH-0007J4-6i () scm ! kde ! org
[Download RAW message or body]
Git commit 75ea808cd8d8ace75de8c8606e57a81f1a2ace6c by Casian Andrei.
Committed on 18/01/2014 at 18:52.
Pushed by casianandrei into branch 'five'.
Change phononnamespace to phononglobal, remove phononnamespace_p
M +1 -1 declarative/mediaelement.h
M +1 -1 demos/metadatareader/metadatareader.h
M +1 -1 designer/videoplayertaskmenu.h
M +2 -3 phonon/CMakeLists.txt
M +1 -1 phonon/abstractmediastream.h
M +1 -1 phonon/audiooutput.cpp
M +1 -1 phonon/audiooutput.h
M +1 -1 phonon/effectinterface.h
M +1 -1 phonon/factory.cpp
M +1 -1 phonon/frontend.h
M +1 -1 phonon/objectdescription_p.h
R +1 -2 phonon/phononglobal.cpp [from: phonon/phononnamespace.cpp - =
098% similarity]
R +0 -0 phonon/phononglobal.h [from: phonon/phononnamespace.h - 100%=
similarity]
D +0 -35 phonon/phononnamespace_p.h
M +2 -1 phonon/player.cpp
M +1 -1 phonon/playerinterface.h
M +1 -1 phonon/pulsestream_p.h
M +1 -1 phonon/pulsesupport.cpp
M +1 -1 phonon/pulsesupport.h
M +1 -1 phonon/seekslider.h
M +1 -1 phonon/source.h
M +1 -1 phonon/videoplayer.h
M +2 -1 phonon/videowidget.cpp
M +1 -2 phonon/volumeslider.cpp
http://commits.kde.org/phonon/75ea808cd8d8ace75de8c8606e57a81f1a2ace6c
diff --git a/declarative/mediaelement.h b/declarative/mediaelement.h
index 47a9faa..4e9a45e 100644
--- a/declarative/mediaelement.h
+++ b/declarative/mediaelement.h
@@ -26,7 +26,7 @@
#include <QtDeclarative/QDeclarativeItem>
#include <QtDeclarative/QDeclarativeParserStatus>
=
-#include <phonon/phononnamespace.h>
+#include <phonon/phononglobal.h>
=
#include "abstractinitable.h"
=
diff --git a/demos/metadatareader/metadatareader.h b/demos/metadatareader/m=
etadatareader.h
index f399604..f6bcbfa 100644
--- a/demos/metadatareader/metadatareader.h
+++ b/demos/metadatareader/metadatareader.h
@@ -25,7 +25,7 @@
=
#include <QtCore/QObject>
#include <QtCore/QTextStream>
-#include <phononnamespace.h>
+#include <phononglobal.h>
=
namespace Phonon
{
diff --git a/designer/videoplayertaskmenu.h b/designer/videoplayertaskmenu.h
index fc7f8d0..2c05734 100644
--- a/designer/videoplayertaskmenu.h
+++ b/designer/videoplayertaskmenu.h
@@ -67,7 +67,7 @@
#include <QtDesigner/QDesignerTaskMenuExtension>
#include <QtDesigner/QExtensionFactory>
=
-#include <phonon/phononnamespace.h>
+#include <phonon/phononglobal.h>
=
namespace Phonon
{
diff --git a/phonon/CMakeLists.txt b/phonon/CMakeLists.txt
index 10bd1da..13dce24 100644
--- a/phonon/CMakeLists.txt
+++ b/phonon/CMakeLists.txt
@@ -39,7 +39,7 @@ ${phonon_LIB_SRCS}
# effectwidget.cpp
iodevicestream.cpp
objectdescription.cpp
- phononnamespace.cpp
+ phononglobal.cpp
# seekslider.cpp
streaminterface.cpp
# swiftslider.cpp
@@ -53,7 +53,6 @@ ${phonon_LIB_SRCS}
audiooutput_p.h
globalstatic_p.h
frontend_p.h
- phononnamespace_p.h
phononpimpl_p.h
videowidget_p.h
videowidgetinterface.h
@@ -113,7 +112,7 @@ install(FILES
volumefaderinterface.h
volumeslider.h
${phonon_VGO_HDRS}
- phononnamespace.h
+ phononglobal.h
=
videosurfaceinterface.h
videoitem.h
diff --git a/phonon/abstractmediastream.h b/phonon/abstractmediastream.h
index 7a4e6e6..d213fbd 100644
--- a/phonon/abstractmediastream.h
+++ b/phonon/abstractmediastream.h
@@ -24,7 +24,7 @@
#define PHONON_ABSTRACTMEDIASTREAM_H
=
#include "phonon_export.h"
-#include "phononnamespace.h"
+#include "phononglobal.h"
#include <QtCore/QObject>
=
=
diff --git a/phonon/audiooutput.cpp b/phonon/audiooutput.cpp
index 39d9ee4..536fdb1 100644
--- a/phonon/audiooutput.cpp
+++ b/phonon/audiooutput.cpp
@@ -26,7 +26,7 @@
=
#include "factory_p.h"
#include "objectdescription.h"
-#include "phononnamespace_p.h"
+#include "phononglobal.h"
=
#include <QtCore/QUuid>
#include <QtCore/qmath.h>
diff --git a/phonon/audiooutput.h b/phonon/audiooutput.h
index 602e829..fb0853f 100644
--- a/phonon/audiooutput.h
+++ b/phonon/audiooutput.h
@@ -25,7 +25,7 @@
=
#include "phonon_export.h"
#include "abstractoutput.h"
-#include "phononnamespace.h"
+#include "phononglobal.h"
#include "objectdescription.h"
=
class QString;
diff --git a/phonon/effectinterface.h b/phonon/effectinterface.h
index 491fa0e..bff6b5b 100644
--- a/phonon/effectinterface.h
+++ b/phonon/effectinterface.h
@@ -23,7 +23,7 @@
#ifndef PHONON_EFFECTINTERFACE_H
#define PHONON_EFFECTINTERFACE_H
=
-#include "phononnamespace.h"
+#include "phononglobal.h"
#include <QtCore/QVariant>
=
=
diff --git a/phonon/factory.cpp b/phonon/factory.cpp
index 6b38220..44a0e7d 100644
--- a/phonon/factory.cpp
+++ b/phonon/factory.cpp
@@ -24,7 +24,7 @@
=
#include "backendinterface.h"
#include "globalstatic_p.h"
-#include "phononnamespace_p.h"
+#include "phononglobal.h"
#include "phononversion.h"
=
#include <QtCore/QCoreApplication>
diff --git a/phonon/frontend.h b/phonon/frontend.h
index 6e3bb3b..e407a71 100644
--- a/phonon/frontend.h
+++ b/phonon/frontend.h
@@ -24,7 +24,7 @@
#ifndef PHONON_FRONTEND_H
#define PHONON_FRONTEND_H
=
-#include "phononnamespace.h"
+#include "phononglobal.h"
=
namespace Phonon {
=
diff --git a/phonon/objectdescription_p.h b/phonon/objectdescription_p.h
index ffe01df..81e1e70 100644
--- a/phonon/objectdescription_p.h
+++ b/phonon/objectdescription_p.h
@@ -27,7 +27,7 @@
#include <QtCore/QHash>
#include <QtCore/QString>
#include <QtCore/QVariant>
-#include "phononnamespace_p.h"
+#include "phononglobal.h"
=
namespace Phonon
{
diff --git a/phonon/phononnamespace.cpp b/phonon/phononglobal.cpp
similarity index 98%
rename from phonon/phononnamespace.cpp
rename to phonon/phononglobal.cpp
index 53f26fc..401488a 100644
--- a/phonon/phononnamespace.cpp
+++ b/phonon/phononglobal.cpp
@@ -19,8 +19,7 @@
License along with this library. If not, see <http://www.gnu.org/lice=
nses/>.
*/
=
-#include "phononnamespace.h"
-#include "phononnamespace_p.h"
+#include "phononglobal.h"
=
#include "objectdescription.h"
=
diff --git a/phonon/phononnamespace.h b/phonon/phononglobal.h
similarity index 100%
rename from phonon/phononnamespace.h
rename to phonon/phononglobal.h
diff --git a/phonon/phononnamespace_p.h b/phonon/phononnamespace_p.h
deleted file mode 100644
index 463e337..0000000
--- a/phonon/phononnamespace_p.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* This file is part of the KDE project
- Copyright (C) 2005-2006 Matthias Kretz <kretz@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) version 3, or any
- later version accepted by the membership of KDE e.V. (or its
- successor approved by the membership of KDE e.V.), Nokia Corporation
- (or its successors, if any) and the KDE Free Qt Foundation, which shall
- act as a proxy defined in Section 6 of version 3 of the license.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library. If not, see <http://www.gnu.org/lice=
nses/>.
-*/
-
-#ifndef PHONONNAMESPACE_P_H
-#define PHONONNAMESPACE_P_H
-
-#include "phononnamespace.h"
-
-#include <QtCore/QDebug>
-
-#ifndef METATYPE_QLIST_INT_DEFINED
-#define METATYPE_QLIST_INT_DEFINED
-// Want this exactly once, see phonondefs_p.h kcm/outputdevicechoice.cpp
-Q_DECLARE_METATYPE(QList<int>)
-#endif
-
-#endif // PHONONNAMESPACE_P_H
diff --git a/phonon/player.cpp b/phonon/player.cpp
index 200f5ad..bb0a4a6 100644
--- a/phonon/player.cpp
+++ b/phonon/player.cpp
@@ -28,11 +28,12 @@
#include "abstractoutput_p.h"
#include "factory_p.h"
=
+#include <QtCore/QDebug>
#include <QtCore/QStringList>
#include <QtCore/QTimer>
#include <QtCore/QUrl>
=
-#include "phononnamespace_p.h"
+#include "phononglobal.h"
=
namespace Phonon {
=
diff --git a/phonon/playerinterface.h b/phonon/playerinterface.h
index 29b9639..5cb55f5 100644
--- a/phonon/playerinterface.h
+++ b/phonon/playerinterface.h
@@ -23,7 +23,7 @@
#ifndef PHONON_PLAYERINTERFACE_H
#define PHONON_PLAYERINTERFACE_H
=
-#include "phononnamespace.h"
+#include "phononglobal.h"
#include "source.h"
=
namespace Phonon {
diff --git a/phonon/pulsestream_p.h b/phonon/pulsestream_p.h
index b5fe496..2219a13 100644
--- a/phonon/pulsestream_p.h
+++ b/phonon/pulsestream_p.h
@@ -27,7 +27,7 @@
#include <pulse/pulseaudio.h>
=
#include "phonon_export.h"
-#include "phononnamespace.h"
+#include "phononglobal.h"
=
namespace Phonon
{
diff --git a/phonon/pulsesupport.cpp b/phonon/pulsesupport.cpp
index 5071910..83f685c 100644
--- a/phonon/pulsesupport.cpp
+++ b/phonon/pulsesupport.cpp
@@ -41,7 +41,7 @@
#endif
#endif // HAVE_PULSEAUDIO
=
-#include "phononnamespace_p.h"
+#include "phononglobal.h"
#include "platform_p.h"
=
namespace Phonon
diff --git a/phonon/pulsesupport.h b/phonon/pulsesupport.h
index 7529569..2cae61e 100644
--- a/phonon/pulsesupport.h
+++ b/phonon/pulsesupport.h
@@ -24,7 +24,7 @@
#define PHONON_PULSESUPPORT_H
=
#include "phonon_export.h"
-#include "phononnamespace.h"
+#include "phononglobal.h"
#include "objectdescription.h"
=
#include <QtCore/QtGlobal>
diff --git a/phonon/seekslider.h b/phonon/seekslider.h
index 0be8472..db5cab8 100644
--- a/phonon/seekslider.h
+++ b/phonon/seekslider.h
@@ -25,7 +25,7 @@
=
#include "frontend.h"
#include "phonon_export.h"
-#include "phononnamespace.h"
+#include "phononglobal.h"
#include <QWidget>
=
=
diff --git a/phonon/source.h b/phonon/source.h
index c1cf05f..925aa86 100644
--- a/phonon/source.h
+++ b/phonon/source.h
@@ -24,7 +24,7 @@
#define PHONON_SOURCE_H_
=
#include "phonon_export.h"
-#include "phononnamespace.h"
+#include "phononglobal.h"
=
#include <QtCore/QSharedData>
=
diff --git a/phonon/videoplayer.h b/phonon/videoplayer.h
index 1e3e65c..42990c5 100644
--- a/phonon/videoplayer.h
+++ b/phonon/videoplayer.h
@@ -24,7 +24,7 @@
#define Phonon_VIDEOPLAYER_H
=
#include "phonon_export.h"
-#include "phononnamespace.h"
+#include "phononglobal.h"
#include "mediasource.h"
#include <QWidget>
=
diff --git a/phonon/videowidget.cpp b/phonon/videowidget.cpp
index 8387edc..f5b31f4 100644
--- a/phonon/videowidget.cpp
+++ b/phonon/videowidget.cpp
@@ -24,8 +24,9 @@
#include "videowidget_p.h"
#include "videowidgetinterface.h"
#include "factory_p.h"
-#include "phononnamespace_p.h"
+#include "phononglobal.h"
=
+#include <QtCore/QDebug>
#include <QAction>
=
namespace Phonon {
diff --git a/phonon/volumeslider.cpp b/phonon/volumeslider.cpp
index f3bed9e..4f90fa4 100644
--- a/phonon/volumeslider.cpp
+++ b/phonon/volumeslider.cpp
@@ -23,8 +23,7 @@
#include "volumeslider.h"
#include "volumeslider_p.h"
#include "audiooutput.h"
-#include "phonondefs_p.h"
-#include "phononnamespace_p.h"
+#include "phononglobal.h"
#include "factory_p.h"
=
#ifndef QT_NO_PHONON_VOLUMESLIDER
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic