Reversed changed...

src/frameworks/UBPlatformUtils.h

@@ -19,11 +19,6 @@
 #include <QtCore>
 #include <QIcon>
 
-#ifdef Q_WS_MACX
-    #import <Carbon/Carbon.h>
-#endif
-
-
 class QMainWindow;
 
 #define SYMBOL_KEYS_COUNT 47
@@ -130,31 +125,28 @@ struct KEYBT
 	class UBKeyboardLocale
 	{
 	public:
-        #ifdef Q_WS_MACX
 		UBKeyboardLocale(const QString& _fullName,
 			const QString& _name,
-                TISInputSourceRef _tisInputSourceRef,
+			const QString& _id,
 			QIcon* _icon,
 			KEYBT** _symbols)
-			    :fullName(_fullName),name(_name), tisInputSourceRef(_tisInputSourceRef), 
+			:fullName(_fullName),name(_name), id(_id), icon(_icon),
-                    icon(_icon),constSymbols(NULL), varSymbols(_symbols)
+                        constSymbols(NULL), varSymbols(_symbols)
 		{}
-
-            TISInputSourceRef tisInputSourceRef;
-        #else
 		UBKeyboardLocale(const QString& _fullName,
 			const QString& _name,
+			const QString& _id,
 			QIcon* _icon,
             KEYBT _symbols[])
-			    :fullName(_fullName),name(_name), icon(_icon),
+			:fullName(_fullName),name(_name),  id(_id), icon(_icon),
                         constSymbols(_symbols), varSymbols(NULL)
 		{}
-        #endif
 
 		~UBKeyboardLocale();
 
 		const QString fullName;
 		const QString name;
+		const QString id;
 		QIcon* icon;
         KEYBT* operator[] (int index) const
 		{

src/frameworks/UBPlatformUtils_linux.cpp

@@ -399,11 +399,11 @@ void UBPlatformUtils::initializeKeyboardLayouts()
 {
     nKeyboardLayouts = 5;
     keyboardLayouts = new UBKeyboardLocale*[nKeyboardLayouts];
-    keyboardLayouts[0] = new UBKeyboardLocale(tr("English"), "en", new QIcon(":/images/flags/en.png"), ENGLISH_LOCALE);
+    keyboardLayouts[0] = new UBKeyboardLocale(tr("English"), "en", "", new QIcon(":/images/flags/en.png"), ENGLISH_LOCALE);
-    keyboardLayouts[1] = new UBKeyboardLocale(tr("Russian"), "ru", new QIcon(":/images/flags/ru.png"),RUSSIAN_LOCALE);
+    keyboardLayouts[1] = new UBKeyboardLocale(tr("Russian"), "ru", "", new QIcon(":/images/flags/ru.png"),RUSSIAN_LOCALE);
-    keyboardLayouts[2] = new UBKeyboardLocale(tr("German"), "de", new QIcon(":/images/flags/de.png"), GERMAN_LOCALE);
+    keyboardLayouts[2] = new UBKeyboardLocale(tr("German"), "de", "", new QIcon(":/images/flags/de.png"), GERMAN_LOCALE);
-    keyboardLayouts[3] = new UBKeyboardLocale(tr("French"), "fr", new QIcon(":/images/flags/fr.png"), FRENCH_LOCALE);
+    keyboardLayouts[3] = new UBKeyboardLocale(tr("French"), "fr", "", new QIcon(":/images/flags/fr.png"), FRENCH_LOCALE);
-    keyboardLayouts[4] = new UBKeyboardLocale(tr("Swiss French"), "fr-CH", new QIcon(":/images/flags/fr.png"), SWISS_FRENCH_LOCALE);
+    keyboardLayouts[4] = new UBKeyboardLocale(tr("Swiss French"), "fr-CH", "", new QIcon(":/images/flags/fr.png"), SWISS_FRENCH_LOCALE);
 }
 
 void UBPlatformUtils::destroyKeyboardLayouts()

src/frameworks/UBPlatformUtils_win.cpp

@@ -407,16 +407,11 @@ void UBPlatformUtils::initializeKeyboardLayouts()
 {
 	nKeyboardLayouts = 5;
 	keyboardLayouts = new UBKeyboardLocale*[nKeyboardLayouts];
-    keyboardLayouts[0] = new UBKeyboardLocale(tr("English"),"en", 
+    keyboardLayouts[0] = new UBKeyboardLocale(tr("English"), "en", "", new QIcon(":/images/flags/en.png"), ENGLISH_LOCALE);
-        new QIcon(":/images/flags/en.png"), ENGLISH_LOCALE);
+    keyboardLayouts[1] = new UBKeyboardLocale(tr("Russian"), "ru", "", new QIcon(":/images/flags/ru.png"),RUSSIAN_LOCALE);
-    keyboardLayouts[1] = new UBKeyboardLocale(tr("Russian"), "ru", 
+    keyboardLayouts[2] = new UBKeyboardLocale(tr("French"), "fr", "", new QIcon(":/images/flags/fr.png"), FRENCH_LOCALE);
-        new QIcon(":/images/flags/ru.png"),RUSSIAN_LOCALE);
+    keyboardLayouts[3] = new UBKeyboardLocale(tr("Swiss French"), "fr-CH", "", new QIcon(":/images/flags/fr.png"), SWISS_FRENCH_LOCALE);
-    keyboardLayouts[2] = new UBKeyboardLocale(tr("French"), "fr", 
+    keyboardLayouts[4] = new UBKeyboardLocale(tr("German"), "de", "", new QIcon(":/images/flags/de.png"), GERMAN_LOCALE);
-        new QIcon(":/images/flags/fr.png"), FRENCH_LOCALE);
-    keyboardLayouts[3] = new UBKeyboardLocale(tr("Swiss French"), "fr-CH", 
-        new QIcon(":/images/flags/fr.png"), SWISS_FRENCH_LOCALE);
-    keyboardLayouts[4] = new UBKeyboardLocale(tr("German"), "de", 
-        new QIcon(":/images/flags/de.png"), GERMAN_LOCALE);
 }
 
 void UBPlatformUtils::destroyKeyboardLayouts()