From 432e997b127e9f43d0db24426c49e298a5eb2d96 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:15:20 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 src/kvirc/kernel/kvi_coreactions.cpp |  2 +-
 src/kvirc/kvs/kvi_kvs_eventtable.cpp | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/kvirc')

diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp
index 8a66430..1c64dc9 100644
--- a/src/kvirc/kernel/kvi_coreactions.cpp
+++ b/src/kvirc/kernel/kvi_coreactions.cpp
@@ -834,7 +834,7 @@ KviChangeNickAction::KviChangeNickAction(TQObject * pParent)
 	__tr2qs("Change Nickname"),
 	__tr2qs("Shows a popup menu that allows quickly changing the nickname"),
 	KviActionManager::categoryIrc(),
-	"kvi_bigicon_nickpopup.png",
+	"kvi_bigicon_nictdepopup.png",
 	KVI_SMALLICON_NICK,
 	NeedsConnection | NeedsContext)
 {
diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.cpp b/src/kvirc/kvs/kvi_kvs_eventtable.cpp
index 4b8c8c9..17f0d8c 100644
--- a/src/kvirc/kvs/kvi_kvs_eventtable.cpp
+++ b/src/kvirc/kvs/kvi_kvs_eventtable.cpp
@@ -199,7 +199,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
 	*/
 	EVENT("OnIRC",""),
 	/*
-		@doc: onchannelnickpopuprequest
+		@doc: onchannelnictdepopuprequest
 		@type:
 			event
 		@title:
@@ -236,7 +236,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
 			Channel window
 		@description:
 		@seealso:
-			[event:onchannelnickpopuprequest]OnChannelNickPopupRequest[/event]
+			[event:onchannelnictdepopuprequest]OnChannelNickPopupRequest[/event]
 	*/
 	EVENT("OnChannelNickDefaultActionRequest","$0 = nick list"),
 	/*
@@ -410,7 +410,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
 	*/
 	EVENT("OnWindowPopupRequest",""),
 		/*
-		@doc: onhostlinkpopuprequest
+		@doc: onhostlintdepopuprequest
 		@type:
 			event
 		@title:
@@ -431,7 +431,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
 	*/
 	EVENT("OnHostLinkPopupRequest","$0 = actual name\n$1 - visible name\n$2 - command name"),
 	/*
-		@doc: onurllinkpopuprequest
+		@doc: onurllintdepopuprequest
 		@type:
 			event
 		@title:
@@ -457,7 +457,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
 	*/
 	EVENT("OnURLLinkPopupRequest","$0 = actual name\n$1 - visible name\n$2 - command name"),
 	/*
-		@doc: onserverlinkpopuprequest
+		@doc: onserverlintdepopuprequest
 		@type:
 			event
 		@title:
@@ -485,7 +485,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
 	*/
 	EVENT("OnServerLinkPopupRequest","$0 = actual name\n$1 - visible name\n$2 - command name"),
 	/*
-		@doc: onchannellinkpopuprequest
+		@doc: onchannellintdepopuprequest
 		@type:
 			event
 		@title:
@@ -511,7 +511,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
 	*/
 	EVENT("OnChannelLinkPopupRequest","$0 = actual name\n$1 - visible name\n$2 - command name"),
 	/*
-		@doc: onnicklinkpopuprequest
+		@doc: onnicklintdepopuprequest
 		@type:
 			event
 		@title:
@@ -534,13 +534,13 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
 			that can be performed with the nickname like querying , sending a file by dcc or opening a dcc.chat.
 			Please note that NOT ALL the nickname links will receive this event.[br]
 			The nickname links that appear in the text view of the channel that they are actually in
-			are handled by the [event:onchannelnickpopuprequest]OnChannelNickPopupRequest[/event] event.[br]
+			are handled by the [event:onchannelnictdepopuprequest]OnChannelNickPopupRequest[/event] event.[br]
 			The nickname links that appear in the text view of the query in that they are a remote end
-			are handled by the [event:onquerynickpopuprequest]OnQueryNickPopupRequest[/event] event.[br]
+			are handled by the [event:onquerynictdepopuprequest]OnQueryNickPopupRequest[/event] event.[br]
 	*/
 	EVENT("OnNickLinkPopupRequest","$0 = actual name\n$1 - visible name\n$2 - command name"),
 	/*
-		@doc: onquerynickpopuprequest
+		@doc: onquerynictdepopuprequest
 		@type:
 			event
 		@title:
-- 
cgit v1.2.3