mirror of
https://github.com/parchlinux/calamares.git
synced 2025-02-24 02:45:44 -05:00
[locale] Clean up constants
- move LOCALESDIR to the one place it's used - remove file with only unused #defines
This commit is contained in:
parent
7354d35faf
commit
9d9d9c361d
3 changed files with 2 additions and 32 deletions
|
@ -1,31 +0,0 @@
|
|||
/* === This file is part of Calamares - <https://github.com/calamares> ===
|
||||
*
|
||||
* Copyright 2014, Teo Mrnjavac <teo@kde.org>
|
||||
*
|
||||
* Originally from the Manjaro Installation Framework
|
||||
* by Roland Singer <roland@manjaro.org>
|
||||
* Copyright (C) 2007 Free Software Foundation, Inc.
|
||||
*
|
||||
* Calamares is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Calamares is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef LOCALECONST_H
|
||||
#define LOCALECONST_H
|
||||
|
||||
|
||||
#define LOCALESDIR "/usr/share/i18n/locales"
|
||||
#define USER_IMAGES_PATH "/usr/share/pixmaps/faces"
|
||||
|
||||
|
||||
#endif // LOCALECONST_H
|
|
@ -87,6 +87,8 @@ LocaleGlobal::getLocales()
|
|||
void
|
||||
LocaleGlobal::initLocales()
|
||||
{
|
||||
static const char LOCALESDIR[] = "/usr/share/i18n/locales";
|
||||
|
||||
locales.clear();
|
||||
|
||||
QStringList files = QDir( LOCALESDIR ).entryList( QDir::Files, QDir::Name );
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
#ifndef LOCALEGLOBAL_H
|
||||
#define LOCALEGLOBAL_H
|
||||
|
||||
#include "localeconst.h"
|
||||
#include <QDebug>
|
||||
#include <QDir>
|
||||
#include <QFile>
|
||||
|
|
Loading…
Add table
Reference in a new issue