More QT4 work and removed QT3 unused code in objects module.

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

1 files changed, 5 insertions, 50 deletions

diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index 2a79d109b..762b217ad 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -27,13 +27,8 @@
 #include "kvi_frame.h"
 #include "kvi_locale.h"
 #include "kvi_qstring.h"
-#ifdef COMPILE_USE_QT4
-	#include <QDockWidget>
-	#define QT_DOCK_WINDOW QDockWidget
-#else
-	#include <qdockwindow.h>
-	#define QT_DOCK_WINDOW QDockWindow
-#endif
+#include <QDockWidget>
+#define QT_DOCK_WINDOW QDockWidget
 #include <qlayout.h>
 
 /*
@@ -96,13 +91,9 @@ KVSO_END_DESTRUCTOR(KviKvsObject_dockwindow)
 
 bool KviKvsObject_dockwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams)
 {
-#ifdef COMPILE_USE_QT4
 	QDockWidget * pWidget = new QDockWidget(g_pFrame);
 	pWidget->setObjectName(getName());
 	setObject(pWidget);
-#else //!COMPILE_USE_QT4
-	setObject(new QT_DOCK_WINDOW(g_pFrame,getName()),true);
-#endif //!COMPILE_USE_QT4
 	return true;
 }
 
@@ -146,23 +137,14 @@ bool KviKvsObject_dockwindow::function_addWidget(KviKvsObjectFunctionCall *c)
 		c->warning(__tr2qs("The added widget is not a child of this dock window"));
 	}
 
-#ifdef COMPILE_USE_QT4
 	_pDockWindow->setWidget((QWidget *)(pWidget->object()));
-#else //!COMPILE_USE_QT4
-	_pDockWindow->boxLayout()->addWidget((QWidget *)(pWidget->object()));
-	((QWidget *)(pWidget->object()))->show();
-#endif //!COMPILE_USE_QT4
 	return true;
 }
 
 bool KviKvsObject_dockwindow::function_orientation(KviKvsObjectFunctionCall * c)
 {
 	if(!widget())return true; // hum ? dead ?
-#ifdef COMPILE_USE_QT4
 	c->returnValue()->setString(QString("horizontal"));
-#else //!COMPILE_USE_QT4
-	c->returnValue()->setString(_pDockWindow->orientation() == Qt::Horizontal ? QString("horizontal") : QString("vertical"));
-#endif //!COMPILE_USE_QT4
 	return true;
 }
 
@@ -179,30 +161,22 @@ bool KviKvsObject_dockwindow::function_setOrientation(KviKvsObjectFunctionCall *
 #endif //!COMPILE_USE_QT4
 	return true;
 }
-
+// Fix me
 bool KviKvsObject_dockwindow::function_resizeEnabled(KviKvsObjectFunctionCall * c)
 {
 	if(!widget())return true; // hum ? dead ?
-#ifdef COMPILE_USE_QT4
 	c->returnValue()->setBoolean(false);
-#else //!COMPILE_USE_QT4
-	c->returnValue()->setBoolean(_pDockWindow->isResizeEnabled());
-#endif //!COMPILE_USE_QT4
 	return true;
 }
 
+// Fix me
 bool KviKvsObject_dockwindow::function_setResizeEnabled(KviKvsObjectFunctionCall * c)
 {
 	bool bResizeEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bResizeEnabled)
 	KVSO_PARAMETERS_END(c)
-
 	if(!widget())return true; // hum ? dead ?
-
-#ifndef COMPILE_USE_QT4
-	_pDockWindow->setResizeEnabled(bResizeEnabled);
-#endif //!COMPILE_USE_QT4
 	return true;
 }
 
@@ -215,7 +189,6 @@ bool KviKvsObject_dockwindow::function_setAllowedDockAreas(KviKvsObjectFunctionC
 
 	if(!widget())return true; // hum ? dead ?
 
-#ifdef COMPILE_USE_QT4
 	Qt::DockWidgetAreas fAreas = Qt::NoDockWidgetArea;
 	if(szFlags.find('t',false))fAreas |= Qt::TopDockWidgetArea;
 	if(szFlags.find('l',false))fAreas |= Qt::LeftDockWidgetArea;
@@ -229,14 +202,7 @@ bool KviKvsObject_dockwindow::function_setAllowedDockAreas(KviKvsObjectFunctionC
 		fFeatures &= ~QDockWidget::DockWidgetFloatable;
 	// no support for minimized dock widgets
 	_pDockWindow->setFeatures(fFeatures);
-#else //!COMPILE_USE_QT4
-	g_pFrame->setDockEnabled(_pDockWindow,Qt::DockTop,szFlags.find('t',false) != -1);
-	g_pFrame->setDockEnabled(_pDockWindow,Qt::DockLeft,szFlags.find('l',false) != -1);
-	g_pFrame->setDockEnabled(_pDockWindow,Qt::DockRight,szFlags.find('r',false) != -1);
-	g_pFrame->setDockEnabled(_pDockWindow,Qt::DockBottom,szFlags.find('b',false) != -1);
-	g_pFrame->setDockEnabled(_pDockWindow,Qt::DockTornOff,szFlags.find('f',false) != -1);
-	g_pFrame->setDockEnabled(_pDockWindow,Qt::DockMinimized,szFlags.find('m',false) != -1);
-#endif //!COMPILE_USE_QT4
+
 
 	return true;
 }
@@ -250,7 +216,6 @@ bool KviKvsObject_dockwindow::function_dock(KviKvsObjectFunctionCall * c)
 	KVSO_PARAMETERS_END(c)
 
 	if(!widget())return true; // hum ? dead ?
-#ifdef COMPILE_USE_QT4
 	g_pFrame->removeDockWidget(_pDockWindow);
 	if(szDock.find('m',false) == -1)_pDockWindow->setFloating(false);
 	if(szDock.find('t',false) != -1)g_pFrame->addDockWidget(Qt::TopDockWidgetArea,_pDockWindow);
@@ -260,16 +225,6 @@ bool KviKvsObject_dockwindow::function_dock(KviKvsObjectFunctionCall * c)
 	else if(szDock.find('f',false) != -1)_pDockWindow->setFloating(true);
 	else if(szDock.find('m',false) != -1)qDebug("Sorry: no support for minimized dock widgets in Qt4");
 	else c->warning(__tr2qs("Invalid dock area specified"));
-	
-#else //!COMPILE_USE_QT4
-	if(szDock.find('t',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,Qt::DockTop,false,100);
-	else if(szDock.find('l',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,Qt::DockLeft,false,100);
-	else if(szDock.find('r',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,Qt::DockRight,false,100);
-	else if(szDock.find('b',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,Qt::DockBottom,false,100);
-	else if(szDock.find('f',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,Qt::DockTornOff,false,100);
-	else if(szDock.find('m',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,Qt::DockMinimized,false,100);
-	else c->warning(__tr2qs("Invalid dock area specified"));
-#endif //!COMPILE_USE_QT4
 	return true;
 }