[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdelibs/frameworks] /: Don't use QObject::tr static method
From: Kevin Ottens <ervin+bluesystems () kde ! org>
Date: 2013-08-20 15:07:17
Message-ID: E1VBnWf-0005lq-Co () scm ! kde ! org
[Download RAW message or body]
Git commit 6e711b78aedf47d2f1599125c9ac8c2b6a06d93c by Kevin Ottens.
Committed on 20/08/2013 at 13:20.
Pushed by ervin into branch 'frameworks'.
Don't use QObject::tr static method
M +3 -3 kio/bookmarks/kbookmarkdialog.cc
M +1 -1 kjsembed/kjsembed/kjseglobal.cpp
M +3 -3 kross/modules/form.cpp
M +22 -17 staging/kjobwidgets/src/kjobtrackerformatters.cpp
M +6 -6 staging/knotifications/src/kstatusnotifieritem.cpp
M +8 -3 tier1/kcoreaddons/src/lib/kaboutdata.cpp
M +1 -1 tier1/kwidgetsaddons/src/kcolorcombo.cpp
M +2 -2 tier1/kwidgetsaddons/src/kmessagewidget.cpp
M +4 -4 tier1/solid/src/solid/backends/udisks/udisksdevice.cpp
M +1 -1 tier1/solid/src/solid/backends/win/winbattery.cpp
M +6 -6 tier1/solid/src/solid/backends/win/windevice.cpp
M +3 -2 tier1/threadweaver/src/Weaver/DependencyPolicy.cpp
http://commits.kde.org/kdelibs/6e711b78aedf47d2f1599125c9ac8c2b6a06d93c
diff --git a/kio/bookmarks/kbookmarkdialog.cc \
b/kio/bookmarks/kbookmarkdialog.cc index db7eaa3..a27f4e1 100644
--- a/kio/bookmarks/kbookmarkdialog.cc
+++ b/kio/bookmarks/kbookmarkdialog.cc
@@ -67,17 +67,17 @@ void KBookmarkDialogPrivate::initLayoutPrivate()
{
title = new QLineEdit(q);
title->setMinimumWidth(300);
- titleLabel = new QLabel(QObject::tr("Name:", "@label:textbox"), q);
+ titleLabel = new QLabel(q->tr("Name:", "@label:textbox"), q);
titleLabel->setBuddy( title );
url = new QLineEdit(q);
url->setMinimumWidth(300);
- urlLabel = new QLabel(QObject::tr("Location:", "@label:textbox"), q);
+ urlLabel = new QLabel(q->tr("Location:", "@label:textbox"), q);
urlLabel->setBuddy( url );
comment = new QLineEdit(q);
comment->setMinimumWidth(300);
- commentLabel = new QLabel(QObject::tr("Comment:", "@label:textbox"), \
q); + commentLabel = new QLabel(q->tr("Comment:", "@label:textbox"), q);
commentLabel->setBuddy( comment );
folderTree = new QTreeWidget(q);
diff --git a/kjsembed/kjsembed/kjseglobal.cpp \
b/kjsembed/kjsembed/kjseglobal.cpp index 3f9a7e4..dd1e473 100644
--- a/kjsembed/kjsembed/kjseglobal.cpp
+++ b/kjsembed/kjsembed/kjseglobal.cpp
@@ -110,7 +110,7 @@ QTextStream &kdWarning( int area )
QString i18n( const char *string )
{
- return QObject::tr( string, "qjsembed string");
+ return QCoreApplication::translate( "KJSEmbed", string, "qjsembed \
string"); }
#endif
diff --git a/kross/modules/form.cpp b/kross/modules/form.cpp
index a5daa75..254aeb5 100644
--- a/kross/modules/form.cpp
+++ b/kross/modules/form.cpp
@@ -727,11 +727,11 @@ QWidget* FormModule::createWidget(QWidget* parent, \
const QString& className, con
QString FormModule::tr(const QString& str)
{
- return QObject::tr(str.toUtf8());
+ return tr(str.toUtf8().constData());
}
QString FormModule::tr(const QString& str, const QString& comment)
{
- return QObject::tr(str.toUtf8(),comment.toUtf8());
+ return tr(str.toUtf8().constData(), comment.toUtf8().constData());
}
QWidget* FormModule::createWidgetFromUI(QWidget* parent, const QString& \
xml) @@ -746,7 +746,7 @@ QWidget* FormModule::createWidgetFromUI(QWidget* \
parent, const QString& xml) while(--i>=0)
{
QDomElement e=strings.at(i).toElement();
- QString i18nd=e.attribute("comment").isEmpty()?QObject::tr(e.text().toUtf8()):QObject::tr(e.text().toUtf8(),e.attribute("comment").toUtf8());
+ QString i18nd=e.attribute("comment").isEmpty()? tr(e.text()) : \
tr(e.text(), e.attribute("comment")); if (i18nd==e.text())
continue;
QDomNode n = e.firstChild();
diff --git a/staging/kjobwidgets/src/kjobtrackerformatters.cpp \
b/staging/kjobwidgets/src/kjobtrackerformatters.cpp index 95e8cfb..fc49738 \
100644
--- a/staging/kjobwidgets/src/kjobtrackerformatters.cpp
+++ b/staging/kjobwidgets/src/kjobtrackerformatters.cpp
@@ -24,20 +24,25 @@
#include "kjobtrackerformatters_p.h"
-#include <QObject>
+#include <QCoreApplication>
+
+static QString tr(const char *message, const char *disambiguation = 0, int \
n = -1) +{
+ return QCoreApplication::translate("KJobTrackerFormatters", message, \
disambiguation, n); +}
QString KJobTrackerFormatters::byteSize(double size)
{
QList<QString> units;
- units << QObject::tr("%1 B")
- << QObject::tr("%1 KiB")
- << QObject::tr("%1 MiB")
- << QObject::tr("%1 GiB")
- << QObject::tr("%1 TiB")
- << QObject::tr("%1 PiB")
- << QObject::tr("%1 EiB")
- << QObject::tr("%1 ZiB")
- << QObject::tr("%1 YiB");
+ units << tr("%1 B")
+ << tr("%1 KiB")
+ << tr("%1 MiB")
+ << tr("%1 GiB")
+ << tr("%1 TiB")
+ << tr("%1 PiB")
+ << tr("%1 EiB")
+ << tr("%1 ZiB")
+ << tr("%1 YiB");
int unit = 0; // Selects what unit to use
const double multiplier = 1024.0;
@@ -57,22 +62,22 @@ QString KJobTrackerFormatters::byteSize(double size)
QString KJobTrackerFormatters::daysDuration(int n)
{
- return QObject::tr("%n day(s)", "@item:intext", n);
+ return tr("%n day(s)", "@item:intext", n);
}
QString KJobTrackerFormatters::hoursDuration(int n)
{
- return QObject::tr("%n hour(s)", "@item:intext", n);
+ return tr("%n hour(s)", "@item:intext", n);
}
QString KJobTrackerFormatters::minutesDuration(int n)
{
- return QObject::tr("%n minute(s)", "@item:intext", n);
+ return tr("%n minute(s)", "@item:intext", n);
}
QString KJobTrackerFormatters::secondsDuration(int n)
{
- return QObject::tr("%n second(s)", "@item:intext", n);
+ return tr("%n second(s)", "@item:intext", n);
}
QString KJobTrackerFormatters::duration(unsigned long mSec)
@@ -93,15 +98,15 @@ QString KJobTrackerFormatters::duration(unsigned long \
mSec) }
if (days && hours) {
- return QObject::tr("%1 and %2", "@item:intext days and \
hours.").arg(daysDuration(days)).arg(hoursDuration(hours)); + return \
tr("%1 and %2", "@item:intext days and \
hours.").arg(daysDuration(days)).arg(hoursDuration(hours)); } else if \
(days) { return daysDuration(days);
} else if (hours && minutes) {
- return QObject::tr("%1 and %2", "@item:intext hours and \
minutes.").arg(hoursDuration(hours)).arg(minutesDuration(minutes)); + \
return tr("%1 and %2", "@item:intext hours and \
minutes.").arg(hoursDuration(hours)).arg(minutesDuration(minutes)); } else \
if (hours) { return hoursDuration(hours);
} else if (minutes && seconds) {
- return QObject::tr("%1 and %2", "@item:intext minutes and \
seconds.").arg(minutesDuration(minutes)).arg(secondsDuration(seconds)); + \
return tr("%1 and %2", "@item:intext minutes and \
seconds.").arg(minutesDuration(minutes)).arg(secondsDuration(seconds)); } \
else if (minutes) { return minutesDuration(minutes);
} else {
diff --git a/staging/knotifications/src/kstatusnotifieritem.cpp \
b/staging/knotifications/src/kstatusnotifieritem.cpp index 8c3a756..6503a5f \
100644
--- a/staging/knotifications/src/kstatusnotifieritem.cpp
+++ b/staging/knotifications/src/kstatusnotifieritem.cpp
@@ -488,7 +488,7 @@ void KStatusNotifierItem::setAssociatedWidget(QWidget \
*associatedWidget) if (!action) {
action = new QAction(this);
d->actionCollection.insert("minimizeRestore", action);
- action->setText(QObject::tr("&Minimize"));
+ action->setText(tr("&Minimize"));
connect(action, SIGNAL(triggered(bool)), this, \
SLOT(minimizeRestore())); }
@@ -760,7 +760,7 @@ void KStatusNotifierItemPrivate::init(const QString \
&extraId) q->setContextMenu(m);
QAction *action = new QAction(q);
- action->setText(QObject::tr("Quit"));
+ action->setText(q->tr("Quit"));
action->setIcon(QIcon::fromTheme("application-exit"));
QObject::connect(action, SIGNAL(triggered()), q, SLOT(maybeQuit()));
actionCollection.insert("quit", action);
@@ -933,9 +933,9 @@ void \
KStatusNotifierItemPrivate::contextMenuAboutToShow() if (associatedWidget \
&& associatedWidget != menu) { QAction* action = \
actionCollection.value("minimizeRestore"); if (checkVisibility(QPoint(0, \
0), false)) {
- action->setText(QObject::tr("&Restore"));
+ action->setText(q->tr("&Restore"));
} else {
- action->setText(QObject::tr("&Minimize"));
+ action->setText(q->tr("&Minimize"));
}
}
}
@@ -946,10 +946,10 @@ void KStatusNotifierItemPrivate::maybeQuit()
if (caption.isEmpty())
caption = QCoreApplication::applicationName();
- QString query = QObject::tr("<qt>Are you sure you want to quit \
<b>%1</b>?</qt>", caption.toUtf8()); + QString query = q->tr("<qt>Are \
you sure you want to quit <b>%1</b>?</qt>", caption.toUtf8());
if (QMessageBox::question(associatedWidget,
- QObject::tr("Confirm Quit From System \
Tray"), query)) { + q->tr("Confirm Quit From \
System Tray"), query)) { qApp->quit();
}
diff --git a/tier1/kcoreaddons/src/lib/kaboutdata.cpp \
b/tier1/kcoreaddons/src/lib/kaboutdata.cpp index 53ea10a..5ea8862 100644
--- a/tier1/kcoreaddons/src/lib/kaboutdata.cpp
+++ b/tier1/kcoreaddons/src/lib/kaboutdata.cpp
@@ -33,8 +33,13 @@
#include <QtCore/QList>
#include <QHash>
+static QString tr(const char *message, const char *disambiguation = 0, int \
n = -1) +{
+ return QCoreApplication::translate("KAboutData", message, \
disambiguation, n); +}
+
// PORTING HACK (KDE5 TODO: clean up)
-#define i18nc(a,b) QObject::tr(b, a)
+#define i18nc(a,b) tr(b, a)
class KAboutPerson::Private
{
@@ -229,13 +234,13 @@ QString KAboutLicense::text() const
}
// fall through
default:
- result += QObject::tr("No licensing terms for this program have \
been specified.\n" + result += tr("No licensing terms for this \
program have been specified.\n"
"Please check the documentation or the source for \
any\n" "licensing terms.\n");
}
if (knownLicense) {
- result += QObject::tr("This program is distributed under the terms \
of the %1.").arg(name(KAboutData::ShortName)); + result += tr("This \
program is distributed under the terms of the \
%1.").arg(name(KAboutData::ShortName)); if (!pathToFile.isEmpty()) {
result += lineFeed;
}
diff --git a/tier1/kwidgetsaddons/src/kcolorcombo.cpp \
b/tier1/kwidgetsaddons/src/kcolorcombo.cpp index db4af33..81d4559 100644
--- a/tier1/kwidgetsaddons/src/kcolorcombo.cpp
+++ b/tier1/kwidgetsaddons/src/kcolorcombo.cpp
@@ -339,7 +339,7 @@ void KColorComboPrivate::_k_slotHighlighted(int index)
void KColorComboPrivate::addColors()
{
- q->addItem(QObject::tr("Custom...", "Custom color"));
+ q->addItem(q->tr("Custom...", "Custom color"));
if (colorList.isEmpty()) {
for (int i = 0; i < STANDARD_PALETTE_SIZE; ++i) {
diff --git a/tier1/kwidgetsaddons/src/kmessagewidget.cpp \
b/tier1/kwidgetsaddons/src/kmessagewidget.cpp index 9e8ac01..1359dc4 100644
--- a/tier1/kwidgetsaddons/src/kmessagewidget.cpp
+++ b/tier1/kwidgetsaddons/src/kmessagewidget.cpp
@@ -86,8 +86,8 @@ void KMessageWidgetPrivate::init(KMessageWidget *q_ptr)
QObject::connect(textLabel, SIGNAL(linkHovered(QString)), q, \
SIGNAL(linkHovered(QString)));
QAction* closeAction = new QAction(q);
- closeAction->setText(QObject::tr("&Close"));
- closeAction->setToolTip(QObject::tr("Close message"));
+ closeAction->setText(q->tr("&Close"));
+ closeAction->setToolTip(q->tr("Close message"));
closeAction->setIcon(q->style()->standardIcon(QStyle::SP_DialogCloseButton));
QObject::connect(closeAction, SIGNAL(triggered(bool)), q, \
SLOT(animatedHide()));
diff --git a/tier1/solid/src/solid/backends/udisks/udisksdevice.cpp \
b/tier1/solid/src/solid/backends/udisks/udisksdevice.cpp index \
37308b6..577803c 100644
--- a/tier1/solid/src/solid/backends/udisks/udisksdevice.cpp
+++ b/tier1/solid/src/solid/backends/udisks/udisksdevice.cpp
@@ -263,16 +263,16 @@ QString UDisksDevice::storageDescription() const
if ((mediumTypes & Solid::OpticalDrive::Dvdr) && (mediumTypes & \
Solid::OpticalDrive::Dvdplusr)) {
if(mediumTypes & Solid::OpticalDrive::Dvdplusdl)
- second = QObject::trUtf8("/DVD ±R DL", "Second item of \
%1%2 Drive sentence"); + second = trUtf8("/DVD ±R DL", \
"Second item of %1%2 Drive sentence"); else
- second = QObject::trUtf8("/DVD ±R", "Second item of %1%2 \
Drive sentence"); + second = trUtf8("/DVD ±R", "Second item \
of %1%2 Drive sentence"); }
if ((mediumTypes & Solid::OpticalDrive::Dvdrw) && (mediumTypes & \
Solid::OpticalDrive::Dvdplusrw)) {
if((mediumTypes & Solid::OpticalDrive::Dvdplusdl) || \
(mediumTypes & Solid::OpticalDrive::Dvdplusdlrw))
- second = QObject::trUtf8("/DVD ±RW DL", "Second item of \
%1%2 Drive sentence"); + second = trUtf8("/DVD ±RW DL", \
"Second item of %1%2 Drive sentence"); else
- second = QObject::trUtf8("/DVD ±RW", "Second item of %1%2 \
Drive sentence"); + second = trUtf8("/DVD ±RW", "Second item \
of %1%2 Drive sentence"); }
if (mediumTypes & Solid::OpticalDrive::Bd)
second = tr("/BD-ROM", "Second item of %1%2 Drive sentence");
diff --git a/tier1/solid/src/solid/backends/win/winbattery.cpp \
b/tier1/solid/src/solid/backends/win/winbattery.cpp index 05353d9..c3aa318 \
100644
--- a/tier1/solid/src/solid/backends/win/winbattery.cpp
+++ b/tier1/solid/src/solid/backends/win/winbattery.cpp
@@ -188,7 +188,7 @@ void WinBattery::powerChanged()
}
else
{
- qDebug() << tech << QObject::tr("Unknown", "battery technology");
+ qDebug() << tech << tr("Unknown", "battery technology");
m_technology = Solid::Battery::UnknownTechnology;
}
diff --git a/tier1/solid/src/solid/backends/win/windevice.cpp \
b/tier1/solid/src/solid/backends/win/windevice.cpp index 0e4db4e..5ac53a3 \
100644
--- a/tier1/solid/src/solid/backends/win/windevice.cpp
+++ b/tier1/solid/src/solid/backends/win/windevice.cpp
@@ -111,7 +111,7 @@ WinDevice::WinDevice(const QString &udi) :
initBatteryDevice();
break;
case Solid::DeviceInterface::AcAdapter:
- m_description = QObject::tr("A/C Adapter");
+ m_description = tr("A/C Adapter");
break;
default:
if(queryDeviceInterface(Solid::DeviceInterface::StorageAccess) || \
queryDeviceInterface(Solid::DeviceInterface::StorageDrive)) @@ -194,19 \
+194,19 @@ void WinDevice::initBatteryDevice() \
switch(WinBattery(this).technology()) {
case Solid::Battery::LithiumIon:
- m_description = QObject::tr("Lithium Ion", "battery technology");
+ m_description = tr("Lithium Ion", "battery technology");
break;
case Solid::Battery::LeadAcid:
- m_description = QObject::tr("Lead Acid", "battery technology");
+ m_description = tr("Lead Acid", "battery technology");
break;
case Solid::Battery::NickelCadmium:
- m_description = QObject::tr("Nickel Cadmium", "battery \
technology"); + m_description = tr("Nickel Cadmium", "battery \
technology"); break;
case Solid::Battery::NickelMetalHydride:
- m_description = QObject::tr("Nickel Metal Hydride", "battery \
technology"); + m_description = tr("Nickel Metal Hydride", "battery \
technology"); break;
default:
- m_description = QObject::tr("Unknown", "battery technology");
+ m_description = tr("Unknown", "battery technology");
}
}
diff --git a/tier1/threadweaver/src/Weaver/DependencyPolicy.cpp \
b/tier1/threadweaver/src/Weaver/DependencyPolicy.cpp index 3747d33..2caf746 \
100644
--- a/tier1/threadweaver/src/Weaver/DependencyPolicy.cpp
+++ b/tier1/threadweaver/src/Weaver/DependencyPolicy.cpp
@@ -28,6 +28,7 @@ $Id: DebuggingAids.cpp 20 2005-08-08 21:02:51Z mirko $
#include "DependencyPolicy.h"
+#include <QtCore/QCoreApplication>
#include <QtCore/QMutex>
#include <QtCore/QDebug>
@@ -195,10 +196,10 @@ void DependencyPolicy::dumpJobDependencies()
{
debug( 0, " : %p (%s%s) <-- %p (%s%s)\n",
(void*)it.key(),
- it.key()->objectName().isEmpty() ? "" : qPrintable ( \
QString(it.key()->objectName() + QObject::tr ( " of type " )) ), + \
it.key()->objectName().isEmpty() ? "" : qPrintable ( \
QString(it.key()->objectName() + QCoreApplication::translate ( \
"DependencyPolicy", " of type " )) ), it.key()->metaObject()->className(),
(void*)it.value(),
- it.value()->objectName().isEmpty() ? "" : qPrintable ( \
QString(it.value()->objectName() + QObject::tr ( " of type " )) ), + \
it.value()->objectName().isEmpty() ? "" : qPrintable ( \
QString(it.value()->objectName() + QCoreApplication::translate ( \
"DependencyPolicy", " of type " )) ), \
it.value()->metaObject()->className() ); }
debug ( 0, "-----------------\n" );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic