diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 23:15:20 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 23:15:20 -0600 |
commit | 432e997b127e9f43d0db24426c49e298a5eb2d96 (patch) | |
tree | 1aa61ea9537dcd363e8df1020ff47200cca9cf3c | |
parent | b4b5c616e661abc722f61f9897df8b4da6ec06bd (diff) | |
download | kvirc-432e997b127e9f43d0db24426c49e298a5eb2d96.tar.gz kvirc-432e997b127e9f43d0db24426c49e298a5eb2d96.zip |
Rename many classes and header files to avoid conflicts with KDE4
-rw-r--r-- | src/kvilib/tal/kvi_tal_mainwindow_kde.h | 2 | ||||
-rw-r--r-- | src/kvilib/tal/kvi_tal_toolbar_kde.h | 2 | ||||
-rw-r--r-- | src/kvirc/kernel/kvi_coreactions.cpp | 2 | ||||
-rw-r--r-- | src/kvirc/kvs/kvi_kvs_eventtable.cpp | 20 | ||||
-rw-r--r-- | src/modules/dockwidget/libkvidockwidget_qt3.cpp | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/src/kvilib/tal/kvi_tal_mainwindow_kde.h b/src/kvilib/tal/kvi_tal_mainwindow_kde.h index 32250c31..9cf7928b 100644 --- a/src/kvilib/tal/kvi_tal_mainwindow_kde.h +++ b/src/kvilib/tal/kvi_tal_mainwindow_kde.h @@ -23,7 +23,7 @@ // Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // -#include <kmainwindow.h> +#include <tdemainwindow.h> class KVILIB_API KviTalMainWindow : public TDEMainWindow { diff --git a/src/kvilib/tal/kvi_tal_toolbar_kde.h b/src/kvilib/tal/kvi_tal_toolbar_kde.h index 6310edb9..d6e22710 100644 --- a/src/kvilib/tal/kvi_tal_toolbar_kde.h +++ b/src/kvilib/tal/kvi_tal_toolbar_kde.h @@ -22,7 +22,7 @@ // Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // -#include <ktoolbar.h> +#include <tdetoolbar.h> #include "kvi_tal_toolbardocktype.h" diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp index 8a664309..1c64dc9a 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 4b8c8c98..17f0d8c6 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: diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp index fee1cf23..97ea5744 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp @@ -44,7 +44,7 @@ #ifdef COMPILE_TDE_SUPPORT #include <twin.h> - #include <kpopupmenu.h> + #include <tdepopupmenu.h> #else #include <tqlabel.h> #endif |