From b083479b21eb911d93b0c0013c61756fce905611 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Tue, 16 Jan 2018 20:34:54 +0100 Subject: [PATCH] using QString() instead of QString::null --- src/controls/QskPushButton.cpp | 2 +- src/controls/QskSetup.cpp | 2 +- src/controls/QskSimpleListBox.cpp | 2 +- src/controls/QskTabBar.cpp | 2 +- src/dialogs/QskInputWindow.cpp | 2 +- src/nodes/QskRichTextRenderer.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/controls/QskPushButton.cpp b/src/controls/QskPushButton.cpp index 85fcd3d9..5ed87dd4 100644 --- a/src/controls/QskPushButton.cpp +++ b/src/controls/QskPushButton.cpp @@ -171,7 +171,7 @@ void QskPushButton::setGraphic( const QskGraphic& graphic ) if ( !m_data->graphicSource.isEmpty() ) { - m_data->graphicSource = QString::null; + m_data->graphicSource = QString(); m_data->isGraphicSourceDirty = false; Q_EMIT graphicSourceChanged(); diff --git a/src/controls/QskSetup.cpp b/src/controls/QskSetup.cpp index f36fbe82..ad75f5cf 100644 --- a/src/controls/QskSetup.cpp +++ b/src/controls/QskSetup.cpp @@ -235,7 +235,7 @@ QskSkin* QskSetup::skin() { if ( m_data->skin == nullptr ) { - m_data->skin = QskSkinManager::instance()->createSkin( QString::null ); + m_data->skin = QskSkinManager::instance()->createSkin( QString() ); Q_ASSERT( m_data->skin ); m_data->skin->setParent( this ); diff --git a/src/controls/QskSimpleListBox.cpp b/src/controls/QskSimpleListBox.cpp index 564914dd..f734aafe 100644 --- a/src/controls/QskSimpleListBox.cpp +++ b/src/controls/QskSimpleListBox.cpp @@ -56,7 +56,7 @@ QString QskSimpleListBox::entryAt( int row ) const if ( row >= 0 && row < m_data->entries.size() ) return m_data->entries[row]; - return QString::null; + return QString(); } QVariant QskSimpleListBox::valueAt( int row, int col ) const diff --git a/src/controls/QskTabBar.cpp b/src/controls/QskTabBar.cpp index d0f07d3b..8c4fa68a 100644 --- a/src/controls/QskTabBar.cpp +++ b/src/controls/QskTabBar.cpp @@ -285,7 +285,7 @@ QString QskTabBar::buttonTextAt( int index ) const if ( const QskTabButton* btn = buttonAt( index ) ) return btn->text(); - return QString::null; + return QString(); } int QskTabBar::indexOf( QskTabButton* button ) const diff --git a/src/dialogs/QskInputWindow.cpp b/src/dialogs/QskInputWindow.cpp index 45df14f2..f61ed7d8 100644 --- a/src/dialogs/QskInputWindow.cpp +++ b/src/dialogs/QskInputWindow.cpp @@ -83,7 +83,7 @@ void QskInputWindow::setInfoText( const QString& text ) QString QskInputWindow::infoText() const { - return m_subWindow ? m_subWindow->infoText() : QString::null; + return m_subWindow ? m_subWindow->infoText() : QString(); } void QskInputWindow::setInfoTextOptions( const QskTextOptions& options ) diff --git a/src/nodes/QskRichTextRenderer.cpp b/src/nodes/QskRichTextRenderer.cpp index 79c38c96..94ab3a35 100644 --- a/src/nodes/QskRichTextRenderer.cpp +++ b/src/nodes/QskRichTextRenderer.cpp @@ -220,5 +220,5 @@ void QskRichTextRenderer::updateNode( const QString& text, } textItem.updateTextNode( item->window(), node ); - textItem.setText( QString::null ); + textItem.setText( QString() ); }