class QTCREATOR_UTILS_EXPORT FileReader
{
- Q_DECLARE_TR_FUNCTIONS(FileUtils) // sic!
+ Q_DECLARE_TR_FUNCTIONS(Utils::FileUtils) // sic!
public:
static QByteArray fetchQrc(const QString &fileName); // Only for internal resources
bool fetch(const QString &fileName, QIODevice::OpenMode mode = QIODevice::NotOpen); // QIODevice::ReadOnly is implicit
class QTCREATOR_UTILS_EXPORT FileSaverBase
{
- Q_DECLARE_TR_FUNCTIONS(FileUtils) // sic!
+ Q_DECLARE_TR_FUNCTIONS(Utils::FileUtils) // sic!
public:
FileSaverBase();
virtual ~FileSaverBase();
class QTCREATOR_UTILS_EXPORT FileSaver : public FileSaverBase
{
+ Q_DECLARE_TR_FUNCTIONS(Utils::FileUtils) // sic!
public:
explicit FileSaver(const QString &filename, QIODevice::OpenMode mode = QIODevice::NotOpen); // QIODevice::WriteOnly is implicit
class QTCREATOR_UTILS_EXPORT TempFileSaver : public FileSaverBase
{
+ Q_DECLARE_TR_FUNCTIONS(Utils::FileUtils) // sic!
public:
explicit TempFileSaver(const QString &templ = QString());
~TempFileSaver();
#include <QtCore/QStringList>
#include <QtCore/QVector>
#include <QtCore/QHash>
+#include <QtCore/QCoreApplication>
namespace Valgrind {
namespace Callgrind {
//BEGIN ParseData::Private
class ParseData::Private {
+ Q_DECLARE_TR_FUNCTIONS(Valgrind::Callgrind::ParseData)
public:
Private(ParseData *q)
: m_lineNumberPositionIndex(-1)
QTC_ASSERT(event.size() >= 2, return event) // should not happen
- bool isMiss = event.contains("m"); // else hit
- bool isRead = event.contains("r"); // else write
+ const bool isMiss = event.contains(QLatin1Char('m')); // else hit
+ const bool isRead = event.contains(QLatin1Char('r')); // else write
QString type;
- if (event.contains("L"))
- type = QT_TR_NOOP("Last-level"); // first, "L" overwrites the others
+ if (event.contains(QLatin1Char('L')))
+ type = ParseData::Private::tr("Last-level"); // first, "L" overwrites the others
else if (event.at(0) == 'I')
- type = QT_TR_NOOP("Instruction");
+ type = ParseData::Private::tr("Instruction");
else if (event.at(0) == 'D')
- type = QT_TR_NOOP("Cache");
+ type = ParseData::Private::tr("Cache");
else if (event.leftRef(2) == "Bc")
- type = QT_TR_NOOP("Conditional branches");
+ type = ParseData::Private::tr("Conditional branches");
else if (event.leftRef(2) == "Bi")
- type = QT_TR_NOOP("Indirect branches");
+ type = ParseData::Private::tr("Indirect branches");
QStringList prettyString;
prettyString << type;
if (event.at(1).isNumber())
- prettyString << QString("level %1").arg(event.at(1));
- prettyString << (isRead ? QT_TR_NOOP("read") : QT_TR_NOOP("write"));
+ prettyString << ParseData::Private::tr("level %1").arg(event.at(1));
+ prettyString << (isRead ? ParseData::Private::tr("read") : ParseData::Private::tr("write"));
if (event.at(0) == 'B')
- prettyString << (isMiss ? QT_TR_NOOP("mispredicted") : QT_TR_NOOP("executed"));
+ prettyString << (isMiss ? ParseData::Private::tr("mispredicted") : ParseData::Private::tr("executed"));
else
- prettyString << (isMiss ? QT_TR_NOOP("miss") : QT_TR_NOOP("access"));
+ prettyString << (isMiss ? ParseData::Private::tr("miss") : ParseData::Private::tr("access"));
// add original abbreviation
- prettyString << QString("(%1)").arg(event);
-
- return prettyString.join(" ");
+ prettyString << QLatin1Char('(') + event + QLatin1Char(')');
+ return prettyString.join(QString(QLatin1Char(' ')));
}
QStringList ParseData::events() const
QString ParseData::prettyStringForPosition(const QString &position)
{
if (position == "line")
- return QT_TR_NOOP("Line:"); // as in: "line number"
+ return ParseData::Private::tr("Line:"); // as in: "line number"
else if (position == "instr")
- return QT_TR_NOOP("Instruction"); // as in: "instruction address"
- return QT_TR_NOOP("Position:"); // never reached, in theory
+ return ParseData::Private::tr("Instruction"); // as in: "instruction address"
+ return ParseData::Private::tr("Position:"); // never reached, in theory
}
QStringList ParseData::positions() const
class FakeVimUserCommandsModel : public QAbstractTableModel
{
+ Q_OBJECT
public:
FakeVimUserCommandsModel(FakeVimPluginPrivate *q) : m_q(q) {}
~FakeVimUserCommandsModel() {}
void MaemoMountAndInstallDeployStep::ctor()
{
- //: MaemoMountAndInstallDeployStep default display name
- setDefaultDisplayName(DisplayName);
+ // MaemoMountAndInstallDeployStep default display name
+ setDefaultDisplayName(displayName());
if (qobject_cast<AbstractDebBasedQt4MaemoTarget *>(target()))
m_installer = new MaemoDebianPackageInstaller(this);
}
const QString MaemoMountAndInstallDeployStep::Id("MaemoMountAndInstallDeployStep");
-const QString MaemoMountAndInstallDeployStep::DisplayName
- = tr("Deploy package via UTFS mount");
-
+QString MaemoMountAndInstallDeployStep::displayName()
+{
+ return tr("Deploy package via UTFS mount");
+}
MaemoMountAndCopyDeployStep::MaemoMountAndCopyDeployStep(BuildStepList *bc)
: AbstractMaemoDeployByMountStep(bc, Id)
void MaemoMountAndCopyDeployStep::ctor()
{
- //: MaemoMountAndCopyDeployStep default display name
- setDefaultDisplayName(DisplayName);
+ // MaemoMountAndCopyDeployStep default display name
+ setDefaultDisplayName(displayName());
m_copyFacility = new MaemoRemoteCopyFacility(this);
connect(m_copyFacility, SIGNAL(stdoutData(QString)),
}
const QString MaemoMountAndCopyDeployStep::Id("MaemoMountAndCopyDeployStep");
-const QString MaemoMountAndCopyDeployStep::DisplayName
- = tr("Deploy files via UTFS mount");
+
+QString MaemoMountAndCopyDeployStep::displayName()
+{
+ return tr("Deploy files via UTFS mount");
+}
} // namespace Internal
} // namespace RemoteLinux
MaemoMountAndInstallDeployStep *other);
static const QString Id;
- static const QString DisplayName;
+ static QString displayName();
private:
virtual const AbstractMaemoPackageCreationStep *packagingStep() const;
virtual bool isDeploymentPossibleInternal(QString &whynot) const;
MaemoMountAndCopyDeployStep *other);
static const QString Id;
- static const QString DisplayName;
+ static QString displayName();
private:
virtual const AbstractMaemoPackageCreationStep *packagingStep() const { return 0; }
virtual bool isDeploymentPossibleInternal(QString &whynot) const;
QString MaemoDeployStepFactory::displayNameForId(const QString &id) const
{
if (id == MaemoMountAndInstallDeployStep::Id)
- return MaemoMountAndInstallDeployStep::DisplayName;
+ return MaemoMountAndInstallDeployStep::displayName();
else if (id == MaemoMountAndCopyDeployStep::Id)
- return MaemoMountAndCopyDeployStep::DisplayName;
+ return MaemoMountAndCopyDeployStep::displayName();
else if (id == MaemoUploadAndInstallDpkgPackageStep::Id)
- return MaemoUploadAndInstallDpkgPackageStep::DisplayName;
+ return MaemoUploadAndInstallDpkgPackageStep::displayName();
else if (id == MaemoUploadAndInstallRpmPackageStep::Id)
- return MaemoUploadAndInstallRpmPackageStep::DisplayName;
+ return MaemoUploadAndInstallRpmPackageStep::displayName();
else if (id == MaemoUploadAndInstallTarPackageStep::Id)
- return MaemoUploadAndInstallTarPackageStep::DisplayName;
+ return MaemoUploadAndInstallTarPackageStep::displayName();
else if (id == MaemoInstallDebianPackageToSysrootStep::Id)
- return MaemoInstallDebianPackageToSysrootStep::DisplayName;
+ return MaemoInstallDebianPackageToSysrootStep::displayName();
else if (id == MaemoInstallRpmPackageToSysrootStep::Id)
- return MaemoInstallRpmPackageToSysrootStep::DisplayName;
+ return MaemoInstallRpmPackageToSysrootStep::displayName();
else if (id == MaemoCopyToSysrootStep::Id)
- return MaemoCopyToSysrootStep::DisplayName;
+ return MaemoCopyToSysrootStep::displayName();
else if (id == MaemoMakeInstallToSysrootStep::Id)
- return MaemoMakeInstallToSysrootStep::DisplayName;
+ return MaemoMakeInstallToSysrootStep::displayName();
else if (id == MaemoDirectDeviceUploadStep::Id)
- return MaemoDirectDeviceUploadStep::DisplayName;
+ return MaemoDirectDeviceUploadStep::displayName();
return QString();
}
void MaemoDirectDeviceUploadStep::ctor()
{
- setDefaultDisplayName(DisplayName);
+ setDefaultDisplayName(displayName());
m_extendedState = Inactive;
}
}
const QString MaemoDirectDeviceUploadStep::Id("MaemoDirectDeviceUploadStep");
-const QString MaemoDirectDeviceUploadStep::DisplayName
- = tr("Upload files via SFTP");
+
+QString MaemoDirectDeviceUploadStep::displayName()
+{
+ return tr("Upload files via SFTP");
+}
} // namespace Internal
} // namespace RemoteLinux
~MaemoDirectDeviceUploadStep();
static const QString Id;
- static const QString DisplayName;
+ static QString displayName();
private slots:
void handleSftpInitialized();
MaemoInstallDebianPackageToSysrootWidget(AbstractMaemoInstallPackageToSysrootStep *step)
: AbstractMaemoInstallPackageToSysrootWidget(step) {}
- virtual QString displayName() const { return MaemoInstallDebianPackageToSysrootStep::DisplayName; }
+ virtual QString displayName() const { return MaemoInstallDebianPackageToSysrootStep::displayName(); }
};
class MaemoInstallRpmPackageToSysrootWidget : public AbstractMaemoInstallPackageToSysrootWidget
MaemoInstallRpmPackageToSysrootWidget(AbstractMaemoInstallPackageToSysrootStep *step)
: AbstractMaemoInstallPackageToSysrootWidget(step) {}
- virtual QString displayName() const { return MaemoInstallRpmPackageToSysrootStep::DisplayName; }
+ virtual QString displayName() const { return MaemoInstallRpmPackageToSysrootStep::displayName(); }
};
class MaemoCopyFilesToSysrootWidget : public BuildStepConfigWidget
MaemoInstallDebianPackageToSysrootStep::MaemoInstallDebianPackageToSysrootStep(BuildStepList *bsl)
: AbstractMaemoInstallPackageToSysrootStep(bsl, Id)
{
- setDisplayName(DisplayName);
+ setDisplayName(displayName());
}
MaemoInstallDebianPackageToSysrootStep::MaemoInstallDebianPackageToSysrootStep(BuildStepList *bsl,
MaemoInstallDebianPackageToSysrootStep *other)
: AbstractMaemoInstallPackageToSysrootStep(bsl, other)
{
- setDisplayName(DisplayName);
+ setDisplayName(displayName());
}
BuildStepConfigWidget *MaemoInstallDebianPackageToSysrootStep::createConfigWidget()
const QString MaemoInstallDebianPackageToSysrootStep::Id
= QLatin1String("MaemoInstallDebianPackageToSysrootStep");
-const QString MaemoInstallDebianPackageToSysrootStep::DisplayName
- = tr("Install Debian package to sysroot");
+
+QString MaemoInstallDebianPackageToSysrootStep::displayName()
+{
+ return tr("Install Debian package to sysroot");
+}
MaemoInstallRpmPackageToSysrootStep::MaemoInstallRpmPackageToSysrootStep(BuildStepList *bsl)
: AbstractMaemoInstallPackageToSysrootStep(bsl, Id)
{
- setDisplayName(DisplayName);
+ setDisplayName(displayName());
}
MaemoInstallRpmPackageToSysrootStep::MaemoInstallRpmPackageToSysrootStep(BuildStepList *bsl,
MaemoInstallRpmPackageToSysrootStep *other)
: AbstractMaemoInstallPackageToSysrootStep(bsl, other)
{
- setDisplayName(DisplayName);
+ setDisplayName(displayName());
}
BuildStepConfigWidget *MaemoInstallRpmPackageToSysrootStep::createConfigWidget()
const QString MaemoInstallRpmPackageToSysrootStep::Id
= QLatin1String("MaemoInstallRpmPackageToSysrootStep");
-const QString MaemoInstallRpmPackageToSysrootStep::DisplayName
- = tr("Install RPM package to sysroot");
+QString MaemoInstallRpmPackageToSysrootStep::displayName()
+{
+ return tr("Install RPM package to sysroot");
+}
MaemoCopyToSysrootStep::MaemoCopyToSysrootStep(BuildStepList *bsl)
: BuildStep(bsl, Id)
{
- setDisplayName(DisplayName);
+ setDisplayName(displayName());
}
MaemoCopyToSysrootStep::MaemoCopyToSysrootStep(BuildStepList *bsl,
MaemoCopyToSysrootStep *other)
: BuildStep(bsl, other)
{
- setDisplayName(DisplayName);
+ setDisplayName(displayName());
}
void MaemoCopyToSysrootStep::run(QFutureInterface<bool> &fi)
const QString MaemoCopyToSysrootStep::Id
= QLatin1String("MaemoCopyToSysrootStep");
-const QString MaemoCopyToSysrootStep::DisplayName
- = tr("Copy files to sysroot");
-
+QString MaemoCopyToSysrootStep::displayName()
+{
+ return tr("Copy files to sysroot");
+}
MaemoMakeInstallToSysrootStep::MaemoMakeInstallToSysrootStep(BuildStepList *bsl)
: AbstractProcessStep(bsl, Id)
{
- setDefaultDisplayName(DisplayName);
+ setDefaultDisplayName(displayName());
}
MaemoMakeInstallToSysrootStep::MaemoMakeInstallToSysrootStep(BuildStepList *bsl,
MaemoMakeInstallToSysrootStep *other)
: AbstractProcessStep(bsl, other)
{
- setDefaultDisplayName(DisplayName);
+ setDefaultDisplayName(displayName());
}
bool MaemoMakeInstallToSysrootStep::init()
const QString MaemoMakeInstallToSysrootStep::Id
= QLatin1String("MaemoMakeInstallToSysrootStep");
-const QString MaemoMakeInstallToSysrootStep::DisplayName
- = tr("Copy files to sysroot");
+QString MaemoMakeInstallToSysrootStep::displayName()
+{
+ return tr("Copy files to sysroot");
+}
} // namespace Internal
} // namespace RemoteLinux
virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
static const QString Id;
- static const QString DisplayName;
+ static QString displayName();
private:
virtual QStringList madArguments() const;
};
virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
static const QString Id;
- static const QString DisplayName;
+ static QString displayName();
private:
virtual QStringList madArguments() const;
};
virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
static const QString Id;
- static const QString DisplayName;
+ static QString displayName();
};
class MaemoMakeInstallToSysrootStep : public ProjectExplorer::AbstractProcessStep
virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
static const QString Id;
- static const QString DisplayName;
+ static QString displayName();
};
} // namespace Internal
void MaemoUploadAndInstallDpkgPackageStep::ctor()
{
- finishInitialization(DisplayName, new MaemoDebianPackageInstaller(this));
+ finishInitialization(displayName(), new MaemoDebianPackageInstaller(this));
}
}
const QString MaemoUploadAndInstallDpkgPackageStep::Id("MaemoUploadAndInstallDpkgPackageStep");
-const QString MaemoUploadAndInstallDpkgPackageStep::DisplayName
- = tr("Deploy Debian package via SFTP upload");
+QString MaemoUploadAndInstallDpkgPackageStep::displayName()
+{
+ return tr("Deploy Debian package via SFTP upload");
+}
MaemoUploadAndInstallRpmPackageStep::MaemoUploadAndInstallRpmPackageStep(ProjectExplorer::BuildStepList *bc)
: AbstractMaemoUploadAndInstallStep(bc, Id)
void MaemoUploadAndInstallRpmPackageStep::ctor()
{
- finishInitialization(DisplayName, new MaemoRpmPackageInstaller(this));
+ finishInitialization(displayName(), new MaemoRpmPackageInstaller(this));
}
const AbstractMaemoPackageCreationStep *MaemoUploadAndInstallRpmPackageStep::packagingStep() const
}
const QString MaemoUploadAndInstallRpmPackageStep::Id("MaemoUploadAndInstallRpmPackageStep");
-const QString MaemoUploadAndInstallRpmPackageStep::DisplayName
- = tr("Deploy RPM package via SFTP upload");
+QString MaemoUploadAndInstallRpmPackageStep::displayName()
+{
+ return tr("Deploy RPM package via SFTP upload");
+}
MaemoUploadAndInstallTarPackageStep::MaemoUploadAndInstallTarPackageStep(ProjectExplorer::BuildStepList *bc)
: AbstractMaemoUploadAndInstallStep(bc, Id)
void MaemoUploadAndInstallTarPackageStep::ctor()
{
- finishInitialization(DisplayName, new MaemoTarPackageInstaller(this));
+ finishInitialization(displayName(), new MaemoTarPackageInstaller(this));
}
const QString MaemoUploadAndInstallTarPackageStep::Id("MaemoUploadAndInstallTarPackageStep");
-const QString MaemoUploadAndInstallTarPackageStep::DisplayName
- = tr("Deploy tar package via SFTP upload");
+QString MaemoUploadAndInstallTarPackageStep::displayName()
+{
+ return tr("Deploy tar package via SFTP upload");
+}
} // namespace Internal
} // namespace RemoteLinux
MaemoUploadAndInstallDpkgPackageStep *other);
static const QString Id;
- static const QString DisplayName;
+ static QString displayName();
private:
void ctor();
MaemoUploadAndInstallRpmPackageStep *other);
static const QString Id;
- static const QString DisplayName;
+ static QString displayName();
private:
void ctor();
MaemoUploadAndInstallTarPackageStep *other);
static const QString Id;
- static const QString DisplayName;
+ static QString displayName();
private:
void ctor();