From 03a68f3f6023c5e613bbef8f4a505e5f275ef9e2 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Mon, 31 Aug 2009 18:25:57 +0000 Subject: quite complicate fix for #517, had to workaround a qt4 bad behaviour. git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3441 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/dcc/chat.cpp | 3 +-- src/modules/dcc/voice.cpp | 3 +-- src/modules/filetransferwindow/filetransferwindow.cpp | 5 ++--- src/modules/help/helpwindow.cpp | 3 +-- src/modules/links/linkswindow.cpp | 7 +++---- src/modules/list/listwindow.cpp | 7 +++---- src/modules/logview/logviewmdiwindow.cpp | 3 +-- src/modules/sharedfileswindow/sharedfileswindow.cpp | 3 +-- src/modules/socketspy/socketspywindow.cpp | 5 +---- 9 files changed, 14 insertions(+), 25 deletions(-) (limited to 'src/modules') diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index 621d4ab34..a25a3a528 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -58,7 +58,6 @@ #include "kvi_mirccntrl.h" #include "kvi_tal_vbox.h" -#include #include #include #include @@ -101,7 +100,7 @@ KviDccChat::KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name) createCryptControllerButton(m_pButtonContainer); #endif - m_pSplitter = new QSplitter(Qt::Horizontal,this); + m_pSplitter = new KviTalSplitter(Qt::Horizontal,this); m_pSplitter->setObjectName("dcc_chat_splitter"); m_pIrcView = new KviIrcView(m_pSplitter,pFrm,this); connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked())); diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp index ac4bd6fa5..cd2ce3dac 100644 --- a/src/modules/dcc/voice.cpp +++ b/src/modules/dcc/voice.cpp @@ -43,7 +43,6 @@ #include "kvi_tal_vbox.h" #include -#include #include #include @@ -645,7 +644,7 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name m_pDescriptor = dcc; m_pSlaveThread = 0; - m_pSplitter = new QSplitter(Qt::Horizontal,this); + m_pSplitter = new KviTalSplitter(Qt::Horizontal,this); m_pSplitter->setObjectName("dcc_window_splitter"); m_pIrcView = new KviIrcView(m_pSplitter,pFrm,this); diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp index 9a98af481..753053f1a 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -38,7 +38,6 @@ #include "kvi_tal_hbox.h" #include "kvi_frame.h" -#include #include #include #include @@ -249,9 +248,9 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv m_pTimer = new QTimer(this); connect(m_pTimer,SIGNAL(timeout()),this,SLOT(heartbeat())); - m_pSplitter = new QSplitter(Qt::Horizontal,this); + m_pSplitter = new KviTalSplitter(Qt::Horizontal,this); m_pSplitter->setObjectName("transferwindow_hsplitter"); - m_pVertSplitter = new QSplitter(Qt::Vertical,m_pSplitter); + m_pVertSplitter = new KviTalSplitter(Qt::Vertical,m_pSplitter); m_pVertSplitter->setObjectName("transferwindow_vsplitter"); m_pTableWidget = new KviFileTransferWidget(m_pVertSplitter); diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp index 8074c625e..8b641d5be 100644 --- a/src/modules/help/helpwindow.cpp +++ b/src/modules/help/helpwindow.cpp @@ -35,7 +35,6 @@ #include #include -#include #include #include #include @@ -67,7 +66,7 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name) } g_pHelpWindowList->append(this); - m_pSplitter = new QSplitter(Qt::Horizontal,this); + m_pSplitter = new KviTalSplitter(Qt::Horizontal,this); m_pSplitter->setObjectName("main_splitter"); m_pHelpWidget = new KviHelpWidget(m_pSplitter,lpFrm); diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp index 923a46b2f..e6cc0336f 100644 --- a/src/modules/links/linkswindow.cpp +++ b/src/modules/links/linkswindow.cpp @@ -38,7 +38,6 @@ #include "kvi_ircconnection.h" #include "kvi_tal_hbox.h" -#include #include #include #include @@ -51,7 +50,7 @@ KviLinksWindow::KviLinksWindow(KviFrame * lpFrm,KviConsole * lpConsole) { g_pLinksWindowList->append(this); - m_pTopSplitter = new QSplitter(Qt::Horizontal,this); + m_pTopSplitter = new KviTalSplitter(Qt::Horizontal,this); m_pTopSplitter->setObjectName("top_splitter"); // The button box on the left @@ -71,10 +70,10 @@ KviLinksWindow::KviLinksWindow(KviFrame * lpFrm,KviConsole * lpConsole) connect(lpConsole->context(),SIGNAL(stateChanged()), this,SLOT(connectionStateChange())); - m_pSplitter = new QSplitter(Qt::Horizontal,this); + m_pSplitter = new KviTalSplitter(Qt::Horizontal,this); m_pSplitter->setObjectName("splitter"); - m_pVertSplitter = new QSplitter(Qt::Vertical,m_pSplitter); + m_pVertSplitter = new KviTalSplitter(Qt::Vertical,m_pSplitter); m_pVertSplitter->setObjectName("vsplitter"); m_pListView = new KviLinksListView(m_pVertSplitter); diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp index 9ce19644e..00eb0eea0 100644 --- a/src/modules/list/listwindow.cpp +++ b/src/modules/list/listwindow.cpp @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include @@ -153,11 +152,11 @@ KviListWindow::KviListWindow(KviFrame * lpFrm, KviConsole * lpConsole) m_pItemList = new KviPointerList; m_pItemList->setAutoDelete(false); - m_pSplitter = new QSplitter(Qt::Horizontal,this); + m_pSplitter = new KviTalSplitter(Qt::Horizontal,this); m_pSplitter->setObjectName("splitter"); - m_pTopSplitter = new QSplitter(Qt::Horizontal,this); + m_pTopSplitter = new KviTalSplitter(Qt::Horizontal,this); m_pTopSplitter->setObjectName("top_splitter"); - m_pVertSplitter = new QSplitter(Qt::Vertical,m_pSplitter); + m_pVertSplitter = new KviTalSplitter(Qt::Vertical,m_pSplitter); m_pVertSplitter->setObjectName("vsplitter"); KviTalHBox * pBox = new KviTalHBox(m_pTopSplitter); diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp index 36766ca1d..ec9cf82a5 100644 --- a/src/modules/logview/logviewmdiwindow.cpp +++ b/src/modules/logview/logviewmdiwindow.cpp @@ -39,7 +39,6 @@ #include #include -#include #include #include #include @@ -69,7 +68,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra g_pLogViewWindow = this; // m_pLogViewWidget = new KviLogViewWidget(this); - m_pSplitter = new QSplitter(Qt::Horizontal,this); + m_pSplitter = new KviTalSplitter(Qt::Horizontal,this); m_pSplitter->setObjectName("main_splitter"); m_pTabWidget = new QTabWidget(m_pSplitter); diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp index c1c3507bb..084caa907 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -212,7 +211,7 @@ KviSharedFilesWindow::KviSharedFilesWindow(KviModuleExtensionDescriptor * d,KviF : KviWindow(KVI_WINDOW_TYPE_TOOL,lpFrm,"shared files window",0) , KviModuleExtension(d) { g_pSharedFilesWindow = this; - m_pSplitter = new QSplitter(Qt::Horizontal,this); + m_pSplitter = new KviTalSplitter(Qt::Horizontal,this); m_pSplitter->setObjectName("sharedfiles_splitter"); KviTalVBox * vbox = new KviTalVBox(m_pSplitter); diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/socketspywindow.cpp index 4a2db776b..5bd914f6d 100644 --- a/src/modules/socketspy/socketspywindow.cpp +++ b/src/modules/socketspy/socketspywindow.cpp @@ -32,16 +32,13 @@ #include "kvi_console.h" //#include "kvi_module.h" -#include - - extern KviPointerList * g_pSocketSpyWindowList; KviSocketSpyWindow::KviSocketSpyWindow(KviFrame * lpFrm,KviConsole * lpConsole) : KviWindow(KVI_WINDOW_TYPE_SOCKETSPY,lpFrm,"socket_spy",lpConsole) , KviIrcDataStreamMonitor(lpConsole->context()) { g_pSocketSpyWindowList->append(this); - m_pSplitter = new QSplitter(Qt::Horizontal,this); + m_pSplitter = new KviTalSplitter(Qt::Horizontal,this); setObjectName("spysocket_splitter"); m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this); // Ensure proper focusing -- cgit v1.3.1-10-gc9f91