Rename many classes and header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent b4b5c616e6
commit 432e997b12

@ -23,7 +23,7 @@
// Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// //
#include <kmainwindow.h> #include <tdemainwindow.h>
class KVILIB_API KviTalMainWindow : public TDEMainWindow class KVILIB_API KviTalMainWindow : public TDEMainWindow
{ {

@ -22,7 +22,7 @@
// Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// //
#include <ktoolbar.h> #include <tdetoolbar.h>
#include "kvi_tal_toolbardocktype.h" #include "kvi_tal_toolbardocktype.h"

@ -834,7 +834,7 @@ KviChangeNickAction::KviChangeNickAction(TQObject * pParent)
__tr2qs("Change Nickname"), __tr2qs("Change Nickname"),
__tr2qs("Shows a popup menu that allows quickly changing the nickname"), __tr2qs("Shows a popup menu that allows quickly changing the nickname"),
KviActionManager::categoryIrc(), KviActionManager::categoryIrc(),
"kvi_bigicon_nickpopup.png", "kvi_bigicon_nictdepopup.png",
KVI_SMALLICON_NICK, KVI_SMALLICON_NICK,
NeedsConnection | NeedsContext) NeedsConnection | NeedsContext)
{ {

@ -199,7 +199,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
*/ */
EVENT("OnIRC",""), EVENT("OnIRC",""),
/* /*
@doc: onchannelnickpopuprequest @doc: onchannelnictdepopuprequest
@type: @type:
event event
@title: @title:
@ -236,7 +236,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
Channel window Channel window
@description: @description:
@seealso: @seealso:
[event:onchannelnickpopuprequest]OnChannelNickPopupRequest[/event] [event:onchannelnictdepopuprequest]OnChannelNickPopupRequest[/event]
*/ */
EVENT("OnChannelNickDefaultActionRequest","$0 = nick list"), EVENT("OnChannelNickDefaultActionRequest","$0 = nick list"),
/* /*
@ -410,7 +410,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
*/ */
EVENT("OnWindowPopupRequest",""), EVENT("OnWindowPopupRequest",""),
/* /*
@doc: onhostlinkpopuprequest @doc: onhostlintdepopuprequest
@type: @type:
event event
@title: @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"), EVENT("OnHostLinkPopupRequest","$0 = actual name\n$1 - visible name\n$2 - command name"),
/* /*
@doc: onurllinkpopuprequest @doc: onurllintdepopuprequest
@type: @type:
event event
@title: @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"), EVENT("OnURLLinkPopupRequest","$0 = actual name\n$1 - visible name\n$2 - command name"),
/* /*
@doc: onserverlinkpopuprequest @doc: onserverlintdepopuprequest
@type: @type:
event event
@title: @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"), EVENT("OnServerLinkPopupRequest","$0 = actual name\n$1 - visible name\n$2 - command name"),
/* /*
@doc: onchannellinkpopuprequest @doc: onchannellintdepopuprequest
@type: @type:
event event
@title: @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"), EVENT("OnChannelLinkPopupRequest","$0 = actual name\n$1 - visible name\n$2 - command name"),
/* /*
@doc: onnicklinkpopuprequest @doc: onnicklintdepopuprequest
@type: @type:
event event
@title: @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. 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] 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 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 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"), EVENT("OnNickLinkPopupRequest","$0 = actual name\n$1 - visible name\n$2 - command name"),
/* /*
@doc: onquerynickpopuprequest @doc: onquerynictdepopuprequest
@type: @type:
event event
@title: @title:

@ -44,7 +44,7 @@
#ifdef COMPILE_TDE_SUPPORT #ifdef COMPILE_TDE_SUPPORT
#include <twin.h> #include <twin.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#else #else
#include <tqlabel.h> #include <tqlabel.h>
#endif #endif

Loading…
Cancel
Save