[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/noatun/library
From:       Stefan Gehn <mETz81 () web ! de>
Date:       2007-01-30 22:17:39
Message-ID: 1170195459.750788.24707.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 628687 by metz:

- "using namespace Noatun" => "namespace Noatun"
- clean up includes

 M  +9 -5      playlist.cpp  
 M  +10 -5     playlistitem.cpp  
 M  +7 -2      playlistsaver.cpp  


--- trunk/KDE/kdemultimedia/noatun/library/playlist.cpp #628686:628687
@@ -1,3 +1,6 @@
+/**
+ *
+ **/
 #include <noatun/playlist.h>
 #include <noatun/global.h>
 #include <noatun/plugin.h>
@@ -4,14 +7,15 @@
 #include <noatun/pluginloader.h>
 #include <noatun/plugininterfaces.h>
 
+#include <qevent.h>
+
 #include <kdebug.h>
+#include <kmainwindow.h>
 
-#include <qevent.h>
 
-#include <iostream>
+namespace Noatun
+{
 
-using namespace Noatun;
-
 struct Playlist::Private
 {
 	QList<PlaylistNotifier *> notifiers;
@@ -207,5 +211,5 @@
 	Q_UNUSED(item)
 }
 
-
+} // namespace Noatun
 #include "playlist.moc"
--- trunk/KDE/kdemultimedia/noatun/library/playlistitem.cpp #628686:628687
@@ -1,3 +1,6 @@
+/**
+ *
+ **/
 #include <noatun/playlistitem.h>
 #include <noatun/playlist.h>
 #include <noatun/player.h>
@@ -6,9 +9,10 @@
 
 #include <kdebug.h>
 
-#include <iostream>
+//#include <iostream>
 
-using namespace Noatun;
+namespace Noatun
+{
 
 struct PlaylistItem::PlaylistItemShared
 {
@@ -33,7 +37,7 @@
 		item.shared->obj = source;
 		item.shared->playlist = playlist;
 	}
-	
+
 	return item;
 }
 
@@ -87,7 +91,7 @@
 		return true;
 	if (!shared || !i.shared)
 		return false;
-	
+
 	return shared->playlist->compare_g(i.shared->obj, shared->obj);
 }
 
@@ -203,7 +207,7 @@
 			shared = 0;
 		}
 	}
-	
+
 }
 
 void PlaylistItem::addRef() const
@@ -212,3 +216,4 @@
 		shared->refs++;
 }
 
+} // namespace Noatun
--- trunk/KDE/kdemultimedia/noatun/library/playlistsaver.cpp #628686:628687
@@ -1,4 +1,6 @@
-
+/**
+ *
+ **/
 #include <noatun/playlistsaver.h>
 #include <qdom.h>
 #include <qfile.h>
@@ -13,7 +15,8 @@
 
 #include <kdebug.h>
 
-using namespace Noatun;
+namespace Noatun
+{
 
 PlaylistSaver::PlaylistSaver()
 {
@@ -686,3 +689,5 @@
 	}
 	return true;
 }
+
+} // namespace Noatun

[prev in list] [next in list] [prev in thread] [next in thread]