removed two old hacks to qmdisubwindow/qsplitter that seems to cause some trouble now

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

4 files changed, 4 insertions, 90 deletions

diff --git a/src/kvilib/tal/kvi_tal_splitter.cpp b/src/kvilib/tal/kvi_tal_splitter.cpp
index 3af8ce0a9..f532f10fc 100644
--- a/src/kvilib/tal/kvi_tal_splitter.cpp
+++ b/src/kvilib/tal/kvi_tal_splitter.cpp
@@ -23,31 +23,3 @@
 //=============================================================================
 
 #include "kvi_tal_splitter.h"
-#include <stdio.h>
-KviTalSplitter::KviTalSplitter(Qt::Orientation orientation, QWidget * pParent)
-: QSplitter(orientation, pParent)
-{
-	bHasValidSizes = false;
-	connect(this, SIGNAL(splitterMoved(int, int)), this, SLOT(splitterHasMoved(int, int)));
-}
-
-KviTalSplitter::~KviTalSplitter()
-{
-}
-
-QList<int> KviTalSplitter::sizes()
-{
-	return bHasValidSizes ? QSplitter::sizes() : oldSizes;
-}
-
-void KviTalSplitter::setSizes(QList<int> sizes)
-{
-	oldSizes = sizes;
-	QSplitter::setSizes(oldSizes);
-}
-
-void KviTalSplitter::splitterHasMoved(int, int)
-{
-	if(!bHasValidSizes)
-		bHasValidSizes=true;
-}
diff --git a/src/kvilib/tal/kvi_tal_splitter.h b/src/kvilib/tal/kvi_tal_splitter.h
index 411e48f49..59ee29cff 100644
--- a/src/kvilib/tal/kvi_tal_splitter.h
+++ b/src/kvilib/tal/kvi_tal_splitter.h
@@ -28,52 +28,10 @@
 /**
 * \file kvi_tal_splitter.h
 * \author fabio bas
-* \brief Class used to workaround a strange behaviour in QSplitter
+* \brief Class used to workaround unwanted behaviours in QSplitter
 */
 
-#include "kvi_settings.h"
 #include <QSplitter>
-
-/**
-* \class KviTalSplitter
-* \brief Toolkit Abstraction Layer: splitter class
-*/
-
-class KVILIB_API KviTalSplitter : public QSplitter
-{
-	Q_OBJECT
-public:
-	/**
-	* \brief Constructs the splitter object
-	* \param orientation The orientation of the splitter: horizontal or vertical
-	* \param pParent the parent object
-	* \return KviTalSplitter
-	*/
-	KviTalSplitter(Qt::Orientation orientation, QWidget * pParent = 0);
-
-	/**
-	* \brief Destroys the splitter object
-	*/
-	virtual ~KviTalSplitter();
-private:
-	bool bHasValidSizes;
-	QList<int> oldSizes;
-public:
-	/**
-	* \brief Returns the list of sizes of the items contained inside the splitter
-	* \return QList<int>
-	*/
-	QList<int> sizes();
-
-	/**
-	* \brief Sets the initial sizes for items contained inside the splitter
-	* \param sizes The list of sizes
-	* \return void
-	*/
-	void setSizes(QList<int> sizes);
-protected slots:
-	void splitterHasMoved(int pos, int index);
-
-};
+#define KviTalSplitter QSplitter
 
 #endif // _KVI_TAL_SPLITTER_H_
diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp
index 88bdd1c94..9b2bcb74f 100644
--- a/src/kvirc/ui/kvi_mdichild.cpp
+++ b/src/kvirc/ui/kvi_mdichild.cpp
@@ -62,7 +62,7 @@ KviMdiChild::KviMdiChild(KviMdiManager * par, const char * name)
 	m_pManager = par;
 	m_pClient = 0;
 
-	m_restoredGeometry   = QRect(10,10,500,380);
+	setGeometry(QRect(10,10,500,380));
 
 	connect(systemMenu(), SIGNAL(aboutToShow()), this, SLOT(updateSystemPopup()));
 	connect(this, SIGNAL(windowStateChanged(Qt::WindowStates, Qt::WindowStates)), this, SLOT(windowStateChangedEvent(Qt::WindowStates, Qt::WindowStates)));
@@ -87,7 +87,6 @@ void KviMdiChild::transparencyWorkaround()
 	
 void KviMdiChild::setRestoredGeometry(const QRect &r)
 {
-	m_restoredGeometry = r;
 	setGeometry(r);
 }
 
@@ -104,7 +103,7 @@ void KviMdiChild::closeEvent(QCloseEvent * e)
 
 QRect KviMdiChild::restoredGeometry()
 {
-	return m_restoredGeometry;
+	return geometry();
 }
 
 KviMdiChild::MdiChildState KviMdiChild::state()
@@ -223,16 +222,9 @@ void KviMdiChild::moveEvent(QMoveEvent *e)
 		}
 	}
 #endif
-	m_restoredGeometry.setTopLeft(e->pos());
 	QMdiSubWindow::moveEvent(e);
 }
 
-void KviMdiChild::resizeEvent(QResizeEvent *e)
-{
-	m_restoredGeometry.setSize(e->size());
-	QMdiSubWindow::resizeEvent(e);
-}
-
 void KviMdiChild::setClient(QWidget * w)
 {
 	__range_valid(m_pClient==0);
diff --git a/src/kvirc/ui/kvi_mdichild.h b/src/kvirc/ui/kvi_mdichild.h
index 4968fe990..65593b7f8 100644
--- a/src/kvirc/ui/kvi_mdichild.h
+++ b/src/kvirc/ui/kvi_mdichild.h
@@ -78,8 +78,6 @@ protected:
 private:
 	/// The widget docked into our MDI window.
 	QWidget * m_pClient;
-	/// Saves the geometry of the window for restoring it's position
-	QRect m_restoredGeometry;
 	/// Contains the current window Icon
 	QPixmap m_pIcon;
 	/// Caption as plain text.
@@ -178,12 +176,6 @@ protected:
 	virtual void moveEvent(QMoveEvent * e);
 
 	/**
-	* \brief Updates the widget geometry when resizing
-	* \return void
-	*/
-	virtual void resizeEvent(QResizeEvent * e);
-
-	/**
 	* \brief Hooks into close event to make user decisions possible
 	* \return void
 	*/