From 85e58b9a2c46f5ad27f99ce95af71c2e0c0cf9f7 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Tue, 19 Mar 2013 07:31:39 +0100 Subject: [PATCH] CProgressbarSetup: using unified 'osd' namespace Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/cca6d898c8e0c1391a0f70ca71de1bb03305d7b5 Author: Thilo Graf Date: 2013-03-19 (Tue, 19 Mar 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/Makefile.am | 2 +- src/gui/{progressbar_setup.cpp => osd_progressbar_setup.cpp} | 5 +++-- src/gui/{progressbar_setup.h => osd_progressbar_setup.h} | 3 ++- src/gui/osd_setup.cpp | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) rename src/gui/{progressbar_setup.cpp => osd_progressbar_setup.cpp} (97%) rename src/gui/{progressbar_setup.h => osd_progressbar_setup.h} (92%) diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 7e8675470..c4f1d0361 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -78,6 +78,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 \ @@ -86,7 +87,6 @@ libneutrino_gui_a_SOURCES = \ pictureviewer_setup.cpp \ pluginlist.cpp \ plugins.cpp \ - progressbar_setup.cpp \ proxyserver_setup.cpp \ rc_lock.cpp \ record_setup.cpp \ diff --git a/src/gui/progressbar_setup.cpp b/src/gui/osd_progressbar_setup.cpp similarity index 97% rename from src/gui/progressbar_setup.cpp rename to src/gui/osd_progressbar_setup.cpp index 3ca86969e..78591453a 100644 --- a/src/gui/progressbar_setup.cpp +++ b/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 #endif -#include "progressbar_setup.h" +#include "osd_progressbar_setup.h" #include #include diff --git a/src/gui/progressbar_setup.h b/src/gui/osd_progressbar_setup.h similarity index 92% rename from src/gui/progressbar_setup.h rename to src/gui/osd_progressbar_setup.h index b650e9cb6..30dbe4625 100644 --- a/src/gui/progressbar_setup.h +++ b/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. */ diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index e80358cb0..922a3690e 100644 --- a/src/gui/osd_setup.cpp +++ b/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 #include