From f6abb909ae63e8be79382377d68ab784d9f0ce88 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Tue, 26 Mar 2013 19:16:39 +0100 Subject: [PATCH] Revert "CProgressbarSetup: using unified 'osd' namespace" This reverts commit 7e1ef5d325a727a6bfe8294c194280020623a22f. A better and simpler solution for progressbar setup is already in place. --- src/gui/Makefile.am | 2 +- src/gui/osd_setup.cpp | 2 +- src/gui/{osd_progressbar_setup.cpp => progressbar_setup.cpp} | 5 ++--- src/gui/{osd_progressbar_setup.h => progressbar_setup.h} | 3 +-- 4 files changed, 5 insertions(+), 7 deletions(-) rename src/gui/{osd_progressbar_setup.cpp => progressbar_setup.cpp} (97%) rename src/gui/{osd_progressbar_setup.h => progressbar_setup.h} (92%) diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index ed74a5892..814773ccb 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -73,7 +73,6 @@ 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 \ @@ -82,6 +81,7 @@ 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/osd_setup.cpp b/src/gui/osd_setup.cpp index 5c05215f3..4893b39c0 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 "osd_progressbar_setup.h" +#include "progressbar_setup.h" #include #include diff --git a/src/gui/osd_progressbar_setup.cpp b/src/gui/progressbar_setup.cpp similarity index 97% rename from src/gui/osd_progressbar_setup.cpp rename to src/gui/progressbar_setup.cpp index 78591453a..3ca86969e 100644 --- a/src/gui/osd_progressbar_setup.cpp +++ b/src/gui/progressbar_setup.cpp @@ -19,8 +19,7 @@ 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -28,7 +27,7 @@ #include #endif -#include "osd_progressbar_setup.h" +#include "progressbar_setup.h" #include #include diff --git a/src/gui/osd_progressbar_setup.h b/src/gui/progressbar_setup.h similarity index 92% rename from src/gui/osd_progressbar_setup.h rename to src/gui/progressbar_setup.h index 30dbe4625..b650e9cb6 100644 --- a/src/gui/osd_progressbar_setup.h +++ b/src/gui/progressbar_setup.h @@ -19,8 +19,7 @@ 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */