Commit 88a6e644 authored by Christian Ehrlicher's avatar Christian Ehrlicher
Browse files

QString::null -> QString()

REVIEW: 129551
parent 3306cb3e
......@@ -145,7 +145,7 @@ TopLevel::TopLevel()
setAutoSaveSettings();
// restore current state settings (not configuration options)
restoreCurrentState(QString::null); //krazy:exclude=nullstrassign for old broken gcc
restoreCurrentState(QString());
// if this is the first toplevel, show tip of day
if (memberList().count() == 1)
......
......@@ -79,7 +79,7 @@ protected:
void loadProgress(int progress); // 0 - 100
void loadError(int line, const QString& msg);
void loadWarning(int line, const QString& msg);
void loadFinished(const QString &msg = QString::null);
void loadFinished(const QString &msg = QString());
protected:
Logger* _logger;
......
......@@ -3389,7 +3389,7 @@ TraceClass* TraceData::cls(const QString& fnName, QString& shortName)
lastIndex = index+2;
}
QString clsName = (lastIndex < 3) ? QString::null : //krazy:exclude=nullstrassign for old broken gcc
QString clsName = (lastIndex < 3) ? QString() :
fnName.left(lastIndex-2);
shortName = fnName.mid(lastIndex);
......
......@@ -491,7 +491,7 @@ void FunctionSelection::doUpdate(int changeType, bool)
}
// reset search (as not activated from this view)
query(QString::null); //krazy:exclude=nullstrassign for old broken gcc
query(QString());
// select cost item group of function
switch(_groupType) {
......@@ -552,8 +552,8 @@ void FunctionSelection::doUpdate(int changeType, bool)
}
// reset searchEdit
_searchString = QString();
query(QString::null); //krazy:exclude=nullstrassign for old broken gcc
_searchString.clear();
query(QString());
refresh();
}
......
......@@ -408,7 +408,7 @@ TabView::TabView(TraceItemView* parentView, QWidget* parent)
this->setWhatsThis( whatsThis() );
}
void TabView::updateNameLabel(QString n)
void TabView::updateNameLabel(const QString& n)
{
QFontMetrics fm(_nameLabel->fontMetrics());
......
......@@ -163,7 +163,7 @@ private:
TabWidget* tabWidget(Position);
void updateVisibility();
void doUpdate(int, bool);
void updateNameLabel(QString n = QString::null);
void updateNameLabel(const QString &n = QString());
void installFocusFilters();
void tabCounts(int&, int&, int&, int&);
......
......@@ -40,7 +40,7 @@
// ConfigDialog
//
ConfigDialog::ConfigDialog(TraceData* data, QWidget* parent, QString s)
ConfigDialog::ConfigDialog(TraceData* data, QWidget* parent, const QString &s)
: QDialog(parent)
{
setWindowTitle(tr("Configure QCachegrind"));
......
......@@ -43,7 +43,7 @@ class ConfigDialog: public QDialog
public:
// If s is not empty, navigate to a given setting on opening
ConfigDialog(TraceData* data, QWidget* parent, QString s = QString::null);
ConfigDialog(TraceData* data, QWidget* parent, const QString &s = QString());
void activate(QString);
QString currentPage();
......
......@@ -94,5 +94,5 @@ ConfigGroup* QCGConfigStorage::getGroup(const QString& group,
return new QCGConfigGroup(_settings, group, true);
// requested group does not exist, return only default values
return new QCGConfigGroup(0, QString::null, true);
return new QCGConfigGroup(0, QString(), true);
}
......@@ -88,7 +88,7 @@ QCGTopLevel::QCGTopLevel()
setCentralWidget(_multiView);
// restore current state settings (not configuration options)
restoreCurrentState(QString::null);
restoreCurrentState(QString());
// restore docks & toolbars from config
QByteArray state, geometry;
......@@ -666,7 +666,7 @@ void QCGTopLevel::about()
void QCGTopLevel::configure(QString s)
{
static QString lastPage = QString::null;
static QString lastPage;
// if no specific config item should be focused, use last page
if (s.isEmpty()) s = lastPage;
......@@ -1704,7 +1704,7 @@ void QCGTopLevel::closeEvent(QCloseEvent* event)
GlobalConfig::config()->saveOptions();
saveTraceSettings();
saveCurrentState(QString::null);
saveCurrentState(QString());
// if part dock was chosen visible even for only 1 part loaded,
// keep this choice...
......@@ -2054,7 +2054,7 @@ void QCGTopLevel::loadStart(const QString& filename)
void QCGTopLevel::loadFinished(const QString& msg)
{
showStatus(QString::null, 0);
showStatus(QString(), 0);
if (!msg.isEmpty())
showMessage(QStringLiteral("Error loading %1: %2").arg(_filename).arg(msg),
2000);
......
......@@ -96,7 +96,7 @@ public slots:
void exportGraph();
void newWindow();
void configure(QString page = QString::null);
void configure(QString page = QString());
void about();
// layouts
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment