reworked icon stuff

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

4 files changed, 9 insertions, 9 deletions

diff --git a/src/modules/dcc/DccChatWindow.cpp b/src/modules/dcc/DccChatWindow.cpp
index c7071b437..9d3641183 100644
--- a/src/modules/dcc/DccChatWindow.cpp
+++ b/src/modules/dcc/DccChatWindow.cpp
@@ -283,7 +283,7 @@ void DccChatWindow::fillCaptionBuffers()
 
 QPixmap * DccChatWindow::myIconPtr()
 {
-	return g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG);
+	return g_pIconManager->getSmallIcon(KviIconManager::DccMsg);
 }
 
 void DccChatWindow::getBaseLogFileName(QString &buffer)
@@ -497,7 +497,7 @@ bool DccChatWindow::event(QEvent *e)
 								if(KVI_OPTION_BOOL(KviOption_boolPopupNotifierOnNewDccChatMessages))
 								{
 									QString szMsg = Qt::escape(QString(d.ptr()));
-									g_pApp->notifierMessage(this,KVI_SMALLICON_DCCCHATMSG,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
+									g_pApp->notifierMessage(this,KviIconManager::DccChatMsg,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 								}
 							}
 						}
diff --git a/src/modules/dcc/DccDialog.cpp b/src/modules/dcc/DccDialog.cpp
index 9cc68b906..e7a429e80 100644
--- a/src/modules/dcc/DccDialog.cpp
+++ b/src/modules/dcc/DccDialog.cpp
@@ -81,7 +81,7 @@ DccAcceptDialog::DccAcceptDialog(DccBroker * br,DccDescriptor * dcc,const QStrin
 	connect(btn,SIGNAL(clicked()),this,SLOT(rejectClicked()));
 	hb->addWidget(btn);
 
-	setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG))));
+	setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::DccMsg))));
 	setWindowTitle(capt);
 
 	l->activateWindow();
@@ -161,7 +161,7 @@ DccRenameDialog::DccRenameDialog(DccBroker * br,DccDescriptor * dcc,const QStrin
 	btn->setDefault(true);
 	//btn->setFocus();
 
-	setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG))));
+	setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::DccMsg))));
 	setWindowTitle(__tr2qs_ctx("File Already Exists - KVIrc","dcc"));
 }
 
diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp
index 75989cdd6..4c1149e3e 100644
--- a/src/modules/dcc/DccVideoWindow.cpp
+++ b/src/modules/dcc/DccVideoWindow.cpp
@@ -655,7 +655,7 @@ void DccVideoWindow::fillCaptionBuffers()
 
 QPixmap * DccVideoWindow::myIconPtr()
 {
-	return g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCVOICE);
+	return g_pIconManager->getSmallIcon(KviIconManager::DccVoice);
 }
 
 void DccVideoWindow::ownMessage(const QString &text, bool bUserFeedback)
@@ -863,7 +863,7 @@ bool DccVideoWindow::event(QEvent *e)
 								if(KVI_OPTION_BOOL(KviOption_boolPopupNotifierOnNewDccChatMessages))
 								{
 									QString szMsg = Qt::escape(QString(d.ptr()));
-									g_pApp->notifierMessage(this,KVI_SMALLICON_DCCCHATMSG,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
+									g_pApp->notifierMessage(this,KviIconManager::DccChatMsg,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 								}
 							}
 						}
diff --git a/src/modules/dcc/DccVoiceWindow.cpp b/src/modules/dcc/DccVoiceWindow.cpp
index b736b4058..d67cc9db2 100644
--- a/src/modules/dcc/DccVoiceWindow.cpp
+++ b/src/modules/dcc/DccVoiceWindow.cpp
@@ -660,12 +660,12 @@ DccVoiceWindow::DccVoiceWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const cha
 	KviTalVBox * vbox2 = new KviTalVBox(m_pHBox);
 
 	m_pRecordingLabel = new QLabel(vbox2);
-	m_pRecordingLabel->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RECORD)));
+	m_pRecordingLabel->setPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::Record)));
 	m_pRecordingLabel->setEnabled(false);
 	m_pRecordingLabel->setFrameStyle(QFrame::Raised | QFrame::Panel);
 
 	m_pPlayingLabel = new QLabel(vbox2);
-	m_pPlayingLabel->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PLAY)));
+	m_pPlayingLabel->setPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::Play)));
 	m_pPlayingLabel->setEnabled(false);
 	m_pPlayingLabel->setFrameStyle(QFrame::Raised | QFrame::Panel);
 
@@ -803,7 +803,7 @@ void DccVoiceWindow::fillCaptionBuffers()
 
 QPixmap * DccVoiceWindow::myIconPtr()
 {
-	return g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCVOICE);
+	return g_pIconManager->getSmallIcon(KviIconManager::DccVoice);
 }
 
 bool DccVoiceWindow::event(QEvent *e)