diff options
| -rw-r--r-- | lib/qmmp/Input/flac/decoder_flac.cpp | 4 | ||||
| -rw-r--r-- | lib/qmmp/Input/vorbis/decoder_vorbis.cpp | 4 | ||||
| -rw-r--r-- | src/symboldisplay.cpp | 8 | ||||
| -rw-r--r-- | src/translations/qmmp_ru.qm | bin | 8812 -> 8812 bytes | |||
| -rw-r--r-- | src/translations/qmmp_ru.ts | 3 |
5 files changed, 12 insertions, 7 deletions
diff --git a/lib/qmmp/Input/flac/decoder_flac.cpp b/lib/qmmp/Input/flac/decoder_flac.cpp index c4cec70ba..4a23dc097 100644 --- a/lib/qmmp/Input/flac/decoder_flac.cpp +++ b/lib/qmmp/Input/flac/decoder_flac.cpp @@ -24,8 +24,8 @@ #include "output.h" #include "recycler.h" -#include <qobject.h> -#include <qiodevice.h> +#include <QObject> +#include <QIODevice> #include <FLAC/all.h> #include "decoder_flac.h" diff --git a/lib/qmmp/Input/vorbis/decoder_vorbis.cpp b/lib/qmmp/Input/vorbis/decoder_vorbis.cpp index 34ba9ae8f..5f795d59b 100644 --- a/lib/qmmp/Input/vorbis/decoder_vorbis.cpp +++ b/lib/qmmp/Input/vorbis/decoder_vorbis.cpp @@ -10,8 +10,8 @@ #include "output.h" #include "recycler.h" -#include <qobject.h> -#include <qiodevice.h> +#include <QObject> +#include <QIODevice> // ic functions for OggVorbis diff --git a/src/symboldisplay.cpp b/src/symboldisplay.cpp index df55057f2..b3942a6bb 100644 --- a/src/symboldisplay.cpp +++ b/src/symboldisplay.cpp @@ -31,8 +31,12 @@ SymbolDisplay::SymbolDisplay ( QWidget *parent, int digits ) m_skin = Skin::getPointer(); connect ( m_skin, SIGNAL ( skinChanged() ), this, SLOT (draw())); draw(); - for(int i=0; i<m_digits; ++i) + for (int i=0; i<m_digits; ++i) +#ifdef Q_OS_FREEBSD + m_max += 9 * (int) pow(10,i); +#else m_max += 9 * (int) exp10(i); +#endif } @@ -79,7 +83,7 @@ void SymbolDisplay::draw() void SymbolDisplay::display(int val) { - if(val < m_max) + if (val < m_max) display(QString::number(val)); else display(QString("%1h").arg(val/100)); diff --git a/src/translations/qmmp_ru.qm b/src/translations/qmmp_ru.qm Binary files differindex 0b543721d..38c82d0e8 100644 --- a/src/translations/qmmp_ru.qm +++ b/src/translations/qmmp_ru.qm diff --git a/src/translations/qmmp_ru.ts b/src/translations/qmmp_ru.ts index 7e4a8499d..32fdd757d 100644 --- a/src/translations/qmmp_ru.ts +++ b/src/translations/qmmp_ru.ts @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS><TS version="1.1" language="ru"> +<defaultcodec></defaultcodec> <context> <name>AboutDialog</name> <message> @@ -198,7 +199,7 @@ <message> <location filename="../configdialog.ui" line="486"/> <source>Message delay, ms:</source> - <translation>Задержка сообщение, мс:</translation> + <translation>Задержка сообщения, мс:</translation> </message> <message> <location filename="../configdialog.ui" line="496"/> |