From 529524db3f530e4edaf741a40a91d1a5787027ac Mon Sep 17 00:00:00 2001 From: Elvio Basello Date: Thu, 3 Apr 2008 23:29:02 +0000 Subject: added a skel for windows on Tom's patch git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1386 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/dcc/send.cpp | 45 +++++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) (limited to 'src/modules/dcc/send.cpp') diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp index 82315fe7b..8a4401c88 100644 --- a/src/modules/dcc/send.cpp +++ b/src/modules/dcc/send.cpp @@ -22,19 +22,14 @@ // //============================================================================= +#define _KVI_DEBUG_CHECK_RANGE_ + #include "send.h" #include "broker.h" #include "marshal.h" #include "broker.h" #include "window.h" -#include "kvi_styled_controls.h" - -#ifdef COMPILE_ON_WINDOWS - // Ugly Windoze compiler... - #include "dialogs.h" -#endif -#define _KVI_DEBUG_CHECK_RANGE_ #include "kvi_debug.h" #include "kvi_app.h" #include "kvi_options.h" @@ -50,7 +45,6 @@ #include "kvi_memmove.h" #include "kvi_thread.h" #include "kvi_ircsocket.h" - #include "kvi_mediatype.h" #include "kvi_socket.h" #include "kvi_kvs_eventtriggers.h" @@ -59,16 +53,22 @@ #include "kvi_ircconnectionuserinfo.h" #include "kvi_sparser.h" #include "kvi_kvs_script.h" +#include "kvi_styled_controls.h" -#include -#include -#include -#include +#ifdef COMPILE_ON_WINDOWS + // Ugly Windoze compiler... + #include "dialogs.h" +#endif + +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include +#include #define INSTANT_BANDWIDTH_CHECK_INTERVAL_IN_MSECS 3000 #define INSTANT_BANDWIDTH_CHECK_INTERVAL_IN_SECS 3 @@ -930,7 +930,6 @@ void KviDccFileTransfer::abort() displayUpdate(); } - void KviDccFileTransfer::fillContextPopup(KviTalPopupMenu * m,int column) { m->insertItem(__tr2qs_ctx("Configure Bandwidth...","dcc"),this,SLOT(configureBandwidth())); @@ -975,6 +974,7 @@ void KviDccFileTransfer::retryTDCC() QString szCommand = "dcc.send -r=$console($dcc.irccontext(" + szId + ")) -t " + szRemoteNick + " " + "\"" + szFileName + "\""; KviKvsScript::run(szCommand,g_pActiveWindow); } + void KviDccFileTransfer::retryRevDCC() { abort(); @@ -1340,7 +1340,6 @@ int KviDccFileTransfer::displayHeight(int iLineSpacing) QString KviDccFileTransfer::tipText() { - QString s; s = QString("").arg(m_szDccType.ptr()).arg(id()); @@ -1403,7 +1402,6 @@ KviDccFileTransfer * KviDccFileTransfer::nonFailedTransferWithLocalFileName(cons return 0; } - unsigned int KviDccFileTransfer::runningTransfersCount() { if(!g_pDccFileTransfers)return 0; @@ -1463,7 +1461,6 @@ void KviDccFileTransfer::addToTransferLog(const QString &s) m_szTransferLog += "
"; } - void KviDccFileTransfer::connectionInProgress() { if(m_pDescriptor->bActive) @@ -1583,9 +1580,6 @@ void KviDccFileTransfer::sslError(const char * msg) #endif } - - - bool KviDccFileTransfer::event(QEvent *e) { if(e->type() == KVI_THREAD_EVENT) @@ -1818,10 +1812,6 @@ bool KviDccFileTransfer::doResume(const char * filename,const char * port,unsign } - - - - KviDccFileTransferBandwidthDialog::KviDccFileTransferBandwidthDialog(QWidget * pParent,KviDccFileTransfer * t) : QDialog(pParent) { @@ -1893,7 +1883,6 @@ void KviDccFileTransferBandwidthDialog::closeEvent(QCloseEvent * e) } - #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_send.moc" #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES -- cgit v1.3.1-10-gc9f91
DCC %1 (ID %2)