diff --git a/src/recorder/jamcontroller.cpp b/src/recorder/jamcontroller.cpp
index b243bb2fd7..e1369c676c 100644
--- a/src/recorder/jamcontroller.cpp
+++ b/src/recorder/jamcontroller.cpp
@@ -91,7 +91,7 @@ void CJamController::SetRecordingDir ( QString newRecordingDir, int iServerFrame
     {
         pJamRecorder         = new recorder::CJamRecorder ( newRecordingDir, iServerFrameSizeSamples );
         strRecorderErrMsg    = pJamRecorder->Init();
-        bRecorderInitialised = ( strRecorderErrMsg == QString::null );
+        bRecorderInitialised = ( strRecorderErrMsg == QString() );
         bEnableRecording     = bRecorderInitialised && !bDisableRecording;
 
         qInfo() << qUtf8Printable ( QString ( "Recording state: %1" ).arg ( bEnableRecording ? "enabled" : "disabled" ) );
@@ -99,7 +99,7 @@ void CJamController::SetRecordingDir ( QString newRecordingDir, int iServerFrame
     else
     {
         // This is the only time this is ever true - UI needs to handle it
-        strRecorderErrMsg    = QString::null;
+        strRecorderErrMsg    = QString();
         bRecorderInitialised = false;
         bEnableRecording     = false;
 
diff --git a/src/recorder/jamrecorder.cpp b/src/recorder/jamrecorder.cpp
index 69cb576523..95294ae428 100644
--- a/src/recorder/jamrecorder.cpp
+++ b/src/recorder/jamrecorder.cpp
@@ -359,11 +359,11 @@ QMap<QString, QList<STrackItem>> CJamSession::TracksFromSessionDir ( const QStri
 /**
  * @brief CJamRecorder::Init Create recording directory, if necessary, and connect signal handlers
  * @param server Server object emitting signals
- * @return QString::null on success else the failure reason
+ * @return QString() on success else the failure reason
  */
 QString CJamRecorder::Init()
 {
-    QString   errmsg = QString::null;
+    QString   errmsg = QString();
     QFileInfo fi ( recordBaseDir.absolutePath() );
     fi.setCaching ( false );
 
diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp
index 371d129751..f467a2f22b 100644
--- a/src/serverdlg.cpp
+++ b/src/serverdlg.cpp
@@ -371,7 +371,7 @@ lvwClients->setMinimumHeight ( 140 );
     // update GUI dependencies
     UpdateGUIDependencies();
 
-    UpdateRecorderStatus ( QString::null );
+    UpdateRecorderStatus ( QString() );
 
     // View menu  --------------------------------------------------------------
     QMenu* pViewMenu = new QMenu ( tr ( "&Window" ), this );
@@ -557,19 +557,19 @@ void CServerDlg::OnDirectoryTypeCurrentIndexChanged ( int iTypeIdx )
 void CServerDlg::OnServerStarted()
 {
     UpdateSystemTrayIcon ( true );
-    UpdateRecorderStatus ( QString::null );
+    UpdateRecorderStatus ( QString() );
 }
 
 void CServerDlg::OnServerStopped()
 {
     UpdateSystemTrayIcon ( false );
-    UpdateRecorderStatus ( QString::null );
+    UpdateRecorderStatus ( QString() );
 }
 
 void CServerDlg::OnStopRecorder()
 {
-    UpdateRecorderStatus ( QString::null );
-    if ( pServer->GetRecorderErrMsg() != QString::null )
+    UpdateRecorderStatus ( QString() );
+    if ( pServer->GetRecorderErrMsg() != QString() )
     {
         QMessageBox::warning ( this,
                                APP_NAME,
@@ -592,16 +592,16 @@ void CServerDlg::OnRecordingDirClicked()
     if ( newRecordingDir != currentValue )
     {
         pServer->SetRecordingDir ( newRecordingDir );
-        UpdateRecorderStatus ( QString::null );
+        UpdateRecorderStatus ( QString() );
     }
 }
 
 void CServerDlg::OnClearRecordingDirClicked()
 {
-    if ( pServer->GetRecorderErrMsg() != QString::null || pServer->GetRecordingDir() != "" )
+    if ( pServer->GetRecorderErrMsg() != QString() || pServer->GetRecordingDir() != "" )
     {
         pServer->SetRecordingDir ( "" );
-        UpdateRecorderStatus ( QString::null );
+        UpdateRecorderStatus ( QString() );
     }
 }
 
@@ -828,7 +828,7 @@ void CServerDlg::UpdateRecorderStatus ( QString sessionDir )
         {
             if ( pServer->IsRunning() )
             {
-                edtCurrentSessionDir->setText ( sessionDir != QString::null ? sessionDir : "" );
+                edtCurrentSessionDir->setText ( sessionDir != QString() ? sessionDir : "" );
 
                 strRecorderStatus = SREC_RECORDING;
                 bIsRecording      = true;
@@ -847,7 +847,7 @@ void CServerDlg::UpdateRecorderStatus ( QString sessionDir )
     {
         strRecordingDir = pServer->GetRecorderErrMsg();
 
-        if ( strRecordingDir == QString::null )
+        if ( strRecordingDir == QString() )
         {
             strRecordingDir = pServer->GetRecordingDir();
         }