CProgressbarSetup: using unified 'osd' namespace

src/gui/Makefile.am

@@ -73,6 +73,7 @@ libneutrino_gui_a_SOURCES = \
 	network_service.cpp \
 	network_setup.cpp \
 	nfs.cpp \
+	osd_progressbar_setup.cpp \
 	osd_setup.cpp \
 	osdlang_setup.cpp \
 	parentallock_setup.cpp \
@@ -81,7 +82,6 @@ libneutrino_gui_a_SOURCES = \
 	pictureviewer_setup.cpp \
 	pluginlist.cpp \
 	plugins.cpp \
-	progressbar_setup.cpp \
 	proxyserver_setup.cpp \
 	rc_lock.cpp \
 	record_setup.cpp \

src/gui/osd_progressbar_setup.cpp

@@ -19,7 +19,8 @@
 
 	You should have received a copy of the GNU General Public License
 	along with this program; if not, write to the Free Software
-	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+	Boston, MA  02110-1301, USA.
 
 */
 
@@ -27,7 +28,7 @@
 #include <config.h>
 #endif
 
-#include "progressbar_setup.h"
+#include "osd_progressbar_setup.h"
 
 #include <global.h>
 #include <neutrino.h>

src/gui/osd_progressbar_setup.h

@@ -19,7 +19,8 @@
 
 	You should have received a copy of the GNU General Public License
 	along with this program; if not, write to the Free Software
-	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+	Boston, MA  02110-1301, USA.
 
 */
 

src/gui/osd_setup.cpp

@@ -43,7 +43,7 @@
 #include "screensetup.h"
 #include "osdlang_setup.h"
 #include "filebrowser.h"
-#include "progressbar_setup.h"
+#include "osd_progressbar_setup.h"
 
 #include <gui/widget/icons.h>
 #include <gui/widget/colorchooser.h>