removed COMPILE_SET_QT4 defines

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

15 files changed, 9 insertions, 139 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6645f33f..04f2230c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -277,8 +277,6 @@ IF(QT4_FOUND)
 	SET(QT_USE_QTXML true)
 	SET(QT_USE_QTNETWORK true)
 
-	SET(COMPILE_USE_QT4 1)
-
 	# Qt-DBus support
 	OPTION(WANT_QTDBUS "Whether to compile Qt-DBus support" ON)
 	IF(WITHOUT_QTDBUS)
diff --git a/src/kvilib/config/kvi_settings.h b/src/kvilib/config/kvi_settings.h
index bacd8739f..cc3ef75de 100644
--- a/src/kvilib/config/kvi_settings.h
+++ b/src/kvilib/config/kvi_settings.h
@@ -90,11 +90,6 @@
 
 #endif
 
-#ifndef COMPILE_USE_QT4
-	// It's now a requirement! (until we cleanup the code and will be able to remove this conditional at all)
-	#define COMPILE_USE_QT4
-#endif
-
 #define KVI_VERSION KVIRC_VERSION_RELEASE
 
 #ifndef KVIRC_VERSION_BRANCH
diff --git a/src/kvilib/config/kvi_wincfg.h b/src/kvilib/config/kvi_wincfg.h
index 6c4c7d5ae..e84b49fcc 100644
--- a/src/kvilib/config/kvi_wincfg.h
+++ b/src/kvilib/config/kvi_wincfg.h
@@ -33,9 +33,6 @@
 /** \def COMPILE_NEW_KVS Define if you want to compile with new parser */
 #define COMPILE_NEW_KVS 1
 
-/** \def COMPILE_USE_QT4 Define if you want to use the Qt 4.x support */
-#define COMPILE_USE_QT4
-
 /** \def COMPILE_ONLY_NEW_KVS Define if you want to use only the new KVS parser */
 #define COMPILE_ONLY_NEW_KVS 1
 
diff --git a/src/kvilib/ext/kvi_config.cpp b/src/kvilib/ext/kvi_config.cpp
index 87b0a28de..92e00411b 100644
--- a/src/kvilib/ext/kvi_config.cpp
+++ b/src/kvilib/ext/kvi_config.cpp
@@ -825,8 +825,7 @@ bool KviConfig::readBoolEntry(const QString & szKey,bool bTrue)
 	KviConfigGroup * p_group = getCurrentGroup();
 	QString * p_str = p_group->find(szKey);
 	if(!p_str)return bTrue;
-	static QString szTrue = "true";
-	return (KviQString::toLower(*p_str) == szTrue);
+	return p_str->toLower() == "true";
 }
 
 ////////////////////////////////// QRect
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index e752db430..0b307fc1d 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -697,36 +697,6 @@ QTextCodec * KviApp::defaultSrvCodec()
 	return c;
 }
 
-void KviApp::contextSensitiveHelp()
-{
-	// this stuff doesn't work with Qt 4.x
-#ifndef COMPILE_USE_QT4
-	// the F1 Key has been pressed
-	// try to pass it to the active widget or one of its parents
-	QWidget * w = g_pApp->focusWidget();
-	while(w)
-	{
-		//QVariant v = w->property("contextSensitiveHelp"); <-- this prints a lot of warnings: this is a QT BUG
-		QMetaObject * o = w->metaObject();
-		if(o)
-		{
-			int i = o->findProperty("contextSensitiveHelp",true);
-			if(i != -1)
-			{
-				QVariant v = w->property("contextSensitiveHelp");
-				if(v.isValid() && v.toBool())
-					return; // done!
-			}
-		}
-		w = w->parentWidget();
-	}
-	// no way
-	// FIXME: just show up simple plain online help
-	//debug("No way: found no focus widget for that...");
-#endif
-}
-
-
 void KviApp::collectGarbage(QObject * garbage)
 {
 //	if(!g_pGarbageCollector)debug("Ops... no garbage collector ?");
@@ -743,10 +713,6 @@ void KviApp::loadDefaultScript()
 	cmd.replace("\\","\\\\");
 #endif
 	KviKvsScript::run(cmd,g_pFrame->firstConsole());
-	// now line up the toolbars (they may get messed while loading the script)
-#ifndef COMPILE_USE_QT4
-	g_pFrame->lineUpDockWindows(); // missing on Qt 4.x
-#endif
 }
 
 // 07.01.2005 06:01: Got this curious gcc error while writing
diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h
index cc66ad7bc..fa6822471 100644
--- a/src/kvirc/kernel/kvi_app.h
+++ b/src/kvirc/kernel/kvi_app.h
@@ -177,8 +177,6 @@ public:
 	bool setOptionValue(const QString &optName,const QString &value);
 	void optionResetUpdate(int flags);
 
-	void contextSensitiveHelp();
-
 	// kvi_app_fs.cpp : Filesystem thingies
 	void getGlobalKvircDirectory(QString &szData,KvircSubdir dir,const QString &appendFile = QString::null);
 	void getLocalKvircDirectory(QString &szData,KvircSubdir dir,const QString &appendFile = QString::null,bool bCreateIfNeeded = true);
diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp
index 5038f749c..716109113 100644
--- a/src/kvirc/kernel/kvi_iconmanager.cpp
+++ b/src/kvirc/kernel/kvi_iconmanager.cpp
@@ -421,13 +421,13 @@ bool KviIconWidget::eventFilter(QObject * o,QEvent *e)
 			} else {
 				if(const QPixmap * pix = ((QLabel *)o)->pixmap())
 				{
-// FIXME: In Qt 4.x this stuff needs to be ported to a different api.. which one ?
-#ifndef COMPILE_USE_QT4
-					QDragObject * drobj = new QTextDrag(o->name(),this);
-					drobj->setPixmap(*pix,((QLabel *)o)->mapFromGlobal(QCursor::pos()));
-					drobj->dragCopy();
-#endif
-					return true;
+					QDrag *drobj = new QDrag(this);
+					QMimeData *mimeData = new QMimeData;
+				
+					mimeData->setText(o->objectName());
+					mimeData->setImageData(*pix);
+					drobj->setMimeData(mimeData);
+					drobj->setPixmap(*pix);
 				}
 			}
 		}
diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp
index 3724aa2a6..1e2fd8077 100644
--- a/src/kvirc/kvs/kvi_kvs_object.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object.cpp
@@ -1014,15 +1014,6 @@ bool KviKvsObject::function_killTimer(KviKvsObjectFunctionCall * c)
 	return true;
 }
 
-bool KviKvsObject::function_killTimers(KviKvsObjectFunctionCall * c)
-{
-	// FIXME: QT4 does not seem to have QObject::killTimers()
-#ifndef COMPILE_USE_QT4
-	killTimers();
-#endif
-	return true;
-}
-
 bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c)
 {
 	bool bArray;
diff --git a/src/kvirc/kvs/kvi_kvs_object.h b/src/kvirc/kvs/kvi_kvs_object.h
index 49820ea09..236420415 100644
--- a/src/kvirc/kvs/kvi_kvs_object.h
+++ b/src/kvirc/kvs/kvi_kvs_object.h
@@ -158,7 +158,6 @@ protected:
 	bool function_name(KviKvsObjectFunctionCall *c);
 	bool function_startTimer(KviKvsObjectFunctionCall *c);
 	bool function_killTimer(KviKvsObjectFunctionCall *c);
-	bool function_killTimers(KviKvsObjectFunctionCall *c);
 	bool function_className(KviKvsObjectFunctionCall *c);
 	bool function_findChild(KviKvsObjectFunctionCall *c);
 	bool function_childCount(KviKvsObjectFunctionCall *c);
diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.cpp b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
index 3ee406bce..8c01ce506 100644
--- a/src/kvirc/kvs/kvi_kvs_object_controller.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
@@ -66,7 +66,6 @@ void KviKvsObjectController::init()
 	m_pObjectClass->registerFunctionHandler("name",KVI_PTR2MEMBER(KviKvsObject::function_name));
 	m_pObjectClass->registerFunctionHandler("startTimer",KVI_PTR2MEMBER(KviKvsObject::function_startTimer));
 	m_pObjectClass->registerFunctionHandler("killTimer",KVI_PTR2MEMBER(KviKvsObject::function_killTimer));
-	m_pObjectClass->registerFunctionHandler("killTimers",KVI_PTR2MEMBER(KviKvsObject::function_killTimers));
 	m_pObjectClass->registerFunctionHandler("className",KVI_PTR2MEMBER(KviKvsObject::function_className));
 	m_pObjectClass->registerFunctionHandler("findChild",KVI_PTR2MEMBER(KviKvsObject::function_findChild));
 	m_pObjectClass->registerFunctionHandler("childCount",KVI_PTR2MEMBER(KviKvsObject::function_childCount));
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index 5faa5715c..948ce3082 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -88,19 +88,13 @@
 #include <QRegExp>
 #include <QDebug>
 
-// FIXME: Qt4 #include <QMimeData>
-//#include <q3mimefactory.h>
-
 #define __KVI_DEBUG__
 #include "kvi_debug.h"
 
-
 extern KVIRC_API KviServerDataBase           * g_pServerDataBase;
 extern KVIRC_API KviProxyDataBase               * g_pProxyDataBase;
 extern KVIRC_API KviGarbageCollector            * g_pGarbageCollector;
 
-// %tmp[] = $str.grep("test",%array[])
-
 KviConsole::KviConsole(KviFrame * lpFrm,int iFlags)
 #ifdef COMPILE_ON_WINDOWS
 : KviWindow(KVI_WINDOW_TYPE_CONSOLE,lpFrm,"CONSOLE",0)
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
index 20c94ab29..444d3b7c1 100644
--- a/src/kvirc/ui/kvi_frame.cpp
+++ b/src/kvirc/ui/kvi_frame.cpp
@@ -440,7 +440,7 @@ void KviFrame::accelActivated()
 		//case (Qt::Key_Left+Qt::ALT+Qt::SHIFT): switchToPrevWindowInContext(); break;
 		//case (Qt::Key_Right+Qt::ALT+Qt::SHIFT): switchToNextWindowInContext(); break;
 		case (Qt::Key_F4+Qt::CTRL):	if(g_pActiveWindow)g_pActiveWindow->close(); break;
-		case (Qt::Key_F1): g_pApp->contextSensitiveHelp(); break;
+// 		case (Qt::Key_F1): g_pApp->contextSensitiveHelp(); break;
 /*		case(Qt::Key_F1 + SHIFT):
 			item = m_pWindowList->item(0);
 			if(item) setActiveWindow(item->window());
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
index 2c8afd691..a1e61ad90 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/notifierwindow.cpp
@@ -307,14 +307,12 @@ void KviNotifierWindow::doShow(bool bDoAnimate)
 			m_bNextDown = false;
 			m_bWriteDown = false;
 			m_bBlinkOn = false;
-		#if (!defined COMPILE_USE_QT4) || !(defined(COMPILE_USE_QT4) && (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC) || defined(COMPILE_ON_MINGW)))
 			m_imgDesktop = QPixmap::grabWindow(
 						QApplication::desktop()->winId(),
 						m_wndRect.x(),
 						m_wndRect.y(),
 						m_wndRect.width(),
 						m_wndRect.height()).toImage();
-		#endif
 			// QPixmap tmp = QPixmap::grabWindow( QApplication::desktop()->winId(),m_wndRect.x(), m_wndRect.y(), m_wndRect.width(), m_wndRect.height());
 			// tmp.save("/root/pix.png","PNG");
 			m_pixForeground = QPixmap(m_pixBackground.size());
diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index f3f375be8..44768bb47 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -45,17 +45,10 @@
 		[class]widget[/class]
 	@description:
 		A window dockable to the KVIrc main frame borders (like a toolbar).
-		The window has an implicit layout that will automatically manage
-		the children depending on the dock window's orientation.
 	@functions:
 		!fn: $addWidget(<widget:hobject>)
 			Adds <widget> to the internal layout of this dock window.[br]
 			The widget must be a child of this dock window (otherwise strange things may happen).
-		!fn: <string> $orientation()
-			Returns the string "vertical" or "horizontal" depending on the orientation of this dock window.
-		!fn: $setOrientation(<orientation:string>)
-			Forces the orentation of this dock window. <ordientation> must be either "horizontal" or "vertical".[br]
-			Please note that KVIrc sets the orientation automatically when it is moved between the main frame docks by the user.
 		!fn: <bool> $resizeEnabled()
 			Returns $true if resizing of this window is enabled and false otherwise.
 		!fn: $setResizeEnabled(<bEnabled:bool>)
@@ -72,8 +65,6 @@
 
 KVSO_BEGIN_REGISTERCLASS(KviKvsObject_dockwindow,"dockwindow","widget")
 	KVSO_REGISTER_HANDLER(KviKvsObject_dockwindow,"addWidget",function_addWidget)
-	KVSO_REGISTER_HANDLER(KviKvsObject_dockwindow,"orientation",function_orientation)
-	KVSO_REGISTER_HANDLER(KviKvsObject_dockwindow,"setOrientation",function_setOrientation)
 	KVSO_REGISTER_HANDLER(KviKvsObject_dockwindow,"resizeEnabled",function_resizeEnabled)
 	KVSO_REGISTER_HANDLER(KviKvsObject_dockwindow,"setResizeEnabled",function_setResizeEnabled)
 	KVSO_REGISTER_HANDLER(KviKvsObject_dockwindow,"setAllowedDockAreas",function_setAllowedDockAreas)
@@ -141,27 +132,6 @@ bool KviKvsObject_dockwindow::function_addWidget(KviKvsObjectFunctionCall *c)
 	_pDockWindow->setWidget((QWidget *)(pWidget->object()));
 	return true;
 }
-
-bool KviKvsObject_dockwindow::function_orientation(KviKvsObjectFunctionCall * c)
-{
-	if(!widget())return true; // hum ? dead ?
-	c->returnValue()->setString(QString("horizontal"));
-	return true;
-}
-
-bool KviKvsObject_dockwindow::function_setOrientation(KviKvsObjectFunctionCall * c)
-{
-	QString szOrientation;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("orientation",KVS_PT_NONEMPTYSTRING,0,szOrientation)
-	KVSO_PARAMETERS_END(c)
-
-	if(!widget())return true; // hum ? dead ?
-#ifndef COMPILE_USE_QT4
-	_pDockWindow->setOrientation(KviQString::equalCI(szOrientation,"vertical") ? Qt::Vertical : Qt::Horizontal);
-#endif //!COMPILE_USE_QT4
-	return true;
-}
 // Fix me
 bool KviKvsObject_dockwindow::function_resizeEnabled(KviKvsObjectFunctionCall * c)
 {
diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp
index d98ab4bb1..ef66f85c5 100644
--- a/src/modules/objects/class_toolbar.cpp
+++ b/src/modules/objects/class_toolbar.cpp
@@ -54,8 +54,6 @@
 		Sets the toolbar's label.
 		!fn: <string> $label()
 		Returns the toolbar's label.
-		!fn: $setStretchableWidget(<widget:object>)
-		Sets the <widget> to be expanded.
 		!fn: $clear()
 		Deletes all the toolbar's child widgets.
 
@@ -66,7 +64,6 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_toolbar,"toolbar","object")
 	KVSO_REGISTER_HANDLER(KviKvsObject_toolbar,"addSeparator", functionaddSeparator)
 	KVSO_REGISTER_HANDLER(KviKvsObject_toolbar,"setLabel", functionsetLabel)
 	KVSO_REGISTER_HANDLER(KviKvsObject_toolbar,"label", functionlabel)
-	KVSO_REGISTER_HANDLER(KviKvsObject_toolbar,"setStretchableWidget", functionsetStretchableWidget)
 	KVSO_REGISTER_HANDLER(KviKvsObject_toolbar,"clear", functionclear)
 KVSO_END_REGISTERCLASS(KviKvsObject_toolbar)
 
@@ -117,37 +114,6 @@ bool KviKvsObject_toolbar::functionlabel(KviKvsObjectFunctionCall *c)
 	if (widget()) c->returnValue()->setString(((KviTalToolBar *)widget())->windowTitle());
 	return true;
 }
-//FIX ME
-bool KviKvsObject_toolbar::functionsetStretchableWidget(KviKvsObjectFunctionCall *c)
-{
-	KviKvsObject *ob;
-	kvs_hobject_t hObject;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("widget",KVS_PT_HOBJECT,0,hObject)
-	KVSO_PARAMETERS_END(c)
-	ob=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
-	if (!widget()) return true;
-	if (!ob)
-	{
-		c->warning(__tr2qs("Widget parameter is not an object"));
-		return true;
-	}
-	if (!ob->object())
-	{
-		c->warning(__tr2qs("Widget parameter is not a valid object"));
-		return true;
-	}
-	if(!ob->object()->inherits("KviKvsObject_widget"))
-    {
-		c->warning(__tr2qs("Widget object required"));
-        return TRUE;
-    }
-#ifndef COMPILE_USE_QT4
-	// FIXME: no support for this in Qt4 ?
-	if(widget()) ((KviTalToolBar *)widget())->setStretchableWidget(((QWidget  *)(ob->object())));
-#endif //!COMPILE_USE_QT4
-	return true;	
-}
 bool KviKvsObject_toolbar::functionclear(KviKvsObjectFunctionCall *c)
 {
 	if (widget())