mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Undoing the last Qtr_ hack

Browse source 
The Qtr_ hack isn't needed as in commit 720fc15b2dcd ("Introduce
QApplication") had already made sure that we are using gettext.

I didn't revert the two commits as I wanted to keep the added header
comments and fix the tooling in the Makefile as well.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-04-14 06:44:29 -07:00
parent fc0e307f00
commit d8e11439ad
7 changed files with 21 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

5
qt-gui.cpp
View file

@ -25,7 +25,6 @@
#include "version.h"
#include "libdivecomputer.h"
#include "qt-ui/mainwindow.h"
#include "qt-ui/common.h"
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk-pixbuf/gdk-pixdata.h>
@ -1785,7 +1784,7 @@ void MainWindow::setCurrentFileName(const QString &fileName)
if (fileName == m_currentFileName) return;
m_currentFileName = fileName;
QString title = Qtr_("Subsurface");
QString title = tr("Subsurface");
if (!m_currentFileName.isEmpty()) {
QFileInfo fileInfo(m_currentFileName);
title += " - " + fileInfo.fileName();
@ -1798,7 +1797,7 @@ void MainWindow::on_actionOpen_triggered()
QString defaultFileName = QString::fromUtf8(prefs.default_filename);
QFileInfo fileInfo(defaultFileName);
QFileDialog dialog(this, Qtr_("Open File"), fileInfo.path());
QFileDialog dialog(this, tr("Open File"), fileInfo.path());
dialog.setFileMode(QFileDialog::ExistingFile);
dialog.selectFile(defaultFileName);
dialog.setNameFilters(fileNameFilters());