SVN commit 764711 by jbache:

Standardize ifdefs, as suggested by Andre Magalhaes



 M  +4 -3      abstractvideowidget.h  
 M  +1 -0      backend.h  
 M  +3 -3      common.h  
 M  +4 -3      devicemanager.h  
 M  +3 -3      effectmanager.h  
 M  +3 -4      gsthelper.h  
 M  +3 -4      medianode.h  
 M  +3 -3      medianodeevent.h  
 M  +3 -3      mediaobject.h  
 M  +3 -5      message.h  
 M  +3 -3      qwidgetvideosink.h  
 M  +3 -3      videowidget.h  
 M  +3 -3      volumefadereffect.h  
 M  +3 -3      xvideowidget.h  


--- trunk/kdereview/phonon/gstreamer/abstractvideowidget.h #764710:764711
@@ -15,8 +15,8 @@
     along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef Phonon_UI_GSTREAMER_ABSTRACTVIDEOWIDGET_H
-#define Phonon_UI_GSTREAMER_ABSTRACTVIDEOWIDGET_H
+#ifndef Phonon_GSTREAMER_ABSTRACTVIDEOWIDGET_H
+#define Phonon_GSTREAMER_ABSTRACTVIDEOWIDGET_H
 
 #include "backend.h"
 #include "common.h"
@@ -100,4 +100,5 @@
 } //namespace Phonon::Gstreamer
 
 QT_END_NAMESPACE
-#endif // Phonon_UI_GSTREAMER_ABSTRACTVIDEOWIDGET_H
+
+#endif // Phonon_GSTREAMER_ABSTRACTVIDEOWIDGET_H
--- trunk/kdereview/phonon/gstreamer/backend.h #764710:764711
@@ -99,4 +99,5 @@
 } // namespace Phonon::Gstreamer
 
 QT_END_NAMESPACE
+
 #endif // Phonon_GSTREAMER_BACKEND_H
--- trunk/kdereview/phonon/gstreamer/common.h #764710:764711
@@ -15,8 +15,8 @@
     along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __COMMON_H__
-#define __COMMON_H__
+#ifndef Phonon_GSTREAMER_COMMON_H
+#define Phonon_GSTREAMER_COMMON_H
 
 #include <phonon/phonon_export.h>
 
@@ -48,4 +48,4 @@
 
 #define BACKEND_WARNING qDebug() << "PGst: ____ WARNING ____" << Q_FUNC_INFO << ":"
 
-#endif // __COMMON_H__
+#endif // Phonon_GSTREAMER_COMMON_H
--- trunk/kdereview/phonon/gstreamer/devicemanager.h #764710:764711
@@ -15,8 +15,8 @@
     along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef DEVICEMANAGER_H
-#define DEVICEMANAGER_H
+#ifndef Phonon_GSTREAMER_DEVICEMANAGER_H
+#define Phonon_GSTREAMER_DEVICEMANAGER_H
 
 #include "common.h"
 
@@ -74,4 +74,5 @@
 } // namespace Phonon::Gstreamer
 
 QT_END_NAMESPACE
-#endif // DEVICEMANAGER_H
+
+#endif // Phonon_GSTREAMER_DEVICEMANAGER_H
--- trunk/kdereview/phonon/gstreamer/effectmanager.h #764710:764711
@@ -15,8 +15,8 @@
     along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef EffectManager_H
-#define EffectManager_H
+#ifndef Phonon_GSTREAMER_EFFECTMANAGER_H
+#define Phonon_GSTREAMER_EFFECTMANAGER_H
 
 #include "common.h"
 
@@ -88,4 +88,4 @@
 
 QT_END_NAMESPACE
 
-#endif // EffectManager_H
+#endif // Phonon_GSTREAMER_EFFECTMANAGER_H
--- trunk/kdereview/phonon/gstreamer/gsthelper.h #764710:764711
@@ -15,8 +15,8 @@
     along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __GSTHELPER_H__
-#define __GSTHELPER_H__
+#ifndef Phonon_GSTREAMER_GSTHELPER_H
+#define Phonon_GSTREAMER_GSTHELPER_H
 
 #include "common.h"
 
@@ -45,5 +45,4 @@
 
 QT_END_NAMESPACE
 
-#endif // __GSTHELPER_H__
-
+#endif // Phonon_GSTREAMER_GSTHELPER_H
--- trunk/kdereview/phonon/gstreamer/medianode.h #764710:764711
@@ -15,8 +15,8 @@
     along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __MEDIANODE_H__
-#define __MEDIANODE_H__
+#ifndef Phonon_GSTREAMER_MEDIANODE_H
+#define Phonon_GSTREAMER_MEDIANODE_H
 
 #include "common.h"
 #include "medianodeevent.h"
@@ -125,5 +125,4 @@
 
 QT_END_NAMESPACE
 
-#endif // __MEDIANODE_H__
-
+#endif // Phonon_GSTREAMER_MEDIANODE_H
--- trunk/kdereview/phonon/gstreamer/medianodeevent.h #764710:764711
@@ -15,8 +15,8 @@
     along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef Phonon_Gstreamer_MEDIANODEEVENT_H
-#define Phonon_Gstreamer_MEDIANODEEVENT_H
+#ifndef Phonon_GSTREAMER_MEDIANODEEVENT_H
+#define Phonon_GSTREAMER_MEDIANODEEVENT_H
 
 #include "common.h"
 
@@ -67,4 +67,4 @@
 
 QT_END_NAMESPACE
 
-#endif // Phonon_Gstreamer_MEDIANODEEVENT_H
+#endif // Phonon_GSTREAMER_MEDIANODEEVENT_H
--- trunk/kdereview/phonon/gstreamer/mediaobject.h #764710:764711
@@ -15,8 +15,8 @@
     along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef Phonon_Gstreamer_MEDIAOBJECT_H
-#define Phonon_Gstreamer_MEDIAOBJECT_H
+#ifndef Phonon_GSTREAMER_MEDIAOBJECT_H
+#define Phonon_GSTREAMER_MEDIAOBJECT_H
 
 #include "backend.h"
 #include "common.h"
@@ -241,4 +241,4 @@
 
 QT_END_NAMESPACE
 
-#endif // Phonon_Gstreamer_MEDIAOBJECT_H
+#endif // Phonon_GSTREAMER_MEDIAOBJECT_H
--- trunk/kdereview/phonon/gstreamer/message.h #764710:764711
@@ -15,8 +15,8 @@
     along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __GSTREAMER_MESSAGE_H
-#define __GSTREAMER_MESSAGE_H
+#ifndef Phonon_GSTREAMER_MESSAGE_H
+#define Phonon_GSTREAMER_MESSAGE_H
 
 #include "common.h"
 
@@ -55,6 +55,4 @@
 
 Q_DECLARE_METATYPE(Phonon::Gstreamer::Message);
 
-
-#endif  // __GSTREAMER_MESSAGE_H
-
+#endif // Phonon_GSTREAMER_MESSAGE_H
--- trunk/kdereview/phonon/gstreamer/qwidgetvideosink.h #764710:764711
@@ -15,8 +15,8 @@
     along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __GSTREAMER_VIDEOSINK_H
-#define __GSTREAMER_VIDEOSINK_H
+#ifndef Phonon_GSTREAMER_VIDEOSINK_H
+#define Phonon_GSTREAMER_VIDEOSINK_H
 
 #include "common.h"
 #include "qwidgetvideosink.h"
@@ -94,4 +94,4 @@
 
 QT_END_NAMESPACE
 
-#endif  // __GSTREAMER_VIDEOSINK_H
+#endif // Phonon_GSTREAMER_VIDEOSINK_H
--- trunk/kdereview/phonon/gstreamer/videowidget.h #764710:764711
@@ -15,8 +15,8 @@
     along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef Phonon_UI_GSTREAMER_VIDEOWIDGET_H
-#define Phonon_UI_GSTREAMER_VIDEOWIDGET_H
+#ifndef Phonon_GSTREAMER_VIDEOWIDGET_H
+#define Phonon_GSTREAMER_VIDEOWIDGET_H
 
 #include "abstractvideowidget.h"
 #include "common.h"
@@ -126,4 +126,4 @@
 
 QT_END_NAMESPACE
 
-#endif // Phonon_UI_GSTREAMER_VIDEOWIDGET_H
+#endif // Phonon_GSTREAMER_VIDEOWIDGET_H
--- trunk/kdereview/phonon/gstreamer/volumefadereffect.h #764710:764711
@@ -15,8 +15,8 @@
     along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef Phonon_Gstreamer_VOLUMEFADEREFFECT_H
-#define Phonon_Gstreamer_VOLUMEFADEREFFECT_H
+#ifndef Phonon_GSTREAMER_VOLUMEFADEREFFECT_H
+#define Phonon_GSTREAMER_VOLUMEFADEREFFECT_H
 
 #include "medianode.h"
 #include "effect.h"
@@ -67,4 +67,4 @@
 
 QT_END_NAMESPACE
 
-#endif // Phonon_Gstreamer_VOLUMEFADEREFFECT_H
+#endif // Phonon_GSTREAMER_VOLUMEFADEREFFECT_H
--- trunk/kdereview/phonon/gstreamer/xvideowidget.h #764710:764711
@@ -15,8 +15,8 @@
     along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef Phonon_UI_GSTREAMER_XVIDEOWIDGET_H
-#define Phonon_UI_GSTREAMER_XVIDEOWIDGET_H
+#ifndef Phonon_GSTREAMER_XVIDEOWIDGET_H
+#define Phonon_GSTREAMER_XVIDEOWIDGET_H
 
 #include "abstractvideowidget.h"
 #include "common.h"
@@ -81,4 +81,4 @@
 
 QT_END_NAMESPACE
 
-#endif // Phonon_UI_GSTREAMER_XVIDEOWIDGET_H
+#endif // Phonon_GSTREAMER_XVIDEOWIDGET_H