diff --git a/kiwix-desktop.pro b/kiwix-desktop.pro index 34db5549d..0336310b4 100644 --- a/kiwix-desktop.pro +++ b/kiwix-desktop.pro @@ -64,7 +64,6 @@ SOURCES += \ src/fullscreenwindow.cpp \ src/fullscreennotification.cpp \ src/zimview.cpp \ - src/static_content.cpp HEADERS += \ src/contenttypefilter.h \ @@ -98,7 +97,6 @@ HEADERS += \ src/fullscreennotification.h \ src/menuproxystyle.h \ src/zimview.h \ - src/static_content.h FORMS += \ src/findinpagebar.ui \ diff --git a/src/contentmanager.cpp b/src/contentmanager.cpp index 5365ab63d..17aa2de55 100644 --- a/src/contentmanager.cpp +++ b/src/contentmanager.cpp @@ -1,7 +1,6 @@ #include "contentmanager.h" #include "kiwixapp.h" -#include "static_content.h" #include #include diff --git a/src/contentmanagerside.cpp b/src/contentmanagerside.cpp index 33a12f093..2ec1238ff 100644 --- a/src/contentmanagerside.cpp +++ b/src/contentmanagerside.cpp @@ -6,7 +6,6 @@ #include #include "klistwidgetitem.h" -#include "static_content.h" ContentManagerSide::ContentManagerSide(QWidget *parent) : QWidget(parent), diff --git a/src/kiwixapp.cpp b/src/kiwixapp.cpp index a72d68706..c3d55a3d7 100644 --- a/src/kiwixapp.cpp +++ b/src/kiwixapp.cpp @@ -1,5 +1,4 @@ #include "kiwixapp.h" -#include "static_content.h" #include "zim/error.h" #include "zim/version.h" #include "kiwix/tools.h" @@ -66,8 +65,6 @@ void KiwixApp::init() } mp_manager = new ContentManager(&m_library, mp_downloader); - initStaticContent(); - auto icon = QIcon(); icon.addFile(":/icons/kiwix-app-icons-square.svg"); setWindowIcon(icon); diff --git a/src/opdsrequestmanager.cpp b/src/opdsrequestmanager.cpp index 514ca213d..d12f5fb25 100644 --- a/src/opdsrequestmanager.cpp +++ b/src/opdsrequestmanager.cpp @@ -1,5 +1,4 @@ #include "opdsrequestmanager.h" -#include "static_content.h" #include "kiwixapp.h" OpdsRequestManager::OpdsRequestManager() diff --git a/src/static_content.cpp b/src/static_content.cpp deleted file mode 100644 index 69b7407f2..000000000 --- a/src/static_content.cpp +++ /dev/null @@ -1,176 +0,0 @@ - -#include "static_content.h" -#include "kiwixapp.h" - - -std::vector S_LANGUAGES; -std::vector> S_CATEGORIES; - -void initStaticContent() { -#define PUSH(key) S_CATEGORIES.push_back(std::make_pair(QString::fromStdString(key), gt(key))) - PUSH("all"); - PUSH("other"); - PUSH("gutenberg"); - PUSH("mooc"); - PUSH("phet"); - PUSH("psiram"); - PUSH("stack_exchange"); - PUSH("ted"); - PUSH("vikidia"); - PUSH("wikibooks"); - PUSH("wikihow"); - PUSH("wikinews"); - PUSH("wikipedia"); - PUSH("wikiquote"); - PUSH("wikisource"); - PUSH("wikiversity"); - PUSH("wikivoyage"); - PUSH("wiktionary"); -#undef PUSH - -#define PUSH(value) S_LANGUAGES.push_back(value) - PUSH(QLocale::Afar); - PUSH(QLocale::Afrikaans); - PUSH(QLocale::Akan); - PUSH(QLocale::Amharic); - PUSH(QLocale::Arabic); - PUSH(QLocale::Assamese); - PUSH(QLocale::Azerbaijani); - PUSH(QLocale::Bashkir); - PUSH(QLocale::Belarusian); - PUSH(QLocale::Bulgarian); - PUSH(QLocale::Bambara); - PUSH(QLocale::Bengali); - PUSH(QLocale::Tibetan); - PUSH(QLocale::Breton); - PUSH(QLocale::Bosnian); - PUSH(QLocale::Catalan); - PUSH(QLocale::Chechen); - PUSH(QLocale::Corsican); - PUSH(QLocale::Czech); - PUSH(QLocale::Church); - PUSH(QLocale::Chuvash); - PUSH(QLocale::Welsh); - PUSH(QLocale::Danish); - PUSH(QLocale::German); - PUSH(QLocale::Divehi); - PUSH(QLocale::Dzongkha); - PUSH(QLocale::Ewe); - PUSH(QLocale::Greek); - PUSH(QLocale::English); - PUSH(QLocale::Spanish); - PUSH(QLocale::Estonian); - PUSH(QLocale::Basque); - PUSH(QLocale::Persian); - PUSH(QLocale::Fulah); - PUSH(QLocale::Finnish); - PUSH(QLocale::Faroese); - PUSH(QLocale::French); - PUSH(QLocale::WesternFrisian); - PUSH(QLocale::Irish); - PUSH(QLocale::Gaelic); - PUSH(QLocale::Galician); - PUSH(QLocale::Guarani); - PUSH(QLocale::Gujarati); - PUSH(QLocale::Manx); - PUSH(QLocale::Hausa); - PUSH(QLocale::Hebrew); - PUSH(QLocale::Hindi); - PUSH(QLocale::Croatian); - PUSH(QLocale::Hungarian); - PUSH(QLocale::Armenian); - PUSH(QLocale::Interlingua); - PUSH(QLocale::Indonesian); - PUSH(QLocale::Igbo); - PUSH(QLocale::Icelandic); - PUSH(QLocale::Italian); - PUSH(QLocale::Inuktitut); - PUSH(QLocale::Japanese); - PUSH(QLocale::Javanese); - PUSH(QLocale::Georgian); - PUSH(QLocale::Kikuyu); - PUSH(QLocale::Kazakh); - PUSH(QLocale::Greenlandic); - PUSH(QLocale::Khmer); - PUSH(QLocale::Kannada); - PUSH(QLocale::Korean); - PUSH(QLocale::Kashmiri); - PUSH(QLocale::Kurdish); - PUSH(QLocale::Cornish); - PUSH(QLocale::Kirghiz); - PUSH(QLocale::Luxembourgish); - PUSH(QLocale::Ganda); - PUSH(QLocale::Lingala); - PUSH(QLocale::Lao); - PUSH(QLocale::Lithuanian); - PUSH(QLocale::Latvian); - PUSH(QLocale::Malagasy); - PUSH(QLocale::Maori); - PUSH(QLocale::Maori); - PUSH(QLocale::Macedonian); - PUSH(QLocale::Malayalam); - PUSH(QLocale::Mongolian); - PUSH(QLocale::Marathi); - PUSH(QLocale::Malay); - PUSH(QLocale::Maltese); - PUSH(QLocale::Burmese); - PUSH(QLocale::Nepali); - PUSH(QLocale::Dutch); - PUSH(QLocale::NorwegianNynorsk); - PUSH(QLocale::NorwegianBokmal); - PUSH(QLocale::Nyanja); - PUSH(QLocale::Occitan); - PUSH(QLocale::Oromo); - PUSH(QLocale::Oriya); - PUSH(QLocale::Ossetic); - PUSH(QLocale::Punjabi); - PUSH(QLocale::Polish); - PUSH(QLocale::Pashto); - PUSH(QLocale::Portuguese); - PUSH(QLocale::Quechua); - PUSH(QLocale::Romansh); - PUSH(QLocale::Rundi); - PUSH(QLocale::Romanian); - PUSH(QLocale::Russian); - PUSH(QLocale::Kinyarwanda); - PUSH(QLocale::Sanskrit); - PUSH(QLocale::Sindhi); - PUSH(QLocale::NorthernSami); - PUSH(QLocale::Sango); - PUSH(QLocale::Sinhala); - PUSH(QLocale::Slovak); - PUSH(QLocale::Slovenian); - PUSH(QLocale::Shona); - PUSH(QLocale::Somali); - PUSH(QLocale::Albanian); - PUSH(QLocale::Serbian); - PUSH(QLocale::Swati); - PUSH(QLocale::SouthernSotho); - PUSH(QLocale::Swedish); - PUSH(QLocale::Swahili); - PUSH(QLocale::Tamil); - PUSH(QLocale::Telugu); - PUSH(QLocale::Tajik); - PUSH(QLocale::Thai); - PUSH(QLocale::Tigrinya); - PUSH(QLocale::Turkmen); - PUSH(QLocale::Filipino); - PUSH(QLocale::Tswana); - PUSH(QLocale::Tongan); - PUSH(QLocale::Turkish); - PUSH(QLocale::Tsonga); - PUSH(QLocale::Tatar); - PUSH(QLocale::Uighur); - PUSH(QLocale::Ukrainian); - PUSH(QLocale::Urdu); - PUSH(QLocale::Uzbek); - PUSH(QLocale::Venda); - PUSH(QLocale::Vietnamese); - PUSH(QLocale::Walloon); - PUSH(QLocale::Wolof); - PUSH(QLocale::Xhosa); - PUSH(QLocale::Yoruba); - PUSH(QLocale::Chinese); - PUSH(QLocale::Zulu); -#undef PUSH -} diff --git a/src/static_content.h b/src/static_content.h deleted file mode 100644 index 5fdd76439..000000000 --- a/src/static_content.h +++ /dev/null @@ -1,15 +0,0 @@ - -#ifndef STATICCONTENT_H -#define STATICCONTENT_H - -#include -#include -#include -#include - -extern std::vector S_LANGUAGES; -extern std::vector> S_CATEGORIES; - -void initStaticContent(); - -#endif //STATICCONTENT_H