From kde-commits Sat Jan 18 19:23:21 2014 From: Casian Andrei Date: Sat, 18 Jan 2014 19:23:21 +0000 To: kde-commits Subject: [phonon/five] phonon: Change phonon_export.h to phononexport.h for consistency Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=139007301227049 Git commit 68f4114763da8630b4e4db4bdd1b82dd4d1762e8 by Casian Andrei. Committed on 18/01/2014 at 18:55. Pushed by casianandrei into branch 'five'. Change phonon_export.h to phononexport.h for consistency M +1 -1 phonon/CMakeLists.txt M +1 -1 phonon/abstractmediastream.h M +1 -1 phonon/abstractmediastream_p.h M +1 -1 phonon/abstractoutput.h M +1 -1 phonon/audiodataoutput.h M +1 -1 phonon/audiooutput.h M +1 -1 phonon/effectparameter.h M +1 -1 phonon/effectwidget.h M +1 -1 phonon/frontend_p.h M +1 -1 phonon/objectdescription.h R +0 -2 phonon/phononexport.h [from: phonon/phonon_export.h - 095% s= imilarity] M +1 -1 phonon/phononglobal.h M +1 -1 phonon/phononversion.h.in M +1 -1 phonon/pulsestream_p.h M +1 -1 phonon/pulsesupport.h M +1 -1 phonon/seekslider.h M +1 -1 phonon/source.h M +1 -1 phonon/streaminterface.h M +1 -1 phonon/videoplayer.h M +1 -1 phonon/videowidget.h M +1 -1 phonon/volumefadereffect.h M +1 -1 phonon/volumeslider.h http://commits.kde.org/phonon/68f4114763da8630b4e4db4bdd1b82dd4d1762e8 diff --git a/phonon/CMakeLists.txt b/phonon/CMakeLists.txt index 13dce24..c4e640b 100644 --- a/phonon/CMakeLists.txt +++ b/phonon/CMakeLists.txt @@ -101,7 +101,7 @@ install(FILES sourcecontrol.h sourcecontrolinterface.h objectdescription.h - phonon_export.h + phononexport.h ${CMAKE_CURRENT_BINARY_DIR}/phononversion.h seekslider.h streaminterface.h diff --git a/phonon/abstractmediastream.h b/phonon/abstractmediastream.h index d213fbd..85c766e 100644 --- a/phonon/abstractmediastream.h +++ b/phonon/abstractmediastream.h @@ -23,7 +23,7 @@ #ifndef PHONON_ABSTRACTMEDIASTREAM_H #define PHONON_ABSTRACTMEDIASTREAM_H = -#include "phonon_export.h" +#include "phononexport.h" #include "phononglobal.h" #include = diff --git a/phonon/abstractmediastream_p.h b/phonon/abstractmediastream_p.h index fb47895..9c00eca 100644 --- a/phonon/abstractmediastream_p.h +++ b/phonon/abstractmediastream_p.h @@ -23,7 +23,7 @@ #ifndef ABSTRACTMEDIASTREAM_P_H #define ABSTRACTMEDIASTREAM_P_H = -#include "phonon_export.h" +#include "phononexport.h" #include "abstractmediastream.h" #include "player_p.h" #include "streaminterface.h" diff --git a/phonon/abstractoutput.h b/phonon/abstractoutput.h index 19e8d69..d9e92f2 100644 --- a/phonon/abstractoutput.h +++ b/phonon/abstractoutput.h @@ -22,7 +22,7 @@ #ifndef PHONON_ABSTRACTOUTPUT_H #define PHONON_ABSTRACTOUTPUT_H = -#include "phonon_export.h" +#include "phononexport.h" #include "frontend.h" = namespace Phonon { diff --git a/phonon/audiodataoutput.h b/phonon/audiodataoutput.h index 0a571ea..8ba40d7 100644 --- a/phonon/audiodataoutput.h +++ b/phonon/audiodataoutput.h @@ -22,7 +22,7 @@ #ifndef Phonon_AUDIODATAOUTPUT_H #define Phonon_AUDIODATAOUTPUT_H = -#include "phonon_export.h" +#include "phononexport.h" #include "abstractaudiooutput.h" = = diff --git a/phonon/audiooutput.h b/phonon/audiooutput.h index fb0853f..282c7db 100644 --- a/phonon/audiooutput.h +++ b/phonon/audiooutput.h @@ -23,7 +23,7 @@ #ifndef PHONON_AUDIOOUTPUT_H #define PHONON_AUDIOOUTPUT_H = -#include "phonon_export.h" +#include "phononexport.h" #include "abstractoutput.h" #include "phononglobal.h" #include "objectdescription.h" diff --git a/phonon/effectparameter.h b/phonon/effectparameter.h index f6ea1c0..7592234 100644 --- a/phonon/effectparameter.h +++ b/phonon/effectparameter.h @@ -23,7 +23,7 @@ #ifndef PHONON_EFFECTPARAMETER_H #define PHONON_EFFECTPARAMETER_H = -#include "phonon_export.h" +#include "phononexport.h" = #include #include diff --git a/phonon/effectwidget.h b/phonon/effectwidget.h index dd0499a..8259cb4 100644 --- a/phonon/effectwidget.h +++ b/phonon/effectwidget.h @@ -23,7 +23,7 @@ #ifndef PHONON_UI_EFFECTWIDGET_H #define PHONON_UI_EFFECTWIDGET_H = -#include "phonon_export.h" +#include "phononexport.h" #include "frontend.h" #include = diff --git a/phonon/frontend_p.h b/phonon/frontend_p.h index 9dc4651..72fe9a2 100644 --- a/phonon/frontend_p.h +++ b/phonon/frontend_p.h @@ -24,7 +24,7 @@ #define PHONON_FRONTEND_P_H = #include "phononpimpl_p.h" -#include "phonon_export.h" +#include "phononexport.h" = class QObject; = diff --git a/phonon/objectdescription.h b/phonon/objectdescription.h index 62975aa..42c1477 100644 --- a/phonon/objectdescription.h +++ b/phonon/objectdescription.h @@ -24,7 +24,7 @@ #define PHONON_OBJECTDESCRIPTION_H = #include "frontend.h" -#include "phonon_export.h" +#include "phononexport.h" = #include #include diff --git a/phonon/phonon_export.h b/phonon/phononexport.h similarity index 95% rename from phonon/phonon_export.h rename to phonon/phononexport.h index a5c98cf..52d50cf 100644 --- a/phonon/phonon_export.h +++ b/phonon/phononexport.h @@ -23,8 +23,6 @@ #ifndef PHONON_EXPORT_H #define PHONON_EXPORT_H = -#warning why do we have phononnamespace phononversion phonondefs but phono= nUNDERSCOREexport - #include = #ifndef PHONON_EXPORT diff --git a/phonon/phononglobal.h b/phonon/phononglobal.h index 7946084..de3286e 100644 --- a/phonon/phononglobal.h +++ b/phonon/phononglobal.h @@ -23,7 +23,7 @@ #ifndef PHONONNAMESPACE_H #define PHONONNAMESPACE_H = -#include "phonon_export.h" +#include "phononexport.h" = #warning k_func k_ptr to p_? #define P_DECLARE_PRIVATE(Class) \ diff --git a/phonon/phononversion.h.in b/phonon/phononversion.h.in index 26169e0..da2e22e 100644 --- a/phonon/phononversion.h.in +++ b/phonon/phononversion.h.in @@ -22,7 +22,7 @@ #ifndef PHONONVERSION_H #define PHONONVERSION_H = -#include "phonon_export.h" +#include "phononexport.h" = /** * Helper macro that can be used like diff --git a/phonon/pulsestream_p.h b/phonon/pulsestream_p.h index 2219a13..2885ef6 100644 --- a/phonon/pulsestream_p.h +++ b/phonon/pulsestream_p.h @@ -26,7 +26,7 @@ = #include = -#include "phonon_export.h" +#include "phononexport.h" #include "phononglobal.h" = namespace Phonon diff --git a/phonon/pulsesupport.h b/phonon/pulsesupport.h index 2cae61e..d764fe8 100644 --- a/phonon/pulsesupport.h +++ b/phonon/pulsesupport.h @@ -23,7 +23,7 @@ #ifndef PHONON_PULSESUPPORT_H #define PHONON_PULSESUPPORT_H = -#include "phonon_export.h" +#include "phononexport.h" #include "phononglobal.h" #include "objectdescription.h" = diff --git a/phonon/seekslider.h b/phonon/seekslider.h index db5cab8..35ad360 100644 --- a/phonon/seekslider.h +++ b/phonon/seekslider.h @@ -24,7 +24,7 @@ #define PHONON_UI_SEEKSLIDER_H = #include "frontend.h" -#include "phonon_export.h" +#include "phononexport.h" #include "phononglobal.h" #include = diff --git a/phonon/source.h b/phonon/source.h index 925aa86..3095dac 100644 --- a/phonon/source.h +++ b/phonon/source.h @@ -23,7 +23,7 @@ #ifndef PHONON_SOURCE_H_ #define PHONON_SOURCE_H_ = -#include "phonon_export.h" +#include "phononexport.h" #include "phononglobal.h" = #include diff --git a/phonon/streaminterface.h b/phonon/streaminterface.h index 7e9c0b8..93f588e 100644 --- a/phonon/streaminterface.h +++ b/phonon/streaminterface.h @@ -23,7 +23,7 @@ #ifndef PHONON_STREAMINTERFACE_H #define PHONON_STREAMINTERFACE_H = -#include "phonon_export.h" +#include "phononexport.h" #include = = diff --git a/phonon/videoplayer.h b/phonon/videoplayer.h index 42990c5..4301527 100644 --- a/phonon/videoplayer.h +++ b/phonon/videoplayer.h @@ -23,7 +23,7 @@ #ifndef Phonon_VIDEOPLAYER_H #define Phonon_VIDEOPLAYER_H = -#include "phonon_export.h" +#include "phononexport.h" #include "phononglobal.h" #include "mediasource.h" #include diff --git a/phonon/videowidget.h b/phonon/videowidget.h index 9de6afe..2e0e31b 100644 --- a/phonon/videowidget.h +++ b/phonon/videowidget.h @@ -22,7 +22,7 @@ #ifndef PHONON_VIDEOWIDGET_H #define PHONON_VIDEOWIDGET_H = -#include "phonon_export.h" +#include "phononexport.h" #include "abstractoutput.h" = #include diff --git a/phonon/volumefadereffect.h b/phonon/volumefadereffect.h index b572049..e67ebf1 100644 --- a/phonon/volumefadereffect.h +++ b/phonon/volumefadereffect.h @@ -23,7 +23,7 @@ #ifndef PHONON_VOLUMEFADEREFFECT_H #define PHONON_VOLUMEFADEREFFECT_H = -#include "phonon_export.h" +#include "phononexport.h" #include "effect.h" = = diff --git a/phonon/volumeslider.h b/phonon/volumeslider.h index 3e05f81..0f3b613 100644 --- a/phonon/volumeslider.h +++ b/phonon/volumeslider.h @@ -23,7 +23,7 @@ #ifndef PHONON_UI_VOLUMESLIDER_H #define PHONON_UI_VOLUMESLIDER_H = -#include "phonon_export.h" +#include "phononexport.h" #include "phonondefs.h" #include =