From 856eaf6d52c94fdf3bb0e3cdd60b79dccd8325f4 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 14 Sep 2010 11:05:14 +0200 Subject: I18n: Fix some lupdate warnings. --- src/corelib/plugin/qsystemlibrary.cpp | 4 +- src/declarative/qml/qdeclarativetypeloader.cpp | 8 +- src/gui/accessible/qaccessible_win.cpp | 130 ++++++++++----------- src/gui/embedded/qsoundqss_qws.cpp | 2 +- .../tools/assistant/helpenginewrapper.cpp | 2 +- tools/assistant/tools/qhelpconverter/filespage.cpp | 4 +- .../assistant/tools/qhelpconverter/filterpage.cpp | 2 +- .../formeditor/formeditor_optionspage.cpp | 6 +- tools/linguist/shared/translator.h | 4 +- 9 files changed, 82 insertions(+), 80 deletions(-) diff --git a/src/corelib/plugin/qsystemlibrary.cpp b/src/corelib/plugin/qsystemlibrary.cpp index a11ed50..eeb142b 100644 --- a/src/corelib/plugin/qsystemlibrary.cpp +++ b/src/corelib/plugin/qsystemlibrary.cpp @@ -78,7 +78,7 @@ (http://msdn.microsoft.com/en-us/library/ms886736.aspx) */ #if defined(Q_OS_WINCE) -HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirectory/*= true*/) +HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirectory /* = true */) { return ::LoadLibrary(libraryName); } @@ -101,7 +101,7 @@ static QString qSystemDirectory() return QString::fromWCharArray(fullPath.constData(), int(retLen)); } -HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirectory/*= true*/) +HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirectory /* = true */) { QStringList searchOrder; diff --git a/src/declarative/qml/qdeclarativetypeloader.cpp b/src/declarative/qml/qdeclarativetypeloader.cpp index 9b42065..061f309 100644 --- a/src/declarative/qml/qdeclarativetypeloader.cpp +++ b/src/declarative/qml/qdeclarativetypeloader.cpp @@ -804,7 +804,7 @@ void QDeclarativeTypeData::done() error.setUrl(finalUrl()); error.setLine(script.location.line); error.setColumn(script.location.column); - error.setDescription(typeLoader()->tr("Script %1 unavailable").arg(script.script->url().toString())); + error.setDescription(QDeclarativeTypeLoader::tr("Script %1 unavailable").arg(script.script->url().toString())); errors.prepend(error); setError(errors); } @@ -822,7 +822,7 @@ void QDeclarativeTypeData::done() error.setUrl(finalUrl()); error.setLine(type.location.line); error.setColumn(type.location.column); - error.setDescription(typeLoader()->tr("Type %1 unavailable").arg(typeName)); + error.setDescription(QDeclarativeTypeLoader::tr("Type %1 unavailable").arg(typeName)); errors.prepend(error); setError(errors); } @@ -995,9 +995,9 @@ void QDeclarativeTypeData::resolveTypes() QString userTypeName = parserRef->name; userTypeName.replace(QLatin1Char('/'),QLatin1Char('.')); if (typeNamespace) - error.setDescription(typeLoader()->tr("Namespace %1 cannot be used as a type").arg(userTypeName)); + error.setDescription(QDeclarativeTypeLoader::tr("Namespace %1 cannot be used as a type").arg(userTypeName)); else - error.setDescription(typeLoader()->tr("%1 %2").arg(userTypeName).arg(errorString)); + error.setDescription(QDeclarativeTypeLoader::tr("%1 %2").arg(userTypeName).arg(errorString)); if (!parserRef->refObjects.isEmpty()) { QDeclarativeParser::Object *obj = parserRef->refObjects.first(); diff --git a/src/gui/accessible/qaccessible_win.cpp b/src/gui/accessible/qaccessible_win.cpp index 132d01f..31e7245 100644 --- a/src/gui/accessible/qaccessible_win.cpp +++ b/src/gui/accessible/qaccessible_win.cpp @@ -76,71 +76,71 @@ QT_END_INCLUDE_NAMESPACE static const char *roleString(QAccessible::Role role) { static const char *roles[] = { - "NoRole" /*= 0x00000000*/, - "TitleBar" /*= 0x00000001*/, - "MenuBar" /*= 0x00000002*/, - "ScrollBar" /*= 0x00000003*/, - "Grip" /*= 0x00000004*/, - "Sound" /*= 0x00000005*/, - "Cursor" /*= 0x00000006*/, - "Caret" /*= 0x00000007*/, - "AlertMessage" /*= 0x00000008*/, - "Window" /*= 0x00000009*/, - "Client" /*= 0x0000000A*/, - "PopupMenu" /*= 0x0000000B*/, - "MenuItem" /*= 0x0000000C*/, - "ToolTip" /*= 0x0000000D*/, - "Application" /*= 0x0000000E*/, - "Document" /*= 0x0000000F*/, - "Pane" /*= 0x00000010*/, - "Chart" /*= 0x00000011*/, - "Dialog" /*= 0x00000012*/, - "Border" /*= 0x00000013*/, - "Grouping" /*= 0x00000014*/, - "Separator" /*= 0x00000015*/, - "ToolBar" /*= 0x00000016*/, - "StatusBar" /*= 0x00000017*/, - "Table" /*= 0x00000018*/, - "ColumnHeader" /*= 0x00000019*/, - "RowHeader" /*= 0x0000001A*/, - "Column" /*= 0x0000001B*/, - "Row" /*= 0x0000001C*/, - "Cell" /*= 0x0000001D*/, - "Link" /*= 0x0000001E*/, - "HelpBalloon" /*= 0x0000001F*/, - "Assistant" /*= 0x00000020*/, - "List" /*= 0x00000021*/, - "ListItem" /*= 0x00000022*/, - "Tree" /*= 0x00000023*/, - "TreeItem" /*= 0x00000024*/, - "PageTab" /*= 0x00000025*/, - "PropertyPage" /*= 0x00000026*/, - "Indicator" /*= 0x00000027*/, - "Graphic" /*= 0x00000028*/, - "StaticText" /*= 0x00000029*/, - "EditableText" /*= 0x0000002A*/, // Editable, selectable, etc. - "PushButton" /*= 0x0000002B*/, - "CheckBox" /*= 0x0000002C*/, - "RadioButton" /*= 0x0000002D*/, - "ComboBox" /*= 0x0000002E*/, - "DropList" /*= 0x0000002F*/, // commented out - "ProgressBar" /*= 0x00000030*/, - "Dial" /*= 0x00000031*/, - "HotkeyField" /*= 0x00000032*/, - "Slider" /*= 0x00000033*/, - "SpinBox" /*= 0x00000034*/, - "Canvas" /*= 0x00000035*/, - "Animation" /*= 0x00000036*/, - "Equation" /*= 0x00000037*/, - "ButtonDropDown" /*= 0x00000038*/, - "ButtonMenu" /*= 0x00000039*/, - "ButtonDropGrid" /*= 0x0000003A*/, - "Whitespace" /*= 0x0000003B*/, - "PageTabList" /*= 0x0000003C*/, - "Clock" /*= 0x0000003D*/, - "Splitter" /*= 0x0000003E*/, - "LayeredPane" /*= 0x0000003F*/, - "UserRole" /*= 0x0000ffff*/ + "NoRole" /* = 0x00000000 */, + "TitleBar" /* = 0x00000001 */, + "MenuBar" /* = 0x00000002 */, + "ScrollBar" /* = 0x00000003 */, + "Grip" /* = 0x00000004 */, + "Sound" /* = 0x00000005 */, + "Cursor" /* = 0x00000006 */, + "Caret" /* = 0x00000007 */, + "AlertMessage" /* = 0x00000008 */, + "Window" /* = 0x00000009 */, + "Client" /* = 0x0000000A */, + "PopupMenu" /* = 0x0000000B */, + "MenuItem" /* = 0x0000000C */, + "ToolTip" /* = 0x0000000D */, + "Application" /* = 0x0000000E */, + "Document" /* = 0x0000000F */, + "Pane" /* = 0x00000010 */, + "Chart" /* = 0x00000011 */, + "Dialog" /* = 0x00000012 */, + "Border" /* = 0x00000013 */, + "Grouping" /* = 0x00000014 */, + "Separator" /* = 0x00000015 */, + "ToolBar" /* = 0x00000016 */, + "StatusBar" /* = 0x00000017 */, + "Table" /* = 0x00000018 */, + "ColumnHeader" /* = 0x00000019 */, + "RowHeader" /* = 0x0000001A */, + "Column" /* = 0x0000001B */, + "Row" /* = 0x0000001C */, + "Cell" /* = 0x0000001D */, + "Link" /* = 0x0000001E */, + "HelpBalloon" /* = 0x0000001F */, + "Assistant" /* = 0x00000020 */, + "List" /* = 0x00000021 */, + "ListItem" /* = 0x00000022 */, + "Tree" /* = 0x00000023 */, + "TreeItem" /* = 0x00000024 */, + "PageTab" /* = 0x00000025 */, + "PropertyPage" /* = 0x00000026 */, + "Indicator" /* = 0x00000027 */, + "Graphic" /* = 0x00000028 */, + "StaticText" /* = 0x00000029 */, + "EditableText" /* = 0x0000002A */, // Editable, selectable, etc. + "PushButton" /* = 0x0000002B */, + "CheckBox" /* = 0x0000002C */, + "RadioButton" /* = 0x0000002D */, + "ComboBox" /* = 0x0000002E */, + "DropList" /* = 0x0000002F */, // commented out + "ProgressBar" /* = 0x00000030 */, + "Dial" /* = 0x00000031 */, + "HotkeyField" /* = 0x00000032 */, + "Slider" /* = 0x00000033 */, + "SpinBox" /* = 0x00000034 */, + "Canvas" /* = 0x00000035 */, + "Animation" /* = 0x00000036 */, + "Equation" /* = 0x00000037 */, + "ButtonDropDown" /* = 0x00000038 */, + "ButtonMenu" /* = 0x00000039 */, + "ButtonDropGrid" /* = 0x0000003A */, + "Whitespace" /* = 0x0000003B */, + "PageTabList" /* = 0x0000003C */, + "Clock" /* = 0x0000003D */, + "Splitter" /* = 0x0000003E */, + "LayeredPane" /* = 0x0000003F */, + "UserRole" /* = 0x0000ffff*/ }; if (role >=0x40) diff --git a/src/gui/embedded/qsoundqss_qws.cpp b/src/gui/embedded/qsoundqss_qws.cpp index 3958cf0..c77c35c 100644 --- a/src/gui/embedded/qsoundqss_qws.cpp +++ b/src/gui/embedded/qsoundqss_qws.cpp @@ -286,7 +286,7 @@ public: rightVolume = maxVolume>>1; isPriority = false; samples_due = 0; - max1 = max2 = out = 0;//= sound_buffer_size; + max1 = max2 = out = 0;// = sound_buffer_size; data = data1; max = &max1; sampleRunin = 0; diff --git a/tools/assistant/tools/assistant/helpenginewrapper.cpp b/tools/assistant/tools/assistant/helpenginewrapper.cpp index 9748702..a53a9ee 100644 --- a/tools/assistant/tools/assistant/helpenginewrapper.cpp +++ b/tools/assistant/tools/assistant/helpenginewrapper.cpp @@ -114,7 +114,7 @@ private: QMap m_recentQchUpdates; }; -const QString HelpEngineWrapper::TrUnfiltered = tr("Unfiltered"); +const QString HelpEngineWrapper::TrUnfiltered = HelpEngineWrapper::tr("Unfiltered"); HelpEngineWrapper *HelpEngineWrapper::helpEngineWrapper = 0; diff --git a/tools/assistant/tools/qhelpconverter/filespage.cpp b/tools/assistant/tools/qhelpconverter/filespage.cpp index 4ebf391..fd4a40e 100644 --- a/tools/assistant/tools/qhelpconverter/filespage.cpp +++ b/tools/assistant/tools/qhelpconverter/filespage.cpp @@ -59,8 +59,8 @@ FilesPage::FilesPage(QWidget *parent) connect(m_ui.removeAllButton, SIGNAL(clicked()), this, SLOT(removeAllFiles())); - m_ui.fileLabel->setText(tr("

Warning: Be aware " - "when removing images or stylesheets since those files " + m_ui.fileLabel->setText(tr("

Warning: " + "When removing images or stylesheets, be aware that those files " "are not directly referenced by the .adp or .dcf " "file.

")); } diff --git a/tools/assistant/tools/qhelpconverter/filterpage.cpp b/tools/assistant/tools/qhelpconverter/filterpage.cpp index c782943..c15a580 100644 --- a/tools/assistant/tools/qhelpconverter/filterpage.cpp +++ b/tools/assistant/tools/qhelpconverter/filterpage.cpp @@ -50,7 +50,7 @@ FilterPage::FilterPage(QWidget *parent) setTitle(tr("Filter Settings")); setSubTitle(tr("Specify the filter attributes for the " "documentation. If filter attributes are used, " - "also define a custom filter for it. Both, the " + "also define a custom filter for it. Both the " "filter attributes and the custom filters are " "optional.")); diff --git a/tools/designer/src/components/formeditor/formeditor_optionspage.cpp b/tools/designer/src/components/formeditor/formeditor_optionspage.cpp index 102f44a..8e0cc66 100644 --- a/tools/designer/src/components/formeditor/formeditor_optionspage.cpp +++ b/tools/designer/src/components/formeditor/formeditor_optionspage.cpp @@ -86,9 +86,11 @@ ZoomSettingsWidget::ZoomSettingsWidget(QWidget *parent) : m_zoomCombo->setEditable(false); const IntList zoomValues = ZoomMenu::zoomValues(); const IntList::const_iterator cend = zoomValues.constEnd(); - //: Zoom percentage - for (IntList::const_iterator it = zoomValues.constBegin(); it != cend; ++it) + + for (IntList::const_iterator it = zoomValues.constBegin(); it != cend; ++it) { + //: Zoom percentage m_zoomCombo->addItem(QCoreApplication::translate("FormEditorOptionsPage", "%1 %").arg(*it), QVariant(*it)); + } // Layout setCheckable(true); diff --git a/tools/linguist/shared/translator.h b/tools/linguist/shared/translator.h index cfb2178..02cfb07 100644 --- a/tools/linguist/shared/translator.h +++ b/tools/linguist/shared/translator.h @@ -123,8 +123,8 @@ class Translator public: Translator(); - bool load(const QString &filename, ConversionData &err, const QString &format /*= "auto"*/); - bool save(const QString &filename, ConversionData &err, const QString &format /*= "auto"*/) const; + bool load(const QString &filename, ConversionData &err, const QString &format /* = "auto" */); + bool save(const QString &filename, ConversionData &err, const QString &format /* = "auto" */) const; bool release(QFile *iod, ConversionData &cd) const; int find(const TranslatorMessage &msg) const; -- cgit v0.12