From 78e91f74862208e695afff14cdae3731e24d6a7f Mon Sep 17 00:00:00 2001 From: Elvio Basello Date: Thu, 3 Apr 2008 17:08:45 +0000 Subject: more code clean git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1381 17fca916-40b9-46aa-a4ea-0a15b648b75c --- .../filetransferwindow/filetransferwindow.cpp | 50 ++++++++-------------- 1 file changed, 18 insertions(+), 32 deletions(-) (limited to 'src/modules/filetransferwindow/filetransferwindow.cpp') diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp index 5a768da47..e69405877 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -35,23 +35,22 @@ #include "kvi_themedlabel.h" #include "kvi_input.h" #include "kvi_qstring.h" - -#include -#include #include "kvi_tal_hbox.h" -#ifdef COMPILE_USE_QT4 - #include -#else - #include -#endif -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// FIXME: Qt4 #include +#include #ifdef COMPILE_KDE_SUPPORT #include @@ -227,7 +226,6 @@ void KviFileTransferWindow::fontChange(const QFont &oldFont) KviWindow::fontChange(oldFont); } - void KviFileTransferWindow::tipRequest(KviDynamicToolTip * tip,const QPoint &pnt) { KviFileTransferItem * it = (KviFileTransferItem *)m_pListView->itemAt(pnt); @@ -275,8 +273,7 @@ void KviFileTransferWindow::transferUnregistering(KviFileTransfer * t) void KviFileTransferWindow::doubleClicked(KviTalListViewItem *it,const QPoint &pnt,int col) { - if(it) - openLocalFile(); + if(it) openLocalFile(); } void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const QPoint &pnt,int col) @@ -293,7 +290,6 @@ void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const QPoi int id; - if(it) { KviFileTransferItem * i = (KviFileTransferItem *)it; @@ -463,9 +459,8 @@ void KviFileTransferWindow::openLocalFileTerminal() int idx = tmp.findRev("/"); if(idx == -1)return; tmp = tmp.left(idx); - tmp.append("\""); -/*FIX ME " this is not a solution ...because if the drive isn't system's drive the command - 'cd' naturaly doesn't work"*/ + tmp.append("\""); + // FIXME: this is not a solution ...because if the drive isn't system's drive the command 'cd' naturaly doesn't work tmp.prepend("cmd.exe /k cd \""); system(tmp.local8Bit().data()); #else //COMPILE_ON_WINDOWS @@ -508,7 +503,6 @@ void KviFileTransferWindow::deleteLocalFile() __tr2qs_ctx("OK","filetransferwindow")); } - void KviFileTransferWindow::openLocalFile() { //-| Grifisx & Noldor |- @@ -579,14 +573,7 @@ void KviFileTransferWindow::copyLocalFileToClipboard() if(!t)return; QString tmp = t->localFileName(); if(tmp.isEmpty())return; -#ifdef COMPILE_USE_QT4 - QApplication::clipboard()->setText(tmp); -#else - QApplication::clipboard()->setSelectionMode(false); QApplication::clipboard()->setText(tmp); - QApplication::clipboard()->setSelectionMode(true); - QApplication::clipboard()->setText(tmp); -#endif } void KviFileTransferWindow::openLocalFileFolder() @@ -626,7 +613,6 @@ void KviFileTransferWindow::openLocalFileFolder() #endif //!COMPILE_ON_WINDOWS } - void KviFileTransferWindow::heartbeat() { if(m_pListView->childCount() < 1)return; -- cgit v1.3.1-10-gc9f91