diff options
| author | 2009-08-31 18:25:57 +0000 | |
|---|---|---|
| committer | 2009-08-31 18:25:57 +0000 | |
| commit | 03a68f3f6023c5e613bbef8f4a505e5f275ef9e2 (patch) | |
| tree | 090846e94cdec47847048330e4dedc49ffdfb8a9 /src | |
| parent | quick fix (diff) | |
| download | KVIrc-03a68f3f6023c5e613bbef8f4a505e5f275ef9e2.tar.gz KVIrc-03a68f3f6023c5e613bbef8f4a505e5f275ef9e2.tar.bz2 KVIrc-03a68f3f6023c5e613bbef8f4a505e5f275ef9e2.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvilib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/kvilib/tal/kvi_tal_splitter.h | 47 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_channel.cpp | 8 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_channel.h | 6 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_console.cpp | 3 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_debugwindow.cpp | 3 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_frame.cpp | 9 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_input_editor.cpp | 4 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_mdichild.h | 2 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_mdimanager.cpp | 2 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_query.cpp | 5 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_window.h | 6 | ||||
| -rw-r--r-- | src/modules/dcc/chat.cpp | 3 | ||||
| -rw-r--r-- | src/modules/dcc/voice.cpp | 3 | ||||
| -rw-r--r-- | src/modules/filetransferwindow/filetransferwindow.cpp | 5 | ||||
| -rw-r--r-- | src/modules/help/helpwindow.cpp | 3 | ||||
| -rw-r--r-- | src/modules/links/linkswindow.cpp | 7 | ||||
| -rw-r--r-- | src/modules/list/listwindow.cpp | 7 | ||||
| -rw-r--r-- | src/modules/logview/logviewmdiwindow.cpp | 3 | ||||
| -rw-r--r-- | src/modules/sharedfileswindow/sharedfileswindow.cpp | 3 | ||||
| -rw-r--r-- | src/modules/socketspy/socketspywindow.cpp | 5 |
21 files changed, 77 insertions, 58 deletions
diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt index 0f9e3a1cb..c8ef96ffd 100644 --- a/src/kvilib/CMakeLists.txt +++ b/src/kvilib/CMakeLists.txt @@ -33,6 +33,7 @@ SET(kvilib_MOC_HDRS tal/kvi_tal_menubar.h tal/kvi_tal_popupmenu.h tal/kvi_tal_scrollview.h + tal/kvi_tal_splitter.h tal/kvi_tal_tabdialog.h tal/kvi_tal_tablewidget.h tal/kvi_tal_textedit.h diff --git a/src/kvilib/tal/kvi_tal_splitter.h b/src/kvilib/tal/kvi_tal_splitter.h new file mode 100644 index 000000000..61755d840 --- /dev/null +++ b/src/kvilib/tal/kvi_tal_splitter.h @@ -0,0 +1,47 @@ +#ifndef _KVI_TAL_SPLITTER_H_ +#define _KVI_TAL_SPLITTER_H_ + +//============================================================================= +// +// File : kvi_tal_splitter.cpp +// Creation date : Mon Aug 31 2009 19:47:08 by Fabio Bas +// +// This file is part of the KVirc irc client distribution +// Copyright (C) 2009 Fabio Bas (ctrlaltca at libero dot it) +// +// This program is FREE software. You can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your opinion) any later version. +// +// This program is distributed in the HOPE that it will be USEFUL, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +// See the GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, write to the Free Software Foundation, +// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// +//============================================================================= + +#include "kvi_settings.h" +#include <QSplitter> + +class KVILIB_API KviTalSplitter : public QSplitter +{ + Q_OBJECT +public: + KviTalSplitter(Qt::Orientation orientation, QWidget * parent = 0) + : QSplitter(orientation, parent), bHasValidSizes(false) {}; + virtual ~KviTalSplitter() {}; + QList<int> sizes() { return bHasValidSizes ? QSplitter::sizes() : oldSizes; }; + void setSizes(QList<int> sizes) { oldSizes = sizes; QSplitter::setSizes(oldSizes); }; +protected: + virtual void showEvent(QShowEvent * event) { if(!bHasValidSizes) bHasValidSizes=true; QSplitter::showEvent(event); }; +private: + bool bHasValidSizes; + QList<int> oldSizes; +}; + +#endif // _KVI_TAL_SPLITTER_H_ diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index d25c97bc2..fbd7f3047 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -72,7 +72,6 @@ #include <QFileInfo> #include <QDate> #include <QByteArray> -#include <QSplitter> #include <QLabel> #include <QEvent> #include <QPalette> @@ -111,7 +110,7 @@ KviChannel::KviChannel(KviFrame * lpFrm, KviConsole * lpConsole, const QString & m_pButtonBox->setSpacing(0); m_pButtonBox->setMargin(0); - m_pTopSplitter = new QSplitter(Qt::Horizontal,m_pButtonBox); + m_pTopSplitter = new KviTalSplitter(Qt::Horizontal,m_pButtonBox); m_pButtonBox->setStretchFactor(m_pTopSplitter,1); @@ -130,11 +129,11 @@ KviChannel::KviChannel(KviFrame * lpFrm, KviConsole * lpConsole, const QString & createTextEncodingButton(m_pButtonContainer); // Central splitter - m_pSplitter = new QSplitter(Qt::Horizontal,this); + m_pSplitter = new KviTalSplitter(Qt::Horizontal,this); m_pSplitter->setObjectName(szName); m_pSplitter->setOpaqueResize(false); // Spitted vertially on the left - m_pVertSplitter = new QSplitter(Qt::Vertical,m_pSplitter); + m_pVertSplitter = new KviTalSplitter(Qt::Vertical,m_pSplitter); m_pVertSplitter->setOpaqueResize(false); // With the IRC view over m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this); @@ -321,7 +320,6 @@ void KviChannel::loadProperties(KviConfig * cfg) def.append((iWidth * 82) / 100); def.append((iWidth * 18) / 100); m_pSplitter->setSizes(cfg->readIntListEntry("Splitter",def)); - //debug("SETTING DEFAULT SIZES"); def.clear(); def.append((iWidth * 60) / 100); diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h index 5d9f10b6c..0299f6a3e 100644 --- a/src/kvirc/ui/kvi_channel.h +++ b/src/kvirc/ui/kvi_channel.h @@ -46,7 +46,7 @@ #include <QStringList> #include <QToolButton> -class QSplitter; + class KviConsole; class KviTopicWidget; class KviIrcMask; @@ -177,8 +177,8 @@ public: */ ~KviChannel(); protected: - QSplitter * m_pTopSplitter; - QSplitter * m_pVertSplitter; + KviTalSplitter * m_pTopSplitter; + KviTalSplitter * m_pVertSplitter; QToolButton * m_pDoubleViewButton; KviWindowToolPageButton * m_pListViewButton; KviWindowToolPageButton * m_pBanEditorButton; diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index e829e59ac..1aad9b886 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -78,7 +78,6 @@ #include "kvi_sslmaster.h" #endif -#include <QSplitter> #include <QToolBar> #include <QTimer> #include <QMessageBox> @@ -132,7 +131,7 @@ KviConsole::KviConsole(KviFrame * lpFrm,int iFlags) connect(m_pAddressEdit,SIGNAL(activated(const QString & )),this,SLOT(ircUriChanged(const QString & ))); connect(g_pApp,SIGNAL(recentUrlsChanged()),this,SLOT(recentUrlsChanged())); - m_pSplitter = new QSplitter(Qt::Horizontal,this); + m_pSplitter = new KviTalSplitter(Qt::Horizontal,this); m_pSplitter->setObjectName("console_splitter"); m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this); connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked())); diff --git a/src/kvirc/ui/kvi_debugwindow.cpp b/src/kvirc/ui/kvi_debugwindow.cpp index d2ca0e2f7..ee5b142c1 100644 --- a/src/kvirc/ui/kvi_debugwindow.cpp +++ b/src/kvirc/ui/kvi_debugwindow.cpp @@ -37,7 +37,6 @@ #include <QList> #include <QPixmap> -#include <QSplitter> KviDebugWindow * KviDebugWindow::m_pInstance = 0; @@ -46,7 +45,7 @@ KviDebugWindow::KviDebugWindow() : KviWindow(KVI_WINDOW_TYPE_DEBUG,g_pFrame,__tr2qs("Debug Messages"),0) { m_pInstance = this; - m_pSplitter = new QSplitter(Qt::Horizontal,this); + m_pSplitter = new KviTalSplitter(Qt::Horizontal,this); m_pSplitter->setObjectName("main_splitter"); m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this); m_pInput = new KviInput(this,0); diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index 47cabd712..d4f6d0dd7 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -800,7 +800,6 @@ void KviFrame::childConnectionUserModeChange(KviIrcConnection * c) emit activeConnectionUserModeChanged(); } - void KviFrame::childWindowActivated(KviWindow *wnd) { // ASSERT(m_pWinList->findRef(wnd)) @@ -814,16 +813,13 @@ void KviFrame::childWindowActivated(KviWindow *wnd) m_pWindowList->setActiveItem(wnd->windowListItem()); - - if(g_pActiveWindow->view()) g_pActiveWindow->view()->clearUnreaded(); emit activeWindowChanged(); - if(bActiveContextChanged)emit{ + if(bActiveContextChanged) + emit activeContextChanged(); - activeContextChanged(); - } KVS_TRIGGER_EVENT_0(KviEvent_OnWindowActivated,wnd); } @@ -1236,7 +1232,6 @@ void KviFrame::hideEvent ( QHideEvent * e) { hide(); } - } } } diff --git a/src/kvirc/ui/kvi_input_editor.cpp b/src/kvirc/ui/kvi_input_editor.cpp index 1753d88f7..458e80e76 100644 --- a/src/kvirc/ui/kvi_input_editor.cpp +++ b/src/kvirc/ui/kvi_input_editor.cpp @@ -310,9 +310,7 @@ void KviInputEditor::drawContents(QPainter * p) int iXLeft = xPositionFromCharIndex(fm,iSelStart,TRUE); int iXRight = xPositionFromCharIndex(fm,m_iSelectionEnd + 1,TRUE); -// p->setRasterOp(Qt::NotROP); p->fillRect(iXLeft,frameWidth(),iXRight - iXLeft,iWidgetWidth,KVI_OPTION_COLOR(KviOption_colorInputSelectionBackground)); -// p->setRasterOp(Qt::CopyROP); } // When m_bIMComposing is true, the text between m_iIMStart and m_iIMStart+m_iIMLength should be highlighted to show that this is the active @@ -330,9 +328,7 @@ void KviInputEditor::drawContents(QPainter * p) int iXIMSelectionLeft = xPositionFromCharIndex(fm,iIMSelectionStart,TRUE); int iXIMSelectionRight = xPositionFromCharIndex(fm,iIMSelectionStart + m_iIMSelectionLength,TRUE); -// p->setRasterOp(Qt::NotROP); p->fillRect(iXIMSelectionLeft,0,iXIMSelectionRight - iXIMSelectionLeft, iWidgetWidth,KVI_OPTION_COLOR(KviOption_colorInputSelectionBackground)); -// p->setRasterOp(Qt::CopyROP); // highlight the IM selection int iIMStart = m_iIMStart; diff --git a/src/kvirc/ui/kvi_mdichild.h b/src/kvirc/ui/kvi_mdichild.h index 9e9d43668..a171636e6 100644 --- a/src/kvirc/ui/kvi_mdichild.h +++ b/src/kvirc/ui/kvi_mdichild.h @@ -154,8 +154,6 @@ public: /** * \brief Sets the window title * \param plain Plain text of caption - * \param xmlActive not used - * \param xmlInactive not used * \return void */ void setWindowTitle(const QString & szPlain); diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp index 3dacc9e36..0180bbfc7 100644 --- a/src/kvirc/ui/kvi_mdimanager.cpp +++ b/src/kvirc/ui/kvi_mdimanager.cpp @@ -140,8 +140,6 @@ void KviMdiManager::manageChild(KviMdiChild * lpC, bool, QRect *) addSubWindow((QMdiSubWindow*)lpC); -// if(isInSDIMode()) lpC->queuedMaximize(); - if(KVI_OPTION_BOOL(KviOption_boolAutoTileWindows))tile(); } diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp index d82536f92..e3be6c2ce 100644 --- a/src/kvirc/ui/kvi_query.cpp +++ b/src/kvirc/ui/kvi_query.cpp @@ -62,7 +62,6 @@ #include <QDate> #include <QByteArray> #include <QPixmap> -#include <QSplitter> #include <QList> #include <QByteArray> @@ -72,7 +71,7 @@ KviQuery::KviQuery(KviFrame * lpFrm, KviConsole * lpConsole, const QString & szN m_iFlags = 0; connection()->registerQuery(this); - //m_pTopSplitter = new QSplitter(QSplitter::Horizontal,this,"top_splitter"); + //m_pTopSplitter = new KviTalSplitter(QSplitter::Horizontal,this,"top_splitter"); m_pButtonBox = new KviTalHBox(this); m_pLabel = new KviThemedLabel(m_pButtonBox,"query_label"); m_pLabel->setAutoHeight(1); @@ -85,7 +84,7 @@ KviQuery::KviQuery(KviFrame * lpFrm, KviConsole * lpConsole, const QString & szN createTextEncodingButton(m_pButtonGrid); - m_pSplitter = new QSplitter(Qt::Horizontal,this); + m_pSplitter = new KviTalSplitter(Qt::Horizontal,this); m_pSplitter->setObjectName("main_splitter"); m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this); connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked())); diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h index cc3156741..ad67de14d 100644 --- a/src/kvirc/ui/kvi_window.h +++ b/src/kvirc/ui/kvi_window.h @@ -38,6 +38,7 @@ #include "kvi_ircconnection.h" #include "kvi_input.h" #include "kvi_tal_hbox.h" +#include "kvi_tal_splitter.h" #ifdef COMPILE_ON_WINDOWS // The brain-damaged MSVC compiler can't instantiate QList templates without a destructor definition @@ -54,7 +55,6 @@ class QPushButton; class QPixmap; -class QSplitter; class QTextCodec; class KviFrame; class KviWindowListItem; @@ -155,7 +155,7 @@ protected: // almost private: don't touch :D QString m_szPlainTextCaption; KviIrcView * m_pIrcView; KviInput * m_pInput; - QSplitter * m_pSplitter; + KviTalSplitter * m_pSplitter; KviTalHBox * m_pButtonBox; unsigned long int m_uId; QString m_szTextEncoding; @@ -209,7 +209,7 @@ public: // the current IRC connection (if any) inline KviIrcConnection * connection(); // The splitter of this window: it *shouldn't* be null... but ... well.. who knows ? :D ...better check it - inline QSplitter * splitter(){ return m_pSplitter; }; + inline KviTalSplitter * splitter(){ return m_pSplitter; }; // The window has ALWAYS a WindowList item inline KviWindowListItem * windowListItem(){ return m_pWindowListItem; }; // The window *might* have a button container 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 <QSplitter> #include <QEvent> #include <QResizeEvent> #include <QByteArray> @@ -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 <QFrame> -#include <QSplitter> #include <QSlider> #include <QToolTip> @@ -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 <QSplitter> #include <QToolTip> #include <QPainter> #include <QMessageBox> @@ -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 <QList> #include <QFileInfo> -#include <QSplitter> #include <QLineEdit> #include <QMessageBox> #include <QRegExp> @@ -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 <QSplitter> #include <QToolTip> #include <QLabel> #include <QMouseEvent> @@ -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 <QTimer> #include <QPainter> #include <QFontMetrics> -#include <QSplitter> #include <QToolTip> #include <QDateTime> #include <QByteArray> @@ -153,11 +152,11 @@ KviListWindow::KviListWindow(KviFrame * lpFrm, KviConsole * lpConsole) m_pItemList = new KviPointerList<KviChannelTreeWidgetItemData>; 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 <QList> #include <QPixmap> -#include <QSplitter> #include <QToolButton> #include <QFileInfo> #include <QDir> @@ -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 <QLabel> #include <QLineEdit> #include <QPushButton> -#include <QSplitter> #include <QLayout> #include <QMessageBox> #include <QFileInfo> @@ -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 <QSplitter> - - extern KviPointerList<KviSocketSpyWindow> * 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 |
