From 075bdcd93cf7882bad4cb027adf159f93674d6e5 Mon Sep 17 00:00:00 2001 From: Szymon Tomasz Stefanek Date: Mon, 27 Dec 2010 05:02:48 +0000 Subject: More renaming and cleanup git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5237 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/dcc/broker.cpp | 16 ++++++++-------- src/modules/dcc/broker.h | 2 +- src/modules/dcc/canvas.cpp | 18 +++++++++--------- src/modules/dcc/canvas.h | 4 ++-- src/modules/dcc/chat.cpp | 30 +++++++++++++++--------------- src/modules/dcc/chat.h | 6 +++--- src/modules/dcc/descriptor.cpp | 6 +++--- src/modules/dcc/descriptor.h | 2 +- src/modules/dcc/dialogs.cpp | 4 ++-- src/modules/dcc/dialogs.h | 2 +- src/modules/dcc/libkvidcc.cpp | 18 +++++++++--------- src/modules/dcc/marshal.cpp | 2 +- src/modules/dcc/marshal.h | 2 +- src/modules/dcc/requests.cpp | 18 +++++++++--------- src/modules/dcc/send.cpp | 26 +++++++++++++------------- src/modules/dcc/send.h | 4 ++-- src/modules/dcc/thread.cpp | 4 ++-- src/modules/dcc/utils.cpp | 6 +++--- src/modules/dcc/utils.h | 4 ++-- src/modules/dcc/video.cpp | 22 +++++++++++----------- src/modules/dcc/video.h | 6 +++--- src/modules/dcc/voice.cpp | 12 ++++++------ src/modules/dcc/voice.h | 4 ++-- src/modules/dcc/window.cpp | 2 +- src/modules/dcc/window.h | 4 ++-- 25 files changed, 112 insertions(+), 112 deletions(-) (limited to 'src/modules/dcc') diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp index d0934cc0f..5474729f0 100644 --- a/src/modules/dcc/broker.cpp +++ b/src/modules/dcc/broker.cpp @@ -38,21 +38,21 @@ #include "canvas.h" #endif -#include "kvi_app.h" -#include "kvi_frame.h" +#include "KviApplication.h" +#include "KviMainWindow.h" #include "KviLocale.h" -#include "kvi_options.h" -#include "kvi_console.h" +#include "KviOptions.h" +#include "KviConsoleWindow.h" #include "KviFileUtils.h" #include "kvi_out.h" #include "KviMediaType.h" -#include "kvi_ircconnection.h" +#include "KviIrcConnection.h" #include "KviSharedFilesManager.h" #include #include -// kvi_app.cpp +// KviApplication.cpp extern KVIRC_API KviMediaManager * g_pMediaManager; extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager; @@ -655,7 +655,7 @@ void KviDccBroker::chooseSaveFileName(KviDccBox *box,KviDccDescriptor *dcc) dcc->szLocalFileName = ""; - if(dcc->bIsIncomingAvatar)g_pApp->getLocalKvircDirectory(dcc->szLocalFileName,KviApp::Avatars); + if(dcc->bIsIncomingAvatar)g_pApp->getLocalKvircDirectory(dcc->szLocalFileName,KviApplication::Avatars); else { if(KVI_OPTION_BOOL(KviOption_boolUseIncomingDccMediaTypeSavePath)) @@ -685,7 +685,7 @@ void KviDccBroker::chooseSaveFileName(KviDccBox *box,KviDccDescriptor *dcc) if(dcc->szLocalFileName.isEmpty()) { - g_pApp->getLocalKvircDirectory(dcc->szLocalFileName,KviApp::Incoming); + g_pApp->getLocalKvircDirectory(dcc->szLocalFileName,KviApplication::Incoming); if(KVI_OPTION_BOOL(KviOption_boolSortReceivedByDccFilesByNicks)) { KviQString::ensureLastCharIs(dcc->szLocalFileName,KVI_PATH_SEPARATOR_CHAR); diff --git a/src/modules/dcc/broker.h b/src/modules/dcc/broker.h index 8bd2535ff..a7d958aea 100644 --- a/src/modules/dcc/broker.h +++ b/src/modules/dcc/broker.h @@ -29,7 +29,7 @@ #include "kvi_settings.h" #include "KviCString.h" #include "KviPointerList.h" -#include "kvi_sparser.h" +#include "KviIrcServerParser.h" #include "KviPointerHashTable.h" #include diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp index c7524883d..2634fde05 100644 --- a/src/modules/dcc/canvas.cpp +++ b/src/modules/dcc/canvas.cpp @@ -34,29 +34,29 @@ #define _KVI_DEBUG_CHECK_RANGE_ #include "kvi_debug.h" - #include "kvi_options.h" - #include "kvi_input.h" - #include "kvi_ircview.h" - #include "kvi_iconmanager.h" + #include "KviOptions.h" + #include "KviInput.h" + #include "KviIrcView.h" + #include "KviIconManager.h" #include "KviLocale.h" #include "KviError.h" #include "kvi_out.h" #include "KviNetUtils.h" - #include "kvi_console.h" - #include "kvi_frame.h" + #include "KviConsoleWindow.h" + #include "KviMainWindow.h" #include "KviMemory.h" #include "KviMemory.h" #include "KviThread.h" - #include "kvi_ircsocket.h" + #include "KviIrcSocket.h" #include "kvi_settings.h" - #include "kvi_ircconnection.h" + #include "KviIrcConnection.h" #include extern KviDccBroker * g_pDccBroker; - KviDccCanvas::KviDccCanvas(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name) + KviDccCanvas::KviDccCanvas(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name) : KviDccWindow(KVI_WINDOW_TYPE_DCCCANVAS,pFrm,name,dcc) { m_pSplitter = new QSplitter(QSplitter::Vertical,this,"splitter"); diff --git a/src/modules/dcc/canvas.h b/src/modules/dcc/canvas.h index e27a7ca59..36f01e14d 100644 --- a/src/modules/dcc/canvas.h +++ b/src/modules/dcc/canvas.h @@ -31,7 +31,7 @@ #include "window.h" #include "thread.h" - #include "kvi_window.h" + #include "KviWindow.h" #include "KviCString.h" #include "KviPointerList.h" @@ -43,7 +43,7 @@ { Q_OBJECT public: - KviDccCanvas(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name); + KviDccCanvas(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name); ~KviDccCanvas(); protected: // KviDccCanvasThread * m_pSlaveThread; diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index 5e8f6bcf1..3a47d9075 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -32,27 +32,27 @@ #endif #include "kvi_debug.h" -#include "kvi_options.h" -#include "kvi_input.h" -#include "kvi_ircview.h" -#include "kvi_iconmanager.h" +#include "KviOptions.h" +#include "KviInput.h" +#include "KviIrcView.h" +#include "KviIconManager.h" #include "KviLocale.h" #include "KviError.h" #include "kvi_out.h" #include "KviNetUtils.h" -#include "kvi_console.h" -#include "kvi_frame.h" +#include "KviConsoleWindow.h" +#include "KviMainWindow.h" #include "KviMemory.h" #include "KviMemory.h" #include "KviThread.h" -#include "kvi_ircsocket.h" +#include "KviIrcSocket.h" #include "kvi_settings.h" #include "kvi_socket.h" -#include "kvi_app.h" +#include "KviApplication.h" #include "KviParameterList.h" -#include "kvi_ircconnection.h" -#include "kvi_ircconnectionuserinfo.h" -#include "kvi_kvs_eventtriggers.h" +#include "KviIrcConnection.h" +#include "KviIrcConnectionUserInfo.h" +#include "KviKvsEventTriggers.h" #include "KviMircCntrl.h" #include "KviTalVBox.h" @@ -63,11 +63,11 @@ #ifdef COMPILE_CRYPT_SUPPORT #include "KviCryptEngine.h" - #include "kvi_cryptcontroller.h" + #include "KviCryptController.h" #endif #ifdef COMPILE_SSL_SUPPORT - #include "kvi_sslmaster.h" + #include "KviSSLMaster.h" #endif extern KviDccBroker * g_pDccBroker; @@ -82,7 +82,7 @@ extern KviDccBroker * g_pDccBroker; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -KviDccChat::KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name) +KviDccChat::KviDccChat(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name) : KviDccWindow(KVI_WINDOW_TYPE_DCCCHAT,pFrm,name,dcc) { m_pButtonBox = new KviTalHBox(this); @@ -441,7 +441,7 @@ bool KviDccChat::event(QEvent *e) szMsg += m_pDescriptor->szNick; szMsg += " "; szMsg += Qt::escape(QString(d.ptr())); - //qDebug("kvi_sp_ctcp.cpp:975 debug: %s",szMsg.data()); + //qDebug("KviIrcServerParser_ctcp.cpp:975 debug: %s",szMsg.data()); g_pApp->notifierMessage(this,KVI_OPTION_MSGTYPE(KVI_OUT_ACTION).pixId(),szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime)); } } diff --git a/src/modules/dcc/chat.h b/src/modules/dcc/chat.h index cd7745782..5509b4934 100644 --- a/src/modules/dcc/chat.h +++ b/src/modules/dcc/chat.h @@ -30,9 +30,9 @@ #include "KviDataBuffer.h" #include "KviPointerList.h" -#include "kvi_themedlabel.h" +#include "KviThemedLabel.h" #include "KviCString.h" -#include "kvi_window.h" +#include "KviWindow.h" #ifdef COMPILE_SSL_SUPPORT class KviSSL; @@ -68,7 +68,7 @@ class KviDccChat : public KviDccWindow { Q_OBJECT public: - KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name); + KviDccChat(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name); ~KviDccChat(); QFrame * buttonContainer() { return (QFrame*)m_pButtonContainer; }; protected: diff --git a/src/modules/dcc/descriptor.cpp b/src/modules/dcc/descriptor.cpp index e3d841c37..a669d1f30 100644 --- a/src/modules/dcc/descriptor.cpp +++ b/src/modules/dcc/descriptor.cpp @@ -27,9 +27,9 @@ #include "window.h" #include "KviLocale.h" -#include "kvi_kvs_eventtriggers.h" -#include "kvi_window.h" -#include "kvi_app.h" +#include "KviKvsEventTriggers.h" +#include "KviWindow.h" +#include "KviApplication.h" static unsigned int g_uNextDescriptorId = 1; // we use 0 as an invalid descriptor id static KviPointerHashTable * g_pDescriptorDict = 0; diff --git a/src/modules/dcc/descriptor.h b/src/modules/dcc/descriptor.h index 944e063af..e150f80d7 100644 --- a/src/modules/dcc/descriptor.h +++ b/src/modules/dcc/descriptor.h @@ -25,7 +25,7 @@ //============================================================================= #include "KviCString.h" -#include "kvi_console.h" +#include "KviConsoleWindow.h" #include "KviPointerHashTable.h" class KviDccWindow; diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp index da3715274..73f9cfe85 100644 --- a/src/modules/dcc/dialogs.cpp +++ b/src/modules/dcc/dialogs.cpp @@ -25,8 +25,8 @@ #include "dialogs.h" #include "KviLocale.h" -#include "kvi_iconmanager.h" -#include "kvi_app.h" +#include "KviIconManager.h" +#include "KviApplication.h" #include #include diff --git a/src/modules/dcc/dialogs.h b/src/modules/dcc/dialogs.h index 6b2115787..1b12ffe9f 100644 --- a/src/modules/dcc/dialogs.h +++ b/src/modules/dcc/dialogs.h @@ -26,7 +26,7 @@ #include "broker.h" -#include "kvi_filedialog.h" +#include "KviFileDialog.h" #include diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp index a2437ba2d..87118cfb7 100644 --- a/src/modules/dcc/libkvidcc.cpp +++ b/src/modules/dcc/libkvidcc.cpp @@ -33,21 +33,21 @@ #include "kvi_debug.h" #include "kvi_settings.h" #include "KviCString.h" -#include "kvi_module.h" -#include "kvi_sparser.h" +#include "KviModule.h" +#include "KviIrcServerParser.h" #include "KviLocale.h" #include "kvi_out.h" -#include "kvi_console.h" +#include "KviConsoleWindow.h" #include "KviNetUtils.h" -#include "kvi_frame.h" -#include "kvi_console.h" +#include "KviMainWindow.h" +#include "KviConsoleWindow.h" #include "KviError.h" -#include "kvi_options.h" +#include "KviOptions.h" #include "kvi_defaults.h" #include "KviMircCntrl.h" -#include "kvi_app.h" -#include "kvi_ircconnection.h" -#include "kvi_ircconnectionuserinfo.h" +#include "KviApplication.h" +#include "KviIrcConnection.h" +#include "KviIrcConnectionUserInfo.h" #include diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp index 0c3c28a00..3ca458e84 100644 --- a/src/modules/dcc/marshal.cpp +++ b/src/modules/dcc/marshal.cpp @@ -27,7 +27,7 @@ #include "kvi_settings.h" #include "KviNetUtils.h" #include "KviError.h" -#include "kvi_options.h" +#include "KviOptions.h" #include "KviLocale.h" #include "KviMemory.h" #include "kvi_socket.h" diff --git a/src/modules/dcc/marshal.h b/src/modules/dcc/marshal.h index 4c1259daf..383ec87f2 100644 --- a/src/modules/dcc/marshal.h +++ b/src/modules/dcc/marshal.h @@ -36,7 +36,7 @@ class KviWindow; class KviDccMarshal; #ifdef COMPILE_SSL_SUPPORT - #include "kvi_sslmaster.h" + #include "KviSSLMaster.h" #endif diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp index 60dd742f1..27b457dae 100644 --- a/src/modules/dcc/requests.cpp +++ b/src/modules/dcc/requests.cpp @@ -38,22 +38,22 @@ #include "kvi_debug.h" #include "kvi_settings.h" #include "KviCString.h" -#include "kvi_module.h" -#include "kvi_sparser.h" +#include "KviModule.h" +#include "KviIrcServerParser.h" #include "KviLocale.h" #include "kvi_out.h" -#include "kvi_console.h" +#include "KviConsoleWindow.h" #include "KviNetUtils.h" -#include "kvi_frame.h" -#include "kvi_console.h" +#include "KviMainWindow.h" +#include "KviConsoleWindow.h" #include "KviError.h" -#include "kvi_options.h" +#include "KviOptions.h" #include "kvi_defaults.h" #include "KviSharedFilesManager.h" #include "KviMircCntrl.h" -#include "kvi_app.h" -#include "kvi_ircconnection.h" -#include "kvi_ircconnectionuserinfo.h" +#include "KviApplication.h" +#include "KviIrcConnection.h" +#include "KviIrcConnectionUserInfo.h" #include diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp index 9ea1dd74e..a66ad1eab 100644 --- a/src/modules/dcc/send.cpp +++ b/src/modules/dcc/send.cpp @@ -31,28 +31,28 @@ #include "window.h" #include "kvi_debug.h" -#include "kvi_app.h" -#include "kvi_options.h" -#include "kvi_ircview.h" -#include "kvi_iconmanager.h" +#include "KviApplication.h" +#include "KviOptions.h" +#include "KviIrcView.h" +#include "KviIconManager.h" #include "KviLocale.h" #include "KviError.h" #include "kvi_out.h" #include "KviNetUtils.h" -#include "kvi_console.h" -#include "kvi_frame.h" +#include "KviConsoleWindow.h" +#include "KviMainWindow.h" #include "KviMemory.h" #include "KviMemory.h" #include "KviThread.h" -#include "kvi_ircsocket.h" +#include "KviIrcSocket.h" #include "KviMediaType.h" #include "kvi_socket.h" -#include "kvi_kvs_eventtriggers.h" +#include "KviKvsEventTriggers.h" #include "KviParameterList.h" -#include "kvi_ircconnection.h" -#include "kvi_ircconnectionuserinfo.h" -#include "kvi_sparser.h" -#include "kvi_kvs_script.h" +#include "KviIrcConnection.h" +#include "KviIrcConnectionUserInfo.h" +#include "KviIrcServerParser.h" +#include "KviKvsScript.h" #ifdef COMPILE_ON_WINDOWS // Ugly Windoze compiler... @@ -81,7 +81,7 @@ extern KviDccBroker * g_pDccBroker; -extern KVIRC_API KviMediaManager * g_pMediaManager; // kvi_app.cpp +extern KVIRC_API KviMediaManager * g_pMediaManager; // KviApplication.cpp static KviPointerList * g_pDccFileTransfers = 0; diff --git a/src/modules/dcc/send.h b/src/modules/dcc/send.h index 3c6cd2abc..2bc806210 100644 --- a/src/modules/dcc/send.h +++ b/src/modules/dcc/send.h @@ -28,11 +28,11 @@ #include "window.h" #include "thread.h" -#include "kvi_window.h" +#include "KviWindow.h" #include "KviCString.h" #include "kvi_sockettype.h" #include "KviPointerList.h" -#include "kvi_filetransfer.h" +#include "KviFileTransfer.h" #include "KviTimeUtils.h" #include "KviTalPopupMenu.h" #include "KviTalHBox.h" diff --git a/src/modules/dcc/thread.cpp b/src/modules/dcc/thread.cpp index e10113d8a..8108aac7d 100644 --- a/src/modules/dcc/thread.cpp +++ b/src/modules/dcc/thread.cpp @@ -25,7 +25,7 @@ #include "thread.h" #include "kvi_debug.h" -#include "kvi_window.h" +#include "KviWindow.h" #include "KviError.h" #include "KviMemory.h" #include "KviMemory.h" @@ -33,7 +33,7 @@ #include "kvi_socket.h" #ifdef COMPILE_SSL_SUPPORT - #include "kvi_sslmaster.h" + #include "KviSSLMaster.h" #endif KviDccThread::KviDccThread(QObject * par,kvi_socket_t fd) diff --git a/src/modules/dcc/utils.cpp b/src/modules/dcc/utils.cpp index e9c1864e4..174a004b4 100644 --- a/src/modules/dcc/utils.cpp +++ b/src/modules/dcc/utils.cpp @@ -26,11 +26,11 @@ #include "utils.h" -#include "kvi_options.h" +#include "KviOptions.h" #include "KviLocale.h" #include "KviNetUtils.h" -#include "kvi_ircsocket.h" -#include "kvi_irclink.h" +#include "KviIrcSocket.h" +#include "KviIrcLink.h" #include "KviQString.h" /* diff --git a/src/modules/dcc/utils.h b/src/modules/dcc/utils.h index 50087c538..ee939b2a5 100644 --- a/src/modules/dcc/utils.h +++ b/src/modules/dcc/utils.h @@ -26,8 +26,8 @@ #include "kvi_settings.h" #include "KviCString.h" -#include "kvi_console.h" -#include "kvi_kvs_moduleinterface.h" +#include "KviConsoleWindow.h" +#include "KviKvsModuleInterface.h" #ifndef _UTILS_CPP_ extern bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsole * pConsole,QString &szListenIp); diff --git a/src/modules/dcc/video.cpp b/src/modules/dcc/video.cpp index d5f02b2ee..234643b52 100644 --- a/src/modules/dcc/video.cpp +++ b/src/modules/dcc/video.cpp @@ -28,21 +28,21 @@ #include "marshal.h" #include "broker.h" -#include "kvi_iconmanager.h" -#include "kvi_ircview.h" -#include "kvi_kvs_eventtriggers.h" +#include "KviIconManager.h" +#include "KviIrcView.h" +#include "KviKvsEventTriggers.h" #include "KviLocale.h" #include "kvi_out.h" #include "KviError.h" #include "KviNetUtils.h" -#include "kvi_options.h" -#include "kvi_console.h" +#include "KviOptions.h" +#include "KviConsoleWindow.h" #include "KviMemory.h" #include "kvi_socket.h" -#include "kvi_ircconnection.h" +#include "KviIrcConnection.h" #include "KviTalVBox.h" #include "KviMircCntrl.h" -#include "kvi_frame.h" +#include "KviMainWindow.h" #include #include @@ -50,11 +50,11 @@ #include //for Qt::escape #ifdef COMPILE_CRYPT_SUPPORT - #include "kvi_cryptcontroller.h" + #include "KviCryptController.h" #endif #ifdef COMPILE_SSL_SUPPORT - #include "kvi_sslmaster.h" + #include "KviSSLMaster.h" #endif #include @@ -416,7 +416,7 @@ exit_dcc: m_fd = KVI_INVALID_SOCKET; } -KviDccVideo::KviDccVideo(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name) +KviDccVideo::KviDccVideo(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name) : KviDccWindow(KVI_WINDOW_TYPE_DCCVIDEO,pFrm,name,dcc) { m_pDescriptor = dcc; @@ -806,7 +806,7 @@ bool KviDccVideo::event(QEvent *e) szMsg += m_pDescriptor->szNick; szMsg += " "; szMsg += Qt::escape(QString(d.ptr())); - //qDebug("kvi_sp_ctcp.cpp:975 debug: %s",szMsg.data()); + //qDebug("KviIrcServerParser_ctcp.cpp:975 debug: %s",szMsg.data()); g_pApp->notifierMessage(this,KVI_OPTION_MSGTYPE(KVI_OUT_ACTION).pixId(),szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime)); } } diff --git a/src/modules/dcc/video.h b/src/modules/dcc/video.h index 31588ab7e..bef5376e9 100644 --- a/src/modules/dcc/video.h +++ b/src/modules/dcc/video.h @@ -29,11 +29,11 @@ #include "thread.h" #include "window.h" -#include "kvi_window.h" +#include "KviWindow.h" #include "KviDataBuffer.h" #include "kvi_sockettype.h" #include "KviTalHBox.h" -#include "kvi_themedlabel.h" +#include "KviThemedLabel.h" #include #include @@ -108,7 +108,7 @@ class KviDccVideo : public KviDccWindow Q_OBJECT friend class KviDccVideoThread; public: - KviDccVideo(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name); + KviDccVideo(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name); ~KviDccVideo(); protected: KviThemedLabel * m_pLabel; diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp index 315ae0f05..549125be3 100644 --- a/src/modules/dcc/voice.cpp +++ b/src/modules/dcc/voice.cpp @@ -29,17 +29,17 @@ #include "gsmcodec.h" #include "kvi_settings.h" -#include "kvi_iconmanager.h" -#include "kvi_ircview.h" +#include "KviIconManager.h" +#include "KviIrcView.h" #include "KviLocale.h" #include "kvi_out.h" #include "KviError.h" #include "KviNetUtils.h" -#include "kvi_options.h" -#include "kvi_console.h" +#include "KviOptions.h" +#include "KviConsoleWindow.h" #include "KviMemory.h" #include "kvi_socket.h" -#include "kvi_ircconnection.h" +#include "KviIrcConnection.h" #include "KviTalVBox.h" #include @@ -638,7 +638,7 @@ exit_dcc: } -KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name) +KviDccVoice::KviDccVoice(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name) : KviDccWindow(KVI_WINDOW_TYPE_DCCVOICE,pFrm,name,dcc) { m_pDescriptor = dcc; diff --git a/src/modules/dcc/voice.h b/src/modules/dcc/voice.h index 11e5cb31a..28b606c08 100644 --- a/src/modules/dcc/voice.h +++ b/src/modules/dcc/voice.h @@ -29,7 +29,7 @@ #include "thread.h" #include "window.h" -#include "kvi_window.h" +#include "KviWindow.h" #include "KviDataBuffer.h" #include "kvi_sockettype.h" #include "KviTalHBox.h" @@ -106,7 +106,7 @@ class KviDccVoice : public KviDccWindow { Q_OBJECT public: - KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name); + KviDccVoice(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name); ~KviDccVoice(); protected: KviTalHBox * m_pHBox; diff --git a/src/modules/dcc/window.cpp b/src/modules/dcc/window.cpp index 9b86b483c..180c20e83 100644 --- a/src/modules/dcc/window.cpp +++ b/src/modules/dcc/window.cpp @@ -26,7 +26,7 @@ #include "KviTalHBox.h" -KviDccWindow::KviDccWindow(int type,KviFrame * lpFrm,const char * name,KviDccDescriptor * d) +KviDccWindow::KviDccWindow(int type,KviMainWindow * lpFrm,const char * name,KviDccDescriptor * d) : KviWindow(type,lpFrm,name, d->console()) { m_pDescriptor = d; diff --git a/src/modules/dcc/window.h b/src/modules/dcc/window.h index bdcc8c088..5fd13506f 100644 --- a/src/modules/dcc/window.h +++ b/src/modules/dcc/window.h @@ -27,14 +27,14 @@ #include "descriptor.h" #include "marshal.h" -#include "kvi_window.h" +#include "KviWindow.h" class KviDccThread; class KviDccWindow : public KviWindow, public KviDccMarshalOutputContext { Q_OBJECT public: - KviDccWindow(int type,KviFrame * lpFrm,const char * name,KviDccDescriptor * d); + KviDccWindow(int type,KviMainWindow * lpFrm,const char * name,KviDccDescriptor * d); ~KviDccWindow(); protected: KviDccDescriptor * m_pDescriptor; -- cgit v1.3.1-10-gc9f91