diff options
Diffstat (limited to 'src/modules/filetransferwindow')
| -rw-r--r-- | src/modules/filetransferwindow/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/modules/filetransferwindow/FileTransferWindow.cpp (renamed from src/modules/filetransferwindow/filetransferwindow.cpp) | 146 | ||||
| -rw-r--r-- | src/modules/filetransferwindow/FileTransferWindow.h (renamed from src/modules/filetransferwindow/filetransferwindow.h) | 46 | ||||
| -rw-r--r-- | src/modules/filetransferwindow/libkvifiletransferwindow.cpp | 6 |
4 files changed, 101 insertions, 101 deletions
diff --git a/src/modules/filetransferwindow/CMakeLists.txt b/src/modules/filetransferwindow/CMakeLists.txt index 1a1da2d39..bc408b8dc 100644 --- a/src/modules/filetransferwindow/CMakeLists.txt +++ b/src/modules/filetransferwindow/CMakeLists.txt @@ -3,12 +3,12 @@ SUBDIRS(caps) SET(kvifiletransferwindow_MOC_HDRS - filetransferwindow.h + FileTransferWindow.h ) SET(kvifiletransferwindow_SRCS libkvifiletransferwindow.cpp - filetransferwindow.cpp + FileTransferWindow.cpp ) # After this call, files will be moc'ed to moc_kvi_*.cpp diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp index 1ef3b0bad..a4bd25cce 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/FileTransferWindow.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : filetransferwindow.cpp +// File : FileTransferWindow.cpp // Creation date : Mon Apr 21 2003 23:14:12 CEST by Szymon Stefanek // // This file is part of the KVIrc irc client distribution @@ -22,7 +22,7 @@ // //============================================================================= -#include "filetransferwindow.h" +#include "FileTransferWindow.h" #include "kvi_debug.h" #include "KviIconManager.h" @@ -66,10 +66,10 @@ #define FILETRANSFERW_CELLSIZE 70 -extern KviFileTransferWindow * g_pFileTransferWindow; +extern FileTransferWindow * g_pFileTransferWindow; -KviFileTransferItem::KviFileTransferItem(KviFileTransferWidget * v,KviFileTransfer * t) +FileTransferItem::FileTransferItem(FileTransferWidget * v,KviFileTransfer * t) : KviTalTableWidgetItemEx(v) { m_pTransfer = t; @@ -82,14 +82,14 @@ KviFileTransferItem::KviFileTransferItem(KviFileTransferWidget * v,KviFileTransf tableWidget()->setRowHeight( row(), FILETRANSFERW_CELLSIZE ); } -KviFileTransferItem::~KviFileTransferItem() +FileTransferItem::~FileTransferItem() { m_pTransfer->setDisplayItem(0); delete col1Item; delete col2Item; } -void KviFileTransferItem::displayUpdate() +void FileTransferItem::displayUpdate() { //FIXME this hurts int dummy = (int) time(NULL); @@ -98,7 +98,7 @@ void KviFileTransferItem::displayUpdate() tableWidget()->model()->setData(tableWidget()->model()->index(row(),2), dummy, Qt::DisplayRole); } -QString KviFileTransferItem::key(int,bool) const +QString FileTransferItem::key(int,bool) const { QString ret; ret.setNum(m_pTransfer->id()); @@ -114,7 +114,7 @@ QString KviFileTransferItem::key(int,bool) const -KviFileTransferWidget::KviFileTransferWidget(QWidget * pParent) +FileTransferWidget::FileTransferWidget(QWidget * pParent) : KviTalTableWidget(pParent) { //hide the header @@ -147,7 +147,7 @@ KviFileTransferWidget::KviFileTransferWidget(QWidget * pParent) viewport()->setFocusPolicy(Qt::NoFocus); } -void KviFileTransferWidget::mousePressEvent (QMouseEvent *e) +void FileTransferWidget::mousePressEvent (QMouseEvent *e) { if (e->button() == Qt::RightButton) { @@ -156,27 +156,27 @@ void KviFileTransferWidget::mousePressEvent (QMouseEvent *e) QTableWidgetItem *clicked = itemAt(e->pos()); if(clicked) { - KviFileTransferItem *i = (KviFileTransferItem*) item(clicked->row(),0); + FileTransferItem *i = (FileTransferItem*) item(clicked->row(),0); if (i) emit rightButtonPressed(i, QCursor::pos()); } } QTableWidget::mousePressEvent(e); } -void KviFileTransferWidget::mouseDoubleClickEvent (QMouseEvent *e) +void FileTransferWidget::mouseDoubleClickEvent (QMouseEvent *e) { // we have 3 items: the one on the first column is the real one (has a transfer() member) // others are just fakes QTableWidgetItem *clicked = itemAt(e->pos()); if(clicked) { - KviFileTransferItem *i = (KviFileTransferItem*) item(clicked->row(),0); + FileTransferItem *i = (FileTransferItem*) item(clicked->row(),0); if (i) emit doubleClicked(i,QCursor::pos()); } QTableWidget::mouseDoubleClickEvent(e); } -void KviFileTransferWidget::paintEvent(QPaintEvent * event) +void FileTransferWidget::paintEvent(QPaintEvent * event) { QPainter *p = new QPainter(viewport()); QStyleOptionViewItem option = viewOptions(); @@ -208,14 +208,14 @@ void KviFileTransferWidget::paintEvent(QPaintEvent * event) KviTalTableWidget::paintEvent(event); } -void KviFileTransferItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index) const +void FileTransferItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index) const { //FIXME not exactly model/view coding style.. but we need to access data on the item by now - KviFileTransferWidget* tableWidget = (KviFileTransferWidget*)parent(); - KviFileTransferItem* item = (KviFileTransferItem*) tableWidget->itemFromIndex(index); + FileTransferWidget* tableWidget = (FileTransferWidget*)parent(); + FileTransferItem* item = (FileTransferItem*) tableWidget->itemFromIndex(index); if(!item) return; - KviFileTransfer* transfer = ((KviFileTransferItem*)tableWidget->item(item->row(), 0))->transfer(); + KviFileTransfer* transfer = ((FileTransferItem*)tableWidget->item(item->row(), 0))->transfer(); p->setFont(option.font); @@ -231,13 +231,13 @@ void KviFileTransferItemDelegate::paint(QPainter * p, const QStyleOptionViewItem transfer->displayPaint(p, index.column(), option.rect); } -QSize KviFileTransferItemDelegate::sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const +QSize FileTransferItemDelegate::sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const { // FIXME fixed width - return QSize(((KviFileTransferWidget*)parent())->viewport()->size().width(), 68); + return QSize(((FileTransferWidget*)parent())->viewport()->size().width(), 68); } -KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm) +FileTransferWindow::FileTransferWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm) : KviWindow(KVI_WINDOW_TYPE_TOOL,lpFrm,"file transfer window",0), KviModuleExtension(d) { g_pFileTransferWindow = this; @@ -258,10 +258,10 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv m_pVertSplitter->setObjectName("transferwindow_vsplitter"); m_pVertSplitter->setChildrenCollapsible(false); - m_pTableWidget = new KviFileTransferWidget(m_pVertSplitter); + m_pTableWidget = new FileTransferWidget(m_pVertSplitter); //ad-hoc itemdelegate for this view - m_pItemDelegate = new KviFileTransferItemDelegate(m_pTableWidget); + m_pItemDelegate = new FileTransferItemDelegate(m_pTableWidget); m_pTableWidget->setItemDelegate(m_pItemDelegate); /* @@ -277,9 +277,9 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv m_pTableWidget->installEventFilter(this); - connect(m_pTableWidget,SIGNAL(rightButtonPressed(KviFileTransferItem *,QPoint)), - this,SLOT(rightButtonPressed(KviFileTransferItem *,QPoint))); - connect(m_pTableWidget,SIGNAL(doubleClicked(KviFileTransferItem *,const QPoint &)),this,SLOT(doubleClicked(KviFileTransferItem *,const QPoint &))); + connect(m_pTableWidget,SIGNAL(rightButtonPressed(FileTransferItem *,QPoint)), + this,SLOT(rightButtonPressed(FileTransferItem *,QPoint))); + connect(m_pTableWidget,SIGNAL(doubleClicked(FileTransferItem *,const QPoint &)),this,SLOT(doubleClicked(FileTransferItem *,const QPoint &))); fillTransferView(); connect(KviFileTransferManager::instance(),SIGNAL(transferRegistered(KviFileTransfer *)),this,SLOT(transferRegistered(KviFileTransfer *))); @@ -290,17 +290,17 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv m_pTimer->start(2000); } -KviFileTransferWindow::~KviFileTransferWindow() +FileTransferWindow::~FileTransferWindow() { KviFileTransferManager::instance()->setTransferWindow(0); g_pFileTransferWindow = 0; } -bool KviFileTransferWindow::eventFilter( QObject *obj, QEvent *ev ) +bool FileTransferWindow::eventFilter( QObject *obj, QEvent *ev ) { if( ( ev->type() == QEvent::KeyPress ) ) { - //m_pTableWidget could not have been initialized yet when KviFileTransferWindow + //m_pTableWidget could not have been initialized yet when FileTransferWindow //will receive the first events.. but it will surely be on a keypress event if(obj==m_pTableWidget) { @@ -320,41 +320,41 @@ bool KviFileTransferWindow::eventFilter( QObject *obj, QEvent *ev ) return KviWindow::eventFilter( obj, ev ); } -void KviFileTransferWindow::fontChange(const QFont &oldFont) +void FileTransferWindow::fontChange(const QFont &oldFont) { QFontMetrics fm(font()); m_iLineSpacing = fm.lineSpacing(); KviWindow::fontChange(oldFont); } -void KviFileTransferWindow::tipRequest(KviDynamicToolTip * tip,const QPoint &pnt) +void FileTransferWindow::tipRequest(KviDynamicToolTip * tip,const QPoint &pnt) { - KviFileTransferItem * it = (KviFileTransferItem *)m_pTableWidget->itemAt(pnt); + FileTransferItem * it = (FileTransferItem *)m_pTableWidget->itemAt(pnt); if(!it)return; QString txt = it->transfer()->tipText(); tip->tip(m_pTableWidget->visualItemRect(it),txt); } -void KviFileTransferWindow::fillTransferView() +void FileTransferWindow::fillTransferView() { KviPointerList<KviFileTransfer> * l = KviFileTransferManager::instance()->transferList(); if(!l)return; - KviFileTransferItem * it; + FileTransferItem * it; for(KviFileTransfer * t = l->first();t;t = l->next()) { - it = new KviFileTransferItem(m_pTableWidget,t); + it = new FileTransferItem(m_pTableWidget,t); t->setDisplayItem(it); } } -KviFileTransferItem * KviFileTransferWindow::findItem(KviFileTransfer * t) +FileTransferItem * FileTransferWindow::findItem(KviFileTransfer * t) { int i; - KviFileTransferItem * it; + FileTransferItem * it; for(i=0;i<m_pTableWidget->rowCount();i++) { - it = (KviFileTransferItem *)m_pTableWidget->item(i,0); + it = (FileTransferItem *)m_pTableWidget->item(i,0); if(!it) continue; if(it->transfer() == t) @@ -363,15 +363,15 @@ KviFileTransferItem * KviFileTransferWindow::findItem(KviFileTransfer * t) return 0; } -void KviFileTransferWindow::transferRegistered(KviFileTransfer * t) +void FileTransferWindow::transferRegistered(KviFileTransfer * t) { - new KviFileTransferItem(m_pTableWidget,t); + new FileTransferItem(m_pTableWidget,t); //t->setDisplayItem(it); } -void KviFileTransferWindow::transferUnregistering(KviFileTransfer * t) +void FileTransferWindow::transferUnregistering(KviFileTransfer * t) { - KviFileTransferItem * it = findItem(t); + FileTransferItem * it = findItem(t); //t->setDisplayItem(0); if(it) { @@ -380,12 +380,12 @@ void KviFileTransferWindow::transferUnregistering(KviFileTransfer * t) } } -void KviFileTransferWindow::doubleClicked(KviFileTransferItem *it,const QPoint &) +void FileTransferWindow::doubleClicked(FileTransferItem *it,const QPoint &) { if(it) openLocalFile(); } -void KviFileTransferWindow::rightButtonPressed(KviFileTransferItem *it,const QPoint &pnt) +void FileTransferWindow::rightButtonPressed(FileTransferItem *it,const QPoint &pnt) { if(!m_pContextPopup)m_pContextPopup = new KviTalPopupMenu(this); if(!m_pLocalFilePopup)m_pLocalFilePopup = new KviTalPopupMenu(this); @@ -401,7 +401,7 @@ void KviFileTransferWindow::rightButtonPressed(KviFileTransferItem *it,const QPo if(it) { - KviFileTransferItem * i = (KviFileTransferItem *)it; + FileTransferItem * i = (FileTransferItem *)it; if(i->transfer()) { @@ -498,11 +498,11 @@ void KviFileTransferWindow::rightButtonPressed(KviFileTransferItem *it,const QPo bool bHaveTerminated = false; int i; - KviFileTransferItem * item; + FileTransferItem * item; for(i=0;i<m_pTableWidget->rowCount();i++) { - item = (KviFileTransferItem *)m_pTableWidget->item(i,0); + item = (FileTransferItem *)m_pTableWidget->item(i,0); if(!item) continue; @@ -527,16 +527,16 @@ void KviFileTransferWindow::rightButtonPressed(KviFileTransferItem *it,const QPo } -KviFileTransfer * KviFileTransferWindow::selectedTransfer() +KviFileTransfer * FileTransferWindow::selectedTransfer() { if(m_pTableWidget->selectedItems().count() == 0) return 0; - KviFileTransferItem * it = (KviFileTransferItem *)m_pTableWidget->selectedItems().first(); + FileTransferItem * it = (FileTransferItem *)m_pTableWidget->selectedItems().first(); if(!it)return 0; - KviFileTransferItem * i = (KviFileTransferItem *)it; + FileTransferItem * i = (FileTransferItem *)it; return i->transfer(); } -void KviFileTransferWindow::openFilePopupActivated(int id) +void FileTransferWindow::openFilePopupActivated(int id) { #ifdef COMPILE_KDE_SUPPORT int ip = m_pOpenFilePopup->itemParameter(id); @@ -569,7 +569,7 @@ void KviFileTransferWindow::openFilePopupActivated(int id) #endif //COMPILE_KDE_SUPPORT } -void KviFileTransferWindow::openLocalFileTerminal() +void FileTransferWindow::openLocalFileTerminal() { //-| Grifisx & Noldor |- #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) @@ -604,7 +604,7 @@ void KviFileTransferWindow::openLocalFileTerminal() #endif } -void KviFileTransferWindow::deleteLocalFile() +void FileTransferWindow::deleteLocalFile() { KviFileTransfer * t = selectedTransfer(); if(!t)return; @@ -624,7 +624,7 @@ void KviFileTransferWindow::deleteLocalFile() __tr2qs_ctx("OK","filetransferwindow")); } -void KviFileTransferWindow::openLocalFile() +void FileTransferWindow::openLocalFile() { //-| Grifisx & Noldor |- #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) @@ -661,7 +661,7 @@ void KviFileTransferWindow::openLocalFile() #endif } -void KviFileTransferWindow::openLocalFileWith() +void FileTransferWindow::openLocalFileWith() { //-| Grifisx & Noldor |- #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) @@ -689,7 +689,7 @@ void KviFileTransferWindow::openLocalFileWith() #endif } -void KviFileTransferWindow::copyLocalFileToClipboard() +void FileTransferWindow::copyLocalFileToClipboard() { KviFileTransfer * t = selectedTransfer(); if(!t)return; @@ -698,7 +698,7 @@ void KviFileTransferWindow::copyLocalFileToClipboard() QApplication::clipboard()->setText(tmp); } -void KviFileTransferWindow::openLocalFileFolder() +void FileTransferWindow::openLocalFileFolder() { //-| Grifisx & Noldor|- #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) @@ -735,16 +735,16 @@ void KviFileTransferWindow::openLocalFileFolder() #endif } -void KviFileTransferWindow::heartbeat() +void FileTransferWindow::heartbeat() { int i; QModelIndex index; - KviFileTransferItem* it; + FileTransferItem* it; int dummy = (int) time(NULL); for(i=0;i<=m_pTableWidget->rowCount();i++) { - it = (KviFileTransferItem *)m_pTableWidget->item(i,0); + it = (FileTransferItem *)m_pTableWidget->item(i,0); if(!it) continue; @@ -758,17 +758,17 @@ void KviFileTransferWindow::heartbeat() } } -void KviFileTransferWindow::clearAll() +void FileTransferWindow::clearAll() { QString tmp; bool bHaveAllTerminated = true; int i; - KviFileTransferItem * item; + FileTransferItem * item; for(i=0;i<m_pTableWidget->rowCount();i++) { - item = (KviFileTransferItem *)m_pTableWidget->item(i,0); + item = (FileTransferItem *)m_pTableWidget->item(i,0); if(!item) continue; @@ -789,37 +789,37 @@ void KviFileTransferWindow::clearAll() KviFileTransferManager::instance()->killAllTransfers(); } -void KviFileTransferWindow::clearTerminated() +void FileTransferWindow::clearTerminated() { KviFileTransferManager::instance()->killTerminatedTransfers(); } -void KviFileTransferWindow::getBaseLogFileName(QString &buffer) +void FileTransferWindow::getBaseLogFileName(QString &buffer) { buffer.sprintf("FILETRANSFER"); } -QPixmap * KviFileTransferWindow::myIconPtr() +QPixmap * FileTransferWindow::myIconPtr() { return g_pIconManager->getSmallIcon(KVI_SMALLICON_FILETRANSFER); } -void KviFileTransferWindow::resizeEvent(QResizeEvent *) +void FileTransferWindow::resizeEvent(QResizeEvent *) { m_pSplitter->setGeometry(0,0,width(),height()); } -QSize KviFileTransferWindow::sizeHint() const +QSize FileTransferWindow::sizeHint() const { return m_pSplitter->sizeHint(); } -void KviFileTransferWindow::fillCaptionBuffers() +void FileTransferWindow::fillCaptionBuffers() { m_szPlainTextCaption = __tr2qs_ctx("File Transfers","filetransferwindow"); } -void KviFileTransferWindow::die() +void FileTransferWindow::die() { close(); } @@ -828,7 +828,7 @@ void KviFileTransferWindow::die() //#warning "Load & save properties of this kind of window" -//void KviFileTransferWindow::saveProperties() +//void FileTransferWindow::saveProperties() //{ // KviWindowProperty p; // p.rect = externalGeometry(); @@ -845,7 +845,7 @@ void KviFileTransferWindow::die() // g_pOptions->m_pWinPropertiesList->setProperty(caption(),&p); //} // -//void KviFileTransferWindow::setProperties(KviWindowProperty *p) +//void FileTransferWindow::setProperties(KviWindowProperty *p) //{ // QValueList<int> l; // l.append(p->splitWidth1); @@ -855,12 +855,12 @@ void KviFileTransferWindow::die() // m_pIrcView->setShowImages(p->imagesVisible); //} -void KviFileTransferWindow::applyOptions() +void FileTransferWindow::applyOptions() { m_pIrcView->applyOptions(); KviWindow::applyOptions(); } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_filetransferwindow.moc" +#include "m_FileTransferWindow.moc" #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/filetransferwindow/filetransferwindow.h b/src/modules/filetransferwindow/FileTransferWindow.h index a32a6c220..2fcac8689 100644 --- a/src/modules/filetransferwindow/filetransferwindow.h +++ b/src/modules/filetransferwindow/FileTransferWindow.h @@ -2,7 +2,7 @@ #define _FILETRANSFERWINDOW_H_ //============================================================================= // -// File : filetransferwindow.h +// File : FileTransferWindow.h // Creation date : Mon Apr 21 2003 23:14:12 CEST by Szymon Stefanek // // This file is part of the KVIrc irc client distribution @@ -39,31 +39,31 @@ #include <QTimer> #include <QPixmap> -class KviFileTransferItem; +class FileTransferItem; -class KviFileTransferWidget : public KviTalTableWidget +class FileTransferWidget : public KviTalTableWidget { - friend class KviFileTransferItemDelegate; + friend class FileTransferItemDelegate; Q_OBJECT Q_PROPERTY(int TransparencyCapable READ dummyRead) public: - KviFileTransferWidget(QWidget * pParent); - ~KviFileTransferWidget() {}; + FileTransferWidget(QWidget * pParent); + ~FileTransferWidget() {}; void paintEvent(QPaintEvent * event); int dummyRead() const { return 0; }; protected: void mousePressEvent (QMouseEvent *e); void mouseDoubleClickEvent (QMouseEvent *e); signals: - void rightButtonPressed(KviFileTransferItem *,QPoint pnt); - void doubleClicked(KviFileTransferItem *,QPoint pnt); + void rightButtonPressed(FileTransferItem *,QPoint pnt); + void doubleClicked(FileTransferItem *,QPoint pnt); }; -class KviFileTransferItem : public KviTalTableWidgetItemEx +class FileTransferItem : public KviTalTableWidgetItemEx { public: - KviFileTransferItem(KviFileTransferWidget * v,KviFileTransfer * t); - ~KviFileTransferItem(); + FileTransferItem(FileTransferWidget * v,KviFileTransfer * t); + ~FileTransferItem(); protected: KviFileTransfer * m_pTransfer; KviTalTableWidgetItem * col1Item; //item on the second column @@ -74,28 +74,28 @@ public: virtual void displayUpdate(); }; -class KviFileTransferItemDelegate : public KviTalIconAndRichTextItemDelegate +class FileTransferItemDelegate : public KviTalIconAndRichTextItemDelegate { Q_OBJECT public: - KviFileTransferItemDelegate(QAbstractItemView * pWidget=0) + FileTransferItemDelegate(QAbstractItemView * pWidget=0) : KviTalIconAndRichTextItemDelegate(pWidget) {}; - ~KviFileTransferItemDelegate(){}; + ~FileTransferItemDelegate(){}; QSize sizeHint(const QStyleOptionViewItem &option,const QModelIndex &index) const; void paint ( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const; }; -class KviFileTransferWindow : public KviWindow, public KviModuleExtension +class FileTransferWindow : public KviWindow, public KviModuleExtension { - friend class KviFileTransferItem; - friend class KviFileTransferItemDelegate; + friend class FileTransferItem; + friend class FileTransferItemDelegate; Q_OBJECT public: - KviFileTransferWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm); - ~KviFileTransferWindow(); + FileTransferWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm); + ~FileTransferWindow(); protected: QSplitter * m_pVertSplitter; - KviFileTransferWidget * m_pTableWidget; + FileTransferWidget * m_pTableWidget; QAbstractItemDelegate * m_pItemDelegate; KviTalPopupMenu * m_pContextPopup; KviTalPopupMenu * m_pLocalFilePopup; @@ -110,7 +110,7 @@ protected: virtual void applyOptions(); virtual void resizeEvent(QResizeEvent *e); virtual void getBaseLogFileName(QString &buffer); - KviFileTransferItem * findItem(KviFileTransfer * t); + FileTransferItem * findItem(KviFileTransfer * t); void fillTransferView(); KviFileTransfer * selectedTransfer(); virtual void fontChange(const QFont &oldFont); @@ -121,8 +121,8 @@ public: protected slots: void transferRegistered(KviFileTransfer *t); void transferUnregistering(KviFileTransfer *t); - void rightButtonPressed(KviFileTransferItem *it,const QPoint &pnt); - void doubleClicked(KviFileTransferItem *it,const QPoint &pnt); + void rightButtonPressed(FileTransferItem *it,const QPoint &pnt); + void doubleClicked(FileTransferItem *it,const QPoint &pnt); void heartbeat(); void clearTerminated(); void clearAll(); diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp index 35040e431..a6cddb5f8 100644 --- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp +++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp @@ -21,7 +21,7 @@ // //============================================================================= -#include "filetransferwindow.h" +#include "FileTransferWindow.h" #include "KviModule.h" #include "KviApplication.h" @@ -32,7 +32,7 @@ #include <QSplitter> -KviFileTransferWindow * g_pFileTransferWindow = 0; +FileTransferWindow * g_pFileTransferWindow = 0; static KviModuleExtension * filetransferwindow_extension_alloc(KviModuleExtensionAllocStruct * s) { @@ -55,7 +55,7 @@ static KviModuleExtension * filetransferwindow_extension_alloc(KviModuleExtensio } } - g_pFileTransferWindow = new KviFileTransferWindow(s->pDescriptor,g_pFrame); + g_pFileTransferWindow = new FileTransferWindow(s->pDescriptor,g_pFrame); g_pFrame->addWindow(g_pFileTransferWindow,!bCreateMinimized); if(bCreateMinimized)g_pFileTransferWindow->minimize(); return g_pFileTransferWindow; |