From b8df480d60f2bb374902b72805e12ac8048c8a81 Mon Sep 17 00:00:00 2001
From: Chih-Hsuan Yen <yan12125@gmail.com>
Date: Sun, 30 Sep 2018 03:07:38 +0800
Subject: [PATCH] Drop the ability to bundle kb-layouts and colorschemes

---
 lib/color-schemes/color-schemes.qrc | 25 -------------------------
 lib/kb-layouts/kb-layouts.qrc       | 10 ----------
 lib/tools.cpp                       |  8 --------
 3 files changed, 43 deletions(-)
 delete mode 100644 lib/color-schemes/color-schemes.qrc
 delete mode 100644 lib/kb-layouts/kb-layouts.qrc

diff --git a/lib/color-schemes/color-schemes.qrc b/lib/color-schemes/color-schemes.qrc
deleted file mode 100644
index 2fa1035..0000000
--- a/lib/color-schemes/color-schemes.qrc
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-    <qresource><file>BlackOnLightYellow.schema</file></qresource>
-    <qresource><file>BlackOnRandomLight.colorscheme</file></qresource>
-    <qresource><file>Linux.colorscheme</file></qresource>
-    <qresource><file>BlackOnWhite.schema</file></qresource>
-    <qresource><file>DarkPastels.colorscheme</file></qresource>
-    <qresource><file>GreenOnBlack.colorscheme</file></qresource>
-    <qresource><file>WhiteOnBlack.schema</file></qresource>
-    <qresource><file>BreezeModified.schema</file></qresource>
-    <qresource><file>historic/vim.schema</file></qresource>
-    <qresource><file>historic/Transparent.schema</file></qresource>
-    <qresource><file>historic/Transparent_MC.schema</file></qresource>
-    <qresource><file>historic/Linux.schema</file></qresource>
-    <qresource><file>historic/Transparent_darkbg.schema</file></qresource>
-    <qresource><file>historic/GreenTint.schema</file></qresource>
-    <qresource><file>historic/Transparent_lightbg.schema</file></qresource>
-    <qresource><file>historic/LightPicture.schema</file></qresource>
-    <qresource><file>historic/DarkPicture.schema</file></qresource>
-    <qresource><file>historic/syscolor.schema</file></qresource>
-    <qresource><file>historic/XTerm.schema</file></qresource>
-    <qresource><file>historic/BlackOnLightColor.schema</file></qresource>
-    <qresource><file>historic/GreenTint_MC.schema</file></qresource>
-    <qresource><file>historic/GreenOnBlack.schema</file></qresource>
-</RCC>
diff --git a/lib/kb-layouts/kb-layouts.qrc b/lib/kb-layouts/kb-layouts.qrc
deleted file mode 100644
index ce85691..0000000
--- a/lib/kb-layouts/kb-layouts.qrc
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-    <qresource><file>linux.keytab</file></qresource>
-    <qresource><file>solaris.keytab</file></qresource>
-    <qresource><file>macbook.keytab</file></qresource>
-    <qresource><file>default.keytab</file></qresource>
-    <qresource><file>vt420pc.keytab</file></qresource>
-    <qresource><file>historic/x11r5.keytab</file></qresource>
-    <qresource><file>historic/vt100.keytab</file></qresource>
-</RCC>
diff --git a/lib/tools.cpp b/lib/tools.cpp
index c82fc65..055bc30 100644
--- a/lib/tools.cpp
+++ b/lib/tools.cpp
@@ -11,9 +11,6 @@ But in some cases (apple bundle) there can be more locations).
 */
 QString get_kb_layout_dir()
 {
-#ifdef BUNDLE_KEYBOARDLAYOUTS
-    return QLatin1String(":/");
-#else
 //    qDebug() << __FILE__ << __FUNCTION__;
 
     QString rval = QString();
@@ -40,7 +37,6 @@ QString get_kb_layout_dir()
 #endif
     qDebug() << "Cannot find KB_LAYOUT_DIR. Default:" << k;
     return QString();
-#endif // BUNDLE_KEYBOARDLAYOUTS
 }
 
 /*! Helper function to add custom location of color schemes.
@@ -60,9 +56,6 @@ But in some cases (apple bundle) there can be more locations).
 */
 const QStringList get_color_schemes_dirs()
 {
-#ifdef BUNDLE_COLORSCHEMES
-    return QLatin1String(":/");
-#else
 //    qDebug() << __FILE__ << __FUNCTION__;
 
     QStringList rval;
@@ -106,5 +99,4 @@ const QStringList get_color_schemes_dirs()
     }
 #endif
     return rval;
-#endif // BUNDLE_COLORSCHEMES
 }