mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-31 09:21:18 +02:00
Revert "CProgressbarSetup: using unified 'osd' namespace"
This reverts commit 7e1ef5d325
.
A better and simpler solution for progressbar setup is already in place.
This commit is contained in:
@@ -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 \
|
||||
|
@@ -43,7 +43,7 @@
|
||||
#include "screensetup.h"
|
||||
#include "osdlang_setup.h"
|
||||
#include "filebrowser.h"
|
||||
#include "osd_progressbar_setup.h"
|
||||
#include "progressbar_setup.h"
|
||||
|
||||
#include <gui/widget/icons.h>
|
||||
#include <gui/widget/colorchooser.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.
|
||||
|
||||
*/
|
||||
|
||||
@@ -28,7 +27,7 @@
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include "osd_progressbar_setup.h"
|
||||
#include "progressbar_setup.h"
|
||||
|
||||
#include <global.h>
|
||||
#include <neutrino.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.
|
||||
|
||||
*/
|
||||
|
Reference in New Issue
Block a user