get rid of QString::null; added doxygen comments;

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2681 17fca916-40b9-46aa-a4ea-0a15b648b75c

33 files changed, 73 insertions, 73 deletions

diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
index fe238105b..10dde0281 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/actioneditor.cpp
@@ -370,7 +370,7 @@ void KviSingleActionEditor::chooseSmallIcon()
 void KviSingleActionEditor::chooseBigIcon()
 {
 	if(!m_pActionData)return;
-	KviImageDialog * d = new KviImageDialog(this,QString::null,KID_TYPE_ALL,KID_TYPE_FULL_PATH);
+	KviImageDialog * d = new KviImageDialog(this,QString(),KID_TYPE_ALL,KID_TYPE_FULL_PATH);
 	int ret = d->exec();
 	QString s = d->selectedImage();
 	delete d;
@@ -696,7 +696,7 @@ void KviActionEditor::exportActions()
 
 	QString szFile;
 
-	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs("Choose a Filename - KVIrc"),szName,QString::null,true,true,true))return;
+	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs("Choose a Filename - KVIrc"),szName,QString(),true,true,true))return;
 
 	QString szCode;
 
@@ -778,14 +778,14 @@ void KviActionEditor::newAction()
 	szDes.append("\")");
 
 	KviActionData * ad = new KviActionData(szName,
-			QString::null,
+			QString(),
 			szVis,
 			szDes,
 			KviActionManager::categoryGeneric()->name(),
-			QString::null,
-			QString::null,
+			QString(),
+			QString(),
 			0,
-			QString::null,
+			QString(),
 			0);
 
 	KviActionEditorTreeWidgetItem * lvi = new KviActionEditorTreeWidgetItem(m_pTreeWidget,ad);
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index 23de049a6..bc7d9d368 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -280,7 +280,7 @@ void KviScriptManagementDialog::installScript()
 {
 	QString szFileName, szError;
 
-	if(!KviFileDialog::askForOpenFileName(szFileName,__tr2qs("Please select the addon installation file"),QString::null,KVI_FILTER_SCRIPTS,false,true))return;
+	if(!KviFileDialog::askForOpenFileName(szFileName,__tr2qs("Please select the addon installation file"),QString(),KVI_FILTER_SCRIPTS,false,true))return;
 
 	szFileName.replace("\\","\\\\");
 
diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index 10cef8792..064a9a149 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -359,7 +359,7 @@ void KviAliasEditor::splitFullAliasOrNamespaceName(const QString &szFullName,QSt
 
 QString KviAliasEditor::buildFullItemName(KviAliasEditorTreeWidgetItem * it)
 {
-	if(!it) return QString::null;
+	if(!it) return QString();
 	QString szName = it->name();
 	KviAliasNamespaceTreeWidgetItem * nit = it->parentNamespaceItem();
 	while(nit)
@@ -837,7 +837,7 @@ void KviAliasEditor::loadProperties(KviConfig *cfg)
 	def.append(20);
 	def.append(80);
 	m_pSplitter->setSizes(cfg->readIntListEntry("Sizes",def));
-	QString tmp = cfg->readEntry("LastAlias",QString::null);
+	QString tmp = cfg->readEntry("LastAlias",QString());
 
 	KviAliasEditorTreeWidgetItem * it = findAliasItem(tmp);
 	if(!it)it = findNamespaceItem(tmp);
@@ -1101,7 +1101,7 @@ QString KviAliasEditor::askForAliasName(const QString &szAction,const QString &s
 						szInitialText,
 						&bOk);
 		g_pAliasEditorModule->unlock();
-		if(!bOk)return QString::null;
+		if(!bOk)return QString();
 		if(szNewName.isEmpty())
 		{
 			g_pAliasEditorModule->lock();
@@ -1169,7 +1169,7 @@ QString KviAliasEditor::askForNamespaceName(const QString &szAction,const QStrin
 						szInitialText,
 						&bOk);
 		g_pAliasEditorModule->unlock();
-		if(!bOk)return QString::null;
+		if(!bOk)return QString();
 		if(szNewName.isEmpty())
 		{
 			g_pAliasEditorModule->lock();
diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
index dd68ab0b8..6fe1c89b7 100644
--- a/src/modules/avatar/libkviavatar.cpp
+++ b/src/modules/avatar/libkviavatar.cpp
@@ -201,7 +201,7 @@ static bool avatar_kvs_cmd_set(KviKvsModuleCommandCall * c)
 
 	if(szAvatar.isEmpty())
 	{
-		KviAsyncAvatarSelectionDialog * d = new KviAsyncAvatarSelectionDialog(g_pFrame,QString::null,c->window()->connection());
+		KviAsyncAvatarSelectionDialog * d = new KviAsyncAvatarSelectionDialog(g_pFrame,QString(),c->window()->connection());
 		d->show();
 		return true;
 	}
@@ -215,7 +215,7 @@ static bool avatar_kvs_cmd_set(KviKvsModuleCommandCall * c)
 		return true;
 	}
 
-	KviAvatar * av = g_pIconManager->getAvatar(QString::null,szAvatar);
+	KviAvatar * av = g_pIconManager->getAvatar(QString(),szAvatar);
 	if(av)
 	{
 		// Ok...got it...
@@ -224,7 +224,7 @@ static bool avatar_kvs_cmd_set(KviKvsModuleCommandCall * c)
 			c->window()->connection()->userInfo()->nickName(),
 			c->window()->connection()->userInfo()->userName(),
 			c->window()->connection()->userInfo()->hostName(),
-			QString::null);
+			QString());
 	} else {
 		bool bIsUrl = KviQString::equalCIN(szAvatar,"http://",7) && (szAvatar.length() > 7);
 
@@ -298,7 +298,7 @@ static bool avatar_kvs_cmd_unset(KviKvsModuleCommandCall * c)
 			c->window()->connection()->userInfo()->nickName(),
 			c->window()->connection()->userInfo()->userName(),
 			c->window()->connection()->userInfo()->hostName(),
-			QString::null);
+			QString());
 
 	return true;
 }
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index d99a8eedb..c7bd1c85c 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -1184,7 +1184,7 @@
 	// KviVariantTableItem
 	//
 	KviVariantTableItem::KviVariantTableItem(QTable * t,const QVariant & property)
-	: QTableItem(t,QTableItem::WhenCurrent,QString::null)
+	: QTableItem(t,QTableItem::WhenCurrent,QString())
 	{
 		m_property = property;
 	}
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index e9fb642f0..e20c3e20b 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -848,8 +848,8 @@ void KviScriptEditorImplementation::saveToFile()
 	QString szFileName;
 	if(KviFileDialog::askForSaveFileName(szFileName,
 		__tr2qs_ctx("Choose a Filename - KVIrc","editor"),
-		QString::null,
-		QString::null,false,true,true))
+		QString(),
+		QString(),false,true,true))
 	{
 		QString szBuffer = m_pEditor->toPlainText();
 
@@ -929,7 +929,7 @@ void KviScriptEditorImplementation::loadFromFile()
 	QString szFileName;
 	if(KviFileDialog::askForOpenFileName(szFileName,
 		__tr2qs_ctx("Load Script File - KVIrc","editor"),
-		QString::null,KVI_FILTER_SCRIPT,false,true))
+		QString(),KVI_FILTER_SCRIPT,false,true))
 	{
 		QString szBuffer;
 		if(KviFileUtils::loadFile(szFileName,szBuffer))
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
index b3c0b9d94..39662582b 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/eventeditor.cpp
@@ -485,7 +485,7 @@ void KviEventEditor::exportAllEvents()
 
 	QString szFile;
 
-	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs("Choose a Filename - KVIrc"),szName,QString::null,true,true))return;
+	if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs("Choose a Filename - KVIrc"),szName,QString(),true,true))return;
 
 	if(!KviFileUtils::writeFile(szFile,out))
 	{
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp
index 98986b260..ff5f0c2a4 100644
--- a/src/modules/http/httpfiletransfer.cpp
+++ b/src/modules/http/httpfiletransfer.cpp
@@ -437,7 +437,7 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess)
 		m_eGeneralStatus = Success;
 		displayUpdate();
 		if(out && (!m_bNoOutput))out->output(KVI_OUT_GENERICSUCCESS,__tr2qs_ctx("[HTTP %d]: Transfer completed","http"),id());
-		g_pApp->fileDownloadTerminated(true,m_pHttpRequest->url().url(),m_pHttpRequest->fileName(),QString::null,QString::null,!m_bNotifyCompletion);
+		g_pApp->fileDownloadTerminated(true,m_pHttpRequest->url().url(),m_pHttpRequest->fileName(),QString(),QString(),!m_bNotifyCompletion);
 	} else {
 		m_szStatusString = __tr2qs_ctx("Transfer failed","http");
 		m_szStatusString += ": ";
@@ -445,7 +445,7 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess)
 		m_eGeneralStatus = Failure;
 		displayUpdate();
 		if(out && (!m_bNoOutput))out->output(KVI_OUT_GENERICERROR,__tr2qs_ctx("[HTTP %d]: Transfer failed: %Q","http"),id(),&(m_pHttpRequest->lastError()));
-		g_pApp->fileDownloadTerminated(false,m_pHttpRequest->url().url(),m_pHttpRequest->fileName(),QString::null,m_pHttpRequest->lastError(),!m_bNotifyCompletion);
+		g_pApp->fileDownloadTerminated(false,m_pHttpRequest->url().url(),m_pHttpRequest->fileName(),QString(),m_pHttpRequest->lastError(),!m_bNotifyCompletion);
 	}
 
 	if(m_bAutoClean)
diff --git a/src/modules/http/libkvihttp.cpp b/src/modules/http/libkvihttp.cpp
index ff25ae6f9..c62781eab 100644
--- a/src/modules/http/libkvihttp.cpp
+++ b/src/modules/http/libkvihttp.cpp
@@ -245,7 +245,7 @@ static bool http_kvs_cmd_get(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("filename",KVS_PT_STRING,KVS_PF_OPTIONAL,szFileName)
 	KVSM_PARAMETERS_END(c)
 
-	return http_kvs_complete_get(c,szUrl,szFileName,QString::null);
+	return http_kvs_complete_get(c,szUrl,szFileName,QString());
 }
 /*
 	@doc: http.asyncGet
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index 95216b5c5..8fb58534b 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -364,7 +364,7 @@ void KviListWindow::importList()
 {
 
 	QString szFile;
-	if(KviFileDialog::askForOpenFileName(szFile,__tr2qs("Choose filename"),QString::null,KVI_FILTER_CONFIG,false,
+	if(KviFileDialog::askForOpenFileName(szFile,__tr2qs("Choose filename"),QString(),KVI_FILTER_CONFIG,false,
 		false,this))
 	{
 		if(m_pConsole->isConnected())
diff --git a/src/modules/logview/logviewwidget.cpp b/src/modules/logview/logviewwidget.cpp
index bcf6d82c7..34aa275c1 100644
--- a/src/modules/logview/logviewwidget.cpp
+++ b/src/modules/logview/logviewwidget.cpp
@@ -43,13 +43,13 @@
 KviLogListViewItem::KviLogListViewItem(KviTalTreeWidgetItem * par, KviLogFile::KviLogTypes type, KviLogFile * fileData)
 : KviTalTreeWidgetItem(par), m_type(type), m_pFileData(fileData)
 {
-	setText(0,m_pFileData ? m_pFileData->name() : QString::null);
+	setText(0,m_pFileData ? m_pFileData->name() : QString());
 };
 
 KviLogListViewItem::KviLogListViewItem(KviTalTreeWidget * par, KviLogFile::KviLogTypes type, KviLogFile * fileData)
 : KviTalTreeWidgetItem(par), m_type(type), m_pFileData(fileData)
 {
-	setText(0,m_pFileData ? m_pFileData->name() : QString::null);
+	setText(0,m_pFileData ? m_pFileData->name() : QString());
 };
 
 KviLogListViewItemFolder::KviLogListViewItemFolder(KviTalTreeWidgetItem * par, const QString& label)
diff --git a/src/modules/logview/logviewwidget.h b/src/modules/logview/logviewwidget.h
index 03f28abaf..1f7b102a0 100644
--- a/src/modules/logview/logviewwidget.h
+++ b/src/modules/logview/logviewwidget.h
@@ -42,7 +42,7 @@ public:
 public:
 	KviLogFile::KviLogTypes m_type;
 	KviLogFile*             m_pFileData;
-	virtual QString fileName() const { return QString::null; };
+	virtual QString fileName() const { return QString(); };
 };
 
 class KviLogListViewItemFolder : public KviLogListViewItem
diff --git a/src/modules/mediaplayer/mp_interface.cpp b/src/modules/mediaplayer/mp_interface.cpp
index b41e05d59..effa1f50d 100644
--- a/src/modules/mediaplayer/mp_interface.cpp
+++ b/src/modules/mediaplayer/mp_interface.cpp
@@ -88,19 +88,19 @@ QString KviMediaPlayerInterface::getLocalFile()
 		ret.remove(0,7);
 		return ret;
 	}
-	return QString::null;
+	return QString();
 }
 
 QString KviMediaPlayerInterface::amipEval(const QString &cmd)
 {
-	return QString::null;
+	return QString();
 }
 
 #define SCAN_MP3_FILE \
 	QString f = getLocalFile(); \
-	if(f.isEmpty())return QString::null; \
+	if(f.isEmpty())return QString(); \
 	mp3info mp3; \
-	if(!scan_mp3_file(f,&mp3))return QString::null; \
+	if(!scan_mp3_file(f,&mp3))return QString(); \
 	QTextCodec *pCodec; \
 	pCodec=mediaplayer_get_codec();
 
@@ -270,6 +270,6 @@ QString KviMediaPlayerInterface::mediaType()
 	else if(ret.endsWith(".mpeg",Qt::CaseInsensitive))ret = "MPEG Video";
 	else if(ret.endsWith(".mpg",Qt::CaseInsensitive))ret = "MPEG Video";
 	else if(ret.startsWith("http://",Qt::CaseInsensitive))ret = "HTTP Audio Stream";
-	else ret = QString::null;
+	else ret = QString();
 	return ret;
 }
diff --git a/src/modules/mediaplayer/mp_xmmsinterface.cpp b/src/modules/mediaplayer/mp_xmmsinterface.cpp
index f12d5365d..67e925e9f 100644
--- a/src/modules/mediaplayer/mp_xmmsinterface.cpp
+++ b/src/modules/mediaplayer/mp_xmmsinterface.cpp
@@ -306,20 +306,20 @@ bool KviXmmsInterface::playMrl(const QString &mrl)
 QString KviXmmsInterface::nowPlaying()
 {
 	int (*sym)(int) = (int (*)(int))lookupSymbol("xmms_remote_get_playlist_pos");
-	if(!sym)return QString::null;
+	if(!sym)return QString();
 	int pos = sym(0);
 	char * (*sym2)(int,int) = (char * (*)(int,int))lookupSymbol("xmms_remote_get_playlist_title");
-	if(!sym2)return QString::null;
+	if(!sym2)return QString();
 	return QString::fromLocal8Bit(sym2(0,pos));
 }
 
 QString KviXmmsInterface::mrl()
 {
 	int (*sym)(int) = (int (*)(int))lookupSymbol("xmms_remote_get_playlist_pos");
-	if(!sym)return QString::null;
+	if(!sym)return QString();
 	int pos = sym(0);
 	char * (*sym2)(int,int) = (char * (*)(int,int))lookupSymbol("xmms_remote_get_playlist_file");
-	if(!sym2)return QString::null;
+	if(!sym2)return QString();
 	QString ret = QString::fromLocal8Bit(sym2(0,pos));
 	if(ret.length() > 1)
 		if(ret[0] == '/')ret.prepend("file://");
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
index 47f3b817e..a26623a22 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/notifierwindow.cpp
@@ -1376,7 +1376,7 @@ void KviNotifierWindow::returnPressed()
 
 	addMessage(tab->window(),tmp.ptr(),html,0); //m_pCurrentFocusedWindowTab on place of m_pCurrentMessage->window()
 	m_pLineEdit->setText("");
-	KviUserInput::parse(txt,tab->window(),QString::null,1);
+	KviUserInput::parse(txt,tab->window(),QString(),1);
 }
 
 void KviNotifierWindow::progressUpdate()
diff --git a/src/modules/objects/class_treewidgetitem.cpp b/src/modules/objects/class_treewidgetitem.cpp
index 3d01f61e3..b478b0c92 100644
--- a/src/modules/objects/class_treewidgetitem.cpp
+++ b/src/modules/objects/class_treewidgetitem.cpp
@@ -207,12 +207,12 @@ KviKvsStandardTreeWidgetItem::~KviKvsStandardTreeWidgetItem()
 
 /*
 KviKvsCheckTreeWidgetItem::KviKvsCheckTreeWidgetItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidget * par)
-:KviTalCheckListItem(par,QString::null,KviTalCheckListItem::CheckBox), m_pMasterObject(ob)
+:KviTalCheckListItem(par,QString(),KviTalCheckListItem::CheckBox), m_pMasterObject(ob)
 {
 }
 
 KviKvsCheckTreeWidgetItem::KviKvsCheckTreeWidgetItem(KviKvsObject_treewidgetitem * ob,KviTalTreeWidgetItem * par)
-:KviTalCheckListItem(par,QString::null,KviTalCheckListItem::CheckBox), m_pMasterObject(ob)
+:KviTalCheckListItem(par,QString(),KviTalCheckListItem::CheckBox), m_pMasterObject(ob)
 {
 }
 
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index 401ab18c1..71fc90aa5 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -257,7 +257,7 @@ void KviAvatarSelectionDialog::chooseFileClicked()
 {
 	QString tmp;
  	if(KviFileDialog::askForOpenFileName(tmp,__tr2qs_ctx("Choose an Image File - KVIrc","options"),
-		QString::null,KVI_FILTER_IMAGE,false,true,this))
+		QString(),KVI_FILTER_IMAGE,false,true,this))
 	{
 		m_pLineEdit->setText(tmp);
 	}
@@ -534,7 +534,7 @@ void KviIdentityAvatarOptionsWidget::chooseAvatar()
 	{
 		// this is an url
 		// first check if we have it in the cache
-		KviAvatar * a = g_pIconManager->getAvatar(QString::null,szCurrent);
+		KviAvatar * a = g_pIconManager->getAvatar(QString(),szCurrent);
 		if(!a)
 		{
 			// no cache... try downloading
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index 0daef2a80..d08f6368c 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -263,7 +263,7 @@ void KviMessageListWidgetItemDelegate::paint(QPainter * p, const QStyleOptionVie
 
 
 KviMessageColorListWidgetItem::KviMessageColorListWidgetItem(KviTalListWidget * b,int idx)
-: KviTalListWidgetText(b,QString::null)
+: KviTalListWidgetText(b,QString())
 {
 
 	m_iClrIdx = idx;
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index b5349f9ce..7f68e53b3 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -403,13 +403,13 @@ void KviNetworkDetailsWidget::fillData(KviNetwork * n)
 	if(m_pAutoConnectCheck)
 		n->setAutoConnect(m_pAutoConnectCheck->isChecked());
 	if(m_pEncodingEditor)
-		if(m_pEncodingEditor->currentIndex() <= 0)n->setEncoding(QString::null);
+		if(m_pEncodingEditor->currentIndex() <= 0)n->setEncoding(QString());
 		else {
 			KviLocale::EncodingDescription * d = KviLocale::encodingDescription(m_pEncodingEditor->currentIndex() - 1);
 			n->setEncoding(d->szName);
 		}
 	if(m_pTextEncodingEditor)
-		if(m_pTextEncodingEditor->currentIndex() <= 0)n->setTextEncoding(QString::null);
+		if(m_pTextEncodingEditor->currentIndex() <= 0)n->setTextEncoding(QString());
 		else {
 			KviLocale::EncodingDescription * dd = KviLocale::encodingDescription(m_pTextEncodingEditor->currentIndex() - 1);
 			n->setTextEncoding(dd->szName);
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
index 96c1f7fd4..265a8da9c 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/optw_texticons.cpp
@@ -36,7 +36,7 @@
 
 
 KviTextIconTableItem::KviTextIconTableItem(QTableWidget * t,KviTextIcon * icon)
-: QTableWidgetItem(QString::null,Qt::ItemIsEditable)
+: QTableWidgetItem(QString(),Qt::ItemIsEditable)
 {
 	if(icon)
 		m_pIcon=icon;
@@ -161,7 +161,7 @@ void KviTextIconsOptionsWidget::iconSelected(int id)
 void KviTextIconsOptionsWidget::chooseFromFile()
 {
 	QString szFile;
-	KviFileDialog::askForOpenFileName(szFile,"Choose icon filename",QString::null,KVI_FILTER_IMAGE,"options");
+	KviFileDialog::askForOpenFileName(szFile,"Choose icon filename",QString(),KVI_FILTER_IMAGE,"options");
 	if(!szFile.isEmpty())
 	{
 		if(g_pIconManager->getPixmap(szFile))
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index e3f79dd62..4e372998d 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -909,27 +909,27 @@ void KviSinglePopupEditor::populateMenu(KviKvsPopupMenu * pop,KviPopupTreeWidget
 			case KviKvsPopupMenuItem::Item:
 				if(par)theItem = new KviPopupTreeWidgetItem(par,theItem,KviPopupTreeWidgetItem::Item);
 				else theItem = new KviPopupTreeWidgetItem(m_pTreeWidget,theItem,KviPopupTreeWidgetItem::Item);
-				theItem->setIcon(item->kvsIcon() ? item->kvsIcon()->code() : QString::null);
-				theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString::null);
-				theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString::null);
-				theItem->setCode(item->kvsCode() ? item->kvsCode()->code() : QString::null);
+				theItem->setIcon(item->kvsIcon() ? item->kvsIcon()->code() : QString());
+				theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString());
+				theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString());
+				theItem->setCode(item->kvsCode() ? item->kvsCode()->code() : QString());
 				theItem->setId(item->name());
 			break;
 			case KviKvsPopupMenuItem::ExtMenu:
 				if(par)theItem = new KviPopupTreeWidgetItem(par,theItem,KviPopupTreeWidgetItem::ExtMenu);
 				else theItem = new KviPopupTreeWidgetItem(m_pTreeWidget,theItem,KviPopupTreeWidgetItem::ExtMenu);
-				theItem->setIcon(item->kvsIcon() ? item->kvsIcon()->code() : QString::null);
-				theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString::null);
-				theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString::null);
+				theItem->setIcon(item->kvsIcon() ? item->kvsIcon()->code() : QString());
+				theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString());
+				theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString());
 				theItem->setCode(((KviKvsPopupMenuItemExtMenu *)item)->extName());
 				theItem->setId(item->name());
 			break;
 			case KviKvsPopupMenuItem::Label:
 				if(par)theItem = new KviPopupTreeWidgetItem(par,theItem,KviPopupTreeWidgetItem::Label);
 				else theItem = new KviPopupTreeWidgetItem(m_pTreeWidget,theItem,KviPopupTreeWidgetItem::Label);
-				theItem->setIcon(item->kvsIcon() ? item->kvsIcon()->code() : QString::null);
-				theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString::null);
-				theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString::null);
+				theItem->setIcon(item->kvsIcon() ? item->kvsIcon()->code() : QString());
+				theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString());
+				theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString());
 				theItem->setId(item->name());
 			break;
 			case KviKvsPopupMenuItem::Separator:
@@ -940,9 +940,9 @@ void KviSinglePopupEditor::populateMenu(KviKvsPopupMenu * pop,KviPopupTreeWidget
 			case KviKvsPopupMenuItem::Menu:
 				if(par)theItem = new KviPopupTreeWidgetItem(par,theItem,KviPopupTreeWidgetItem::Menu);
 				else theItem = new KviPopupTreeWidgetItem(m_pTreeWidget,theItem,KviPopupTreeWidgetItem::Menu);
-				theItem->setIcon(item->kvsIcon() ? item->kvsIcon()->code() : QString::null);
-				theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString::null);
-				theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString::null);
+				theItem->setIcon(item->kvsIcon() ? item->kvsIcon()->code() : QString());
+				theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString());
+				theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString());
 				theItem->setId(item->name());
 				populateMenu(((KviKvsPopupMenuItemMenu *)item)->menu(),theItem,0);
 			break;
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 581e53d05..c137204d1 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -393,7 +393,7 @@ void KviRegisteredUsersDialog::addGroupClicked()
 	bool ok;
 	QString text = QInputDialog::getText( this,
 		"KVIrc", __tr("Group name:"), QLineEdit::Normal,
-		QString::null, &ok );
+		QString(), &ok );
 	if ( ok && !text.isEmpty() ) {
 		g_pLocalRegisteredUserDataBase->addGroup(text);
 		fillList();
@@ -746,7 +746,7 @@ void KviRegisteredUsersDialog::exportClicked()
 			QString avatar;
 			if(u->getProperty("avatar",avatar))
 			{
-				KviAvatar * av = g_pIconManager->getAvatar(QString::null,avatar);
+				KviAvatar * av = g_pIconManager->getAvatar(QString(),avatar);
 				if(av)
 				{
 					if(!av->pixmap()->isNull())
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index cf8c464ef..e16e85dab 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -435,7 +435,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste
 		m_pCustomColorCheck->setChecked(r->getBoolProperty("useCustomColor"));
 	g->addWidget(m_pCustomColorCheck,5,0,1,2);
 
-	m_pCustomColorSelector = new KviColorSelector(p2,QString::null,m_pCustomColor,1);
+	m_pCustomColorSelector = new KviColorSelector(p2,QString(),m_pCustomColor,1);
 	g->addWidget(m_pCustomColorSelector,5,2);
 
 	QPushButton * pb = new QPushButton(__tr2qs("All Properties..."),p2);
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index 9466f1bb5..cf817546c 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -745,7 +745,7 @@ void KviSetupWizard::chooseOldDataPath()
 					"Do you want to use it anyway?")
 					.arg( szBuffer ),
 				__tr2qs("&Yes"), __tr2qs("&No"),
-				QString::null, 0, 1 ) == 0
+				QString(), 0, 1 ) == 0
 			) {
 				m_pOldDataPathEdit->setText(szBuffer);
 			}
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index e0db6290b..56f6c31bb 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -1890,7 +1890,7 @@ static bool str_kvs_fnc_split(KviKvsModuleFunctionCall * c)
 		}
 	} else {
 		if(!bNoEmpty)
-			a->set(id,new KviKvsVariant(QString::null)); // empty string at the end
+			a->set(id,new KviKvsVariant(QString())); // empty string at the end
 	}
 
 	return true;
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index cb389dcb5..051017420 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -208,7 +208,7 @@ static bool system_kvs_fnc_getenv(KviKvsModuleFunctionCall *c)
 #else
 */
 	char * b = kvi_getenv(szVar.data());
-	c->returnValue()->setString(b ? QString::fromLocal8Bit(b) : QString::null);
+	c->returnValue()->setString(b ? QString::fromLocal8Bit(b) : QString());
 //#endif
 	return true;
 }
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index 8d86e06fe..f59921031 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -318,7 +318,7 @@ void KviThemeManagementDialog::installFromFile()
 	QString szFileName;
 	QString szError;
 
-	if(!KviFileDialog::askForOpenFileName(szFileName,__tr2qs_ctx("Open Theme - KVIrc","theme"),QString::null,KVI_FILTER_THEME))
+	if(!KviFileDialog::askForOpenFileName(szFileName,__tr2qs_ctx("Open Theme - KVIrc","theme"),QString(),KVI_FILTER_THEME))
 		return;
 	if(!KviThemeFunctions::installThemePackage(szFileName,szError,this))
 	{
diff --git a/src/modules/toolbareditor/toolbareditor.h b/src/modules/toolbareditor/toolbareditor.h
index 06ad94397..e5c3be0e8 100644
--- a/src/modules/toolbareditor/toolbareditor.h
+++ b/src/modules/toolbareditor/toolbareditor.h
@@ -73,7 +73,7 @@ class KviCustomToolBarPropertiesDialog : public QDialog
 {
 	Q_OBJECT
 public:
-	KviCustomToolBarPropertiesDialog(QWidget * p,const QString &szText,const QString &szId = QString::null,const QString &szLabel = QString::null,const QString &szIconId = QString::null);
+	KviCustomToolBarPropertiesDialog(QWidget * p,const QString &szText,const QString &szId = QString(),const QString &szLabel = QString(),const QString &szIconId = QString());
 	~KviCustomToolBarPropertiesDialog();
 protected:
 	QString m_szId;
diff --git a/src/modules/upnp/igdcontrolpoint.cpp b/src/modules/upnp/igdcontrolpoint.cpp
index 529287d35..5ff50d228 100644
--- a/src/modules/upnp/igdcontrolpoint.cpp
+++ b/src/modules/upnp/igdcontrolpoint.cpp
@@ -87,7 +87,7 @@ QString IgdControlPoint::getExternalIpAddress() const
 	{
 		return m_pWanConnectionService->getExternalIpAddress();
 	} else {
-		return QString::null;
+		return QString();
 	}
 }
 
diff --git a/src/modules/upnp/manager.cpp b/src/modules/upnp/manager.cpp
index 64072c16c..2a81abfb0 100644
--- a/src/modules/upnp/manager.cpp
+++ b/src/modules/upnp/manager.cpp
@@ -114,7 +114,7 @@ Manager * Manager::instance()
 QString Manager::getExternalIpAddress() const
 {
 	// Do not expose activeIgd_;
-	return (m_pActiveIgdControlPoint != 0 ? m_pActiveIgdControlPoint->getExternalIpAddress() : QString::null);
+	return (m_pActiveIgdControlPoint != 0 ? m_pActiveIgdControlPoint->getExternalIpAddress() : QString());
 }
 
 
diff --git a/src/modules/upnp/rootservice.cpp b/src/modules/upnp/rootservice.cpp
index 87c684015..def377458 100644
--- a/src/modules/upnp/rootservice.cpp
+++ b/src/modules/upnp/rootservice.cpp
@@ -214,7 +214,7 @@ ServiceParameters RootService::getServiceById(const QString &serviceId) const
 	}
 
 	//calling function check this field to understand if the struct is null
-	params.controlUrl = QString::null;
+	params.controlUrl = QString();
 	return params;
 }
 
@@ -254,7 +254,7 @@ ServiceParameters RootService::getServiceByType(const QString &serviceType) cons
 	}
 
 	//calling function check this field to understand if the struct is null
-	params.controlUrl = QString::null;
+	params.controlUrl = QString();
 	return params;
 
 }
diff --git a/src/modules/upnp/xmlfunctions.cpp b/src/modules/upnp/xmlfunctions.cpp
index b23c8235c..5d8f168cc 100644
--- a/src/modules/upnp/xmlfunctions.cpp
+++ b/src/modules/upnp/xmlfunctions.cpp
@@ -107,7 +107,7 @@ QString XmlFunctions::getNodeValue( const QDomNode &rootNode, const QString &pat
   if( rootNode.isNull() )
   {
     qWarning() << "XmlFunctions::getNodeValue: Attempted to request '" << path << "' on null root node." << endl;
-    return QString::null;
+    return QString();
   }
 
 
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 88f54dfc3..a06da7170 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -480,7 +480,7 @@ void BanFrame::enableClicked()
 void BanFrame::addBan()
 {
 	bool ok = false;
-	QString *pText = new QString(QInputDialog::getText(this, __tr2qs("URL Ban List"),__tr2qs("Add"),QLineEdit::Normal,QString::null,&ok));
+	QString *pText = new QString(QInputDialog::getText(this, __tr2qs("URL Ban List"),__tr2qs("Add"),QLineEdit::Normal,QString(),&ok));
 	if (ok && !pText->isEmpty()) {
 		g_pBanList->append(pText);
 		m_pBanList->addItem(*pText);