Remove keyboard related functionality from the locale viewmodule.

src/modules/locale/timezonewidget/localeconst.h

@@ -26,7 +26,6 @@
 
 #define LOCALESDIR "/usr/share/i18n/locales"
 #define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
-#define XKB_FILE "/usr/share/X11/xkb/rules/base.lst"
 #define USER_IMAGES_PATH "/usr/share/pixmaps/faces"
 
 

src/modules/locale/timezonewidget/localeglobal.cpp

@@ -55,18 +55,6 @@ QHash<QString, QList<LocaleGlobal::Location> > LocaleGlobal::getLocations() {
 }
 
 
-
-QMap<QString, LocaleGlobal::KeyboardInfo> LocaleGlobal::getKeyboardLayouts() {
-    return parseKeyboardLayouts(XKB_FILE);
-}
-
-
-QMap<QString, QString> LocaleGlobal::getKeyboardModels() {
-    return parseKeyboardModels(XKB_FILE);
-}
-
-
-
 //###
 //### Private methods
 //###
@@ -174,132 +162,3 @@ double LocaleGlobal::getRightGeoLocation(QString str) {
 
     return sign * num;
 }
-
-
-
-//### Source by Georg Grabler <ggrabler@gmail.com> ###//
-QMap<QString, QString> LocaleGlobal::parseKeyboardModels(QString filepath)
-{
-    QMap<QString, QString> models;
-
-    QFile fh(filepath);
-    fh.open(QIODevice::ReadOnly);
-
-    if (!fh.isOpen()) {
-        qDebug() << "X11 Keyboard model definitions not found!";
-        return models;
-    }
-
-    bool modelsFound = false;
-    // read the file until the end or until we break the loop
-    while (!fh.atEnd()) {
-        QByteArray line = fh.readLine();
-
-        // check if we start with the model section in the file
-        if (!modelsFound && line.startsWith("! model"))
-            modelsFound = true;
-        else if (modelsFound && line.startsWith ("!"))
-            break;
-        else if (!modelsFound)
-            continue;
-
-        // here we are in the model section, otherwhise we would continue or break
-        QRegExp rx;
-        rx.setPattern("^\\s+(\\S+)\\s+(\\w.*)\n$");
-
-        // insert into the model map
-        if (rx.indexIn(line) != -1) {
-            QString modelDesc = rx.cap(2);
-            QString model = rx.cap(1);
-
-            if (model == "pc105")
-                modelDesc += "  -  " + QObject::tr("Default Keyboard Model");
-
-            models.insert(modelDesc, model);
-        }
-    }
-
-    return models;
-}
-
-
-
-QMap< QString, LocaleGlobal::KeyboardInfo > LocaleGlobal::parseKeyboardLayouts(QString filepath)
-{
-    QMap< QString, KeyboardInfo >  layouts;
-
-    //### Get Layouts ###//
-
-    QFile fh(filepath);
-    fh.open(QIODevice::ReadOnly);
-
-    if (!fh.isOpen()) {
-        qDebug() << "X11 Keyboard layout definitions not found!";
-        return layouts;
-    }
-
-    bool layoutsFound = false;
-    // read the file until the end or we break the loop
-    while (!fh.atEnd()) {
-        QByteArray line = fh.readLine();
-
-        // find the layout section otherwhise continue. If the layout section is at it's end, break the loop
-        if (!layoutsFound && line.startsWith("! layout"))
-            layoutsFound = true;
-        else if (layoutsFound && line.startsWith ("!"))
-            break;
-        else if (!layoutsFound)
-            continue;
-
-        QRegExp rx;
-        rx.setPattern("^\\s+(\\S+)\\s+(\\w.*)\n$");
-
-        // insert into the layout map
-        if (rx.indexIn(line) != -1) {
-            KeyboardInfo info;
-            info.description = rx.cap(2);
-            info.variants.insert(QObject::tr("Default"), "");
-            layouts.insert(rx.cap(1), info);
-        }
-    }
-
-    fh.reset();
-
-
-    //### Get Variants ###//
-
-    bool variantsFound = false;
-    // read the file until the end or until we break
-    while (!fh.atEnd()) {
-        QByteArray line = fh.readLine();
-
-        // continue until we found the variant section. If found, read until the next section is found
-        if (!variantsFound && line.startsWith("! variant")) {
-            variantsFound = true;
-            continue;
-        } else if (variantsFound && line.startsWith ("!"))
-            break;
-        else if (!variantsFound)
-            continue;
-
-        QRegExp rx;
-        rx.setPattern("^\\s+(\\S+)\\s+(\\S+): (\\w.*)\n$");
-
-        // insert into the variants multimap, if the pattern matches
-        if (rx.indexIn(line) != -1) {
-            if (layouts.find(rx.cap(2)) != layouts.end()) {
-                // in this case we found an entry in the multimap, and add the values to the multimap
-                layouts.find(rx.cap(2)).value().variants.insert(rx.cap(3), rx.cap(1));
-            } else {
-                // create a new map in the multimap - the value was not found.
-                KeyboardInfo info;
-                info.description = rx.cap(2);
-                info.variants.insert(QObject::tr("Default"), "");
-                info.variants.insert(rx.cap(3), rx.cap(1));
-                layouts.insert(rx.cap(2), info);
-            }
-        }
-    }
-
-    return layouts;
-}

src/modules/locale/timezonewidget/localeglobal.h

@@ -47,17 +47,9 @@ public:
         double latitude, longitude;
     };
 
-    struct KeyboardInfo {
-        QString description;
-        QMap< QString, QString > variants;
-    };
-
-
     static void init();
     static QHash<QString, QHash<QString, QList<LocaleGlobal::Locale> > > getLocales();
     static QHash<QString, QList<LocaleGlobal::Location> > getLocations();
-    static QMap< QString, KeyboardInfo > getKeyboardLayouts();
-    static QMap<QString, QString> getKeyboardModels();
 
 private:
     static QHash<QString, QHash<QString, QList<LocaleGlobal::Locale> > > locales;
@@ -66,9 +58,6 @@ private:
     static void initLocales();
     static void initLocations();
     static double getRightGeoLocation(QString str);
-
-    static QMap<QString, QString> parseKeyboardModels(QString filepath);
-    static QMap< QString, KeyboardInfo > parseKeyboardLayouts(QString filepath);
 };
 
 #endif // LOCALEGLOBAL_H