more code clean

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1381 17fca916-40b9-46aa-a4ea-0a15b648b75c

3 files changed, 25 insertions, 44 deletions

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 <qsplitter.h>
-#include <qtooltip.h>
 #include "kvi_tal_hbox.h"
-#ifdef COMPILE_USE_QT4
-	#include <q3header.h>
-#else
-	#include <qheader.h>
-#endif
-#include <qpainter.h>
-#include <qmessagebox.h>
-#include <qclipboard.h>
-#include <qfileinfo.h>
-#include <qfile.h>
-#include <qlabel.h>
-#include <qfontmetrics.h>
-#include <qevent.h>
+
+#include <QSplitter>
+#include <QToolTip>
+#include <QPainter>
+#include <QMessageBox>
+#include <QClipboard>
+#include <QFileInfo>
+#include <QFile>
+#include <QLabel>
+#include <QFontMetrics>
+#include <QEvent>
+#include <QKeyEvent>
+
+// FIXME: Qt4 #include <QHeaderView>
+#include <q3header.h>
 
 #ifdef COMPILE_KDE_SUPPORT
 	#include <kurl.h>
@@ -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;
diff --git a/src/modules/filetransferwindow/filetransferwindow.h b/src/modules/filetransferwindow/filetransferwindow.h
index 7c79dcf7d..76fd64273 100644
--- a/src/modules/filetransferwindow/filetransferwindow.h
+++ b/src/modules/filetransferwindow/filetransferwindow.h
@@ -32,13 +32,12 @@
 #include "kvi_moduleextension.h"
 #include "kvi_filetransfer.h"
 #include "kvi_dynamictooltip.h"
-
 #include "kvi_tal_listview.h"
 #include "kvi_tal_popupmenu.h"
-#include <qtoolbutton.h>
-#include <qtimer.h>
-#include <qpixmap.h>
 
+#include <QToolButton>
+#include <QTimer>
+#include <QPixmap>
 
 
 class KviFileTransferItem : public KviTalListViewItem
@@ -98,7 +97,6 @@ protected slots:
 	void clearTerminated();
 	void clearAll();
 	void tipRequest(KviDynamicToolTip * tip,const QPoint &pnt);
-
 	void openLocalFile();
 	void openLocalFileWith();
 	void copyLocalFileToClipboard();
diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
index 33cd2e107..898a7462b 100644
--- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
+++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
@@ -21,18 +21,16 @@
 //
 //==================================================================================
 
-#include "kvi_module.h"
-
-
 #include "filetransferwindow.h"
 
+#include "kvi_module.h"
 #include "kvi_app.h"
 #include "kvi_frame.h"
 #include "kvi_window.h"
 #include "kvi_locale.h"
 #include "kvi_iconmanager.h"
 
-#include <qsplitter.h>
+#include <QSplitter>
 
 KviFileTransferWindow * g_pFileTransferWindow = 0;
 
@@ -100,7 +98,7 @@ static KviModuleExtension * filetransferwindow_extension_alloc(KviModuleExtensio
 */
 
 static bool filetransferwindow_kvs_cmd_open(KviKvsModuleCommandCall * c)
-{ 
+{
 	KviModuleExtensionDescriptor * d = c->module()->findExtensionDescriptor("tool",KVI_FILE_TRANSFER_WINDOW_EXTENSION_NAME);
 
 	if(d)
@@ -130,7 +128,6 @@ static bool filetransferwindow_module_init(KviModule * m)
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"open",filetransferwindow_kvs_cmd_open);
 
-
 	return true;
 }
 
@@ -151,7 +148,7 @@ static bool filetransferwindow_module_can_unload(KviModule *m)
 
 KVIRC_MODULE(
 	"FileTransferWindow",
-	"1.0.0",
+	"4.0.0",
 	"Copyright (C) 2003 Szymon Stefanek (pragma at kvirc dot net)",
 	"Links window extension",
 	filetransferwindow_module_init,