summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilian Wolff <milian.wolff@kdab.com>2022-12-04 21:26:08 +0100
committerMilian Wolff <milian.wolff@kdab.com>2022-12-05 12:10:04 +0000
commite43d0f5d2635c941801abea923ce8764f360c63d (patch)
tree3c02c8aba9b082ac7862f3ebe2c9e22c1639f2f6
parent1ab0c039589a803b32d50d76b6b1948fef5a37a3 (diff)
Let PerfRegisterInfo::defaultArchitecture return QStringLiteral
This way we don't need to runtime allocate a QString for this anymore. Change-Id: Ibfed14dc563934edc7453221cd764f35a54870ee Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r--app/main.cpp2
-rw-r--r--app/perfregisterinfo.cpp18
-rw-r--r--app/perfregisterinfo.h2
3 files changed, 11 insertions, 11 deletions
diff --git a/app/main.cpp b/app/main.cpp
index 475b156..519183b 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -148,7 +148,7 @@ int main(int argc, char *argv[])
QStringLiteral("path"));
parser.addOption(appPath);
- const auto defaultArch = QLatin1String(PerfRegisterInfo::defaultArchitecture());
+ const auto defaultArch = PerfRegisterInfo::defaultArchitecture();
QCommandLineOption arch(
QStringLiteral("arch"),
QCoreApplication::translate("main",
diff --git a/app/perfregisterinfo.cpp b/app/perfregisterinfo.cpp
index 08213bd..bf196ab 100644
--- a/app/perfregisterinfo.cpp
+++ b/app/perfregisterinfo.cpp
@@ -110,24 +110,24 @@ const int PerfRegisterInfo::s_dummyRegisters[ARCH_INVALID][2] = {
{0, 0}
};
-const char *PerfRegisterInfo::defaultArchitecture()
+QString PerfRegisterInfo::defaultArchitecture()
{
#if defined(__aarch64__)
- return "aarch64";
+ return QStringLiteral("aarch64");
#elif defined(__arm__)
- return "arm";
+ return QStringLiteral("arm");
#elif defined(__powerpc__)
- return "powerpc";
+ return QStringLiteral("powerpc");
#elif defined(__s390__)
- return "s390";
+ return QStringLiteral("s390");
#elif defined(__sh__)
- return "sh";
+ return QStringLiteral("sh");
#elif defined(__sparc__)
- return "sparc";
+ return QStringLiteral("sparc");
#elif defined(__i386__) || defined(__x86_64__)
- return "x86";
+ return QStringLiteral("x86");
#else
- return "";
+ return QString();
#endif
}
diff --git a/app/perfregisterinfo.h b/app/perfregisterinfo.h
index 2274925..3e5a55b 100644
--- a/app/perfregisterinfo.h
+++ b/app/perfregisterinfo.h
@@ -62,5 +62,5 @@ public:
static const int s_dummyRegisters[ARCH_INVALID][2];
// default architecture for the system which was used for compilation
- static const char *defaultArchitecture();
+ static QString defaultArchitecture();
};