diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-10-06 10:57:16 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-10-06 10:57:16 -0700 |
| commit | b3490213f42ed63bc4b05b37bcfc12809f2d432c (patch) | |
| tree | d56ede6f1ea8d20c2120eba2b9ca705927a77913 /qt-ui/mainwindow.cpp | |
| parent | 92d8978ab4ad980397883b50d0e7bc81d2bf5f73 (diff) | |
| parent | 70352c3962cf3b4379590326cdc489ac0543f7e9 (diff) | |
| download | subsurface-b3490213f42ed63bc4b05b37bcfc12809f2d432c.tar.gz | |
Merge branch 'glib-removal-hack'
Fix obvious merge issue in Rules.mk
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/mainwindow.cpp')
| -rw-r--r-- | qt-ui/mainwindow.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 84b1bc50b..247cfdf2f 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -20,7 +20,6 @@ #include "divelistview.h" #include "starwidget.h" -#include "glib.h" #include "../dive.h" #include "../divelist.h" #include "../pref.h" @@ -36,8 +35,6 @@ #include "about.h" #include "printdialog.h" -#include "glib/gi18n.h" - static MainWindow* instance = 0; MainWindow* mainWindow() @@ -271,7 +268,7 @@ void MainWindow::on_actionAddDive_triggered() // now cheat - create one dive that we use to store the info tab data in struct dive *dive = alloc_dive(); dive->when = QDateTime::currentMSecsSinceEpoch() / 1000L; - dive->dc.model = _("manually added dive"); // do not use tr here since it expects a char*. + dive->dc.model = tr("manually added dive").toLocal8Bit().constData(); // do not use tr here since it expects a char*. record_dive(dive); select_dive(get_divenr(dive)); ui.InfoWidget->updateDiveInfo(selected_dive); |