- Fixup merge errors

raspberrypi · Sep 27, 2013 · 0b35ba0 · 0b35ba0
1 parent 9127ef2
commit 0b35ba0
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 24 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/buildroot/package/recovery/init b/buildroot/package/recovery/init
@@ -17,9 +17,6 @@
 # Set up ACT LED to be triggered by mmc0
 echo mmc0 > /sys/class/leds/led0/trigger
 
-# Set up ACT LED to be triggered by mmc0
-echo mmc0 > /sys/class/leds/led0/trigger
-
 # Rescue shell available on tty2 and tty3
 echo 2 >/sys/module/vt/parameters/cur_default
 /sbin/getty -L tty2 0 vt100 &

diff --git a/recovery/languagedialog.cpp b/recovery/languagedialog.cpp
@@ -39,7 +39,7 @@ LanguageDialog *LanguageDialog::_instance = NULL;
 LanguageDialog::LanguageDialog(const QString &defaultLang, const QString &defaultKeyboard, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::LanguageDialog),
-    _trans(NULL), _qttrans(NULL), _currentLang(currentLangCode)
+    _trans(NULL), _qttrans(NULL)
 {
     _instance = this;
 
@@ -75,7 +75,6 @@ LanguageDialog::LanguageDialog(const QString &defaultLang, const QString &defaul
     QDir dir(":/", "translation_*.qm");
     QStringList translations = dir.entryList();
 
-    bool validStartLang = false;
     foreach (QString langfile, translations)
     {
         QString langcode = langfile.mid(12);

diff --git a/recovery/languagedialog.ui b/recovery/languagedialog.ui
@@ -141,7 +141,6 @@
    </item>
    <item row="0" column="1">
     <widget class="QComboBox" name="langCombo">
-     <addaction name="actionOpenComboBox"/>
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>

diff --git a/recovery/mainwindow.cpp b/recovery/mainwindow.cpp
@@ -496,19 +496,6 @@ void MainWindow::update_window_title()
     setWindowTitle(QString(tr("NOOBS v%1 - Built: %2")).arg(VERSION_NUMBER, QString::fromLocal8Bit(__DATE__)));
 }
 
-void MainWindow::update_window_title()
-{
-    setWindowTitle(QString(tr("NOOBS v%1 - Built: %2")).arg(VERSION_NUMBER, QString::fromLocal8Bit(__DATE__)));
-}
-
-void MainWindow::update_recommended_label()
-{
-    if (recommendedItem)
-    {
-        recommendedItem->setText(imageFilenameToFriendlyName(recommendedItem->data(Qt::UserRole).toString())+QString(" [%1]").arg(tr("RECOMMENDED")));
-    }
-}
-
 void MainWindow::changeEvent(QEvent* event)
 {
     if (event && event->type() == QEvent::LanguageChange)

diff --git a/recovery/recovery.pro b/recovery/recovery.pro
@@ -14,8 +14,6 @@ LIBS += -lqjson
 
 system(sh updateqm.sh 2>/dev/null)
 
-system(sh updateqm.sh)
-
 SOURCES += main.cpp\
         mainwindow.cpp \
     languagedialog.cpp \